From gerrit-no-reply at lists.osmocom.org Wed Jan 2 09:49:49 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 09:49:49 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h File include/osmocom/gsm/gsm48_arfcn_range_encode.h: https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h at 22 PS8, Line 22: int osmo_gsm48_range_enc_range128(uint8_t *chan_list, int f0, int *w); I think single "range" in function name is enough - it's already pretty long. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Wed, 02 Jan 2019 09:49:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 09:49:55 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 09:49:55 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h File include/osmocom/gprs/protocol/gsm_04_60.h: https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h at 338 PS6, Line 338: uint8_t use_egprs_p_ch_req; Extra tabs looks off. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 02 Jan 2019 09:49:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:00:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:00:21 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c at 54 PS8, Line 54: */ Can we use this as static function? In OsmoBSC it's called only once from _range_enc_arfcns() -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Wed, 02 Jan 2019 10:00:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:10:14 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:10:14 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 6: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c File src/gsm/gsm48_rest_octets.c: https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c at 64 PS6, Line 64: #define SI2Q_MIN_LEN 18 Those are used in 3 different files in OsmoBSC - any reason for not making this part of public header? -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 02 Jan 2019 10:10:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:15:19 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:15:19 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 8: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c at 302 PS8, Line 302: { This helper is used only in range_encode() in OsmoBSC which is static in this patch. Why do we expose it in public API? -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Wed, 02 Jan 2019 10:15:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:48:47 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:48:47 +0000 Subject: Change in osmo-msc[master]: Constify trans_assign_trans_id() parameters Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12447 Change subject: Constify trans_assign_trans_id() parameters ...................................................................... Constify trans_assign_trans_id() parameters Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae --- M include/osmocom/msc/transaction.h M src/libmsc/transaction.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/12447/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 0760c07..c4dab15 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -111,7 +111,7 @@ uint32_t callref); void trans_free(struct gsm_trans *trans); -int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, +int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, uint8_t protocol, uint8_t ti_flag); struct gsm_trans *trans_has_conn(const struct ran_conn *conn); void trans_conn_closed(struct ran_conn *conn); diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index a0f7b31..981687b 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -182,7 +182,7 @@ * \param[in] protocol Protocol for whihc to find ID * \param[in] ti_flag FIXME */ -int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, +int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, uint8_t protocol, uint8_t ti_flag) { struct gsm_trans *trans; -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:54:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:54:38 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12382 ) Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12382/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12382/1//COMMIT_MSG at 11 PS1, Line 11: no need to use them (as we use SM-RP-MR), so let's claen up. typo -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max Gerrit-Comment-Date: Wed, 02 Jan 2019 10:54:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 10:58:51 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 10:58:51 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11157/2/src/host/trxcon/sched_lchan_common.c File src/host/trxcon/sched_lchan_common.c: https://gerrit.osmocom.org/#/c/11157/2/src/host/trxcon/sched_lchan_common.c at 103 PS2, Line 103: if (lchan->meas.rssi_num) { Can we use rxlev2dbm() and dbm2rxlev() from libosmocore in here? -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Wed, 02 Jan 2019 10:58:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:17:59 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 11:17:59 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Patch Set 2: Max, definitely! Thanks! -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Wed, 02 Jan 2019 11:17:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:24:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 11:24:24 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11157 to look at the new patch set (#3). Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... trxcon/scheduler: fix RSSI -> RX level conversion Due to a mistake, average RSSI value of received bursts was not converted to GSM RX level (range 0..63), so trxcon has been sending incorrect values to the higher layers. Let's fix this, and also prevent possible division by zero. Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 --- M src/host/trxcon/sched_lchan_common.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/11157/3 -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 11:30:08 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12382 to look at the new patch set (#2). Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... tests/gsup_test.c: drop session IEs from MO-ForwardSM Error Both session state and session ID IEs were left from the initial version of Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71. There is no need to use them (as we use SM-RP-MR), so let's clean up. Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 --- M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err 2 files changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/12382/2 -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:31:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 11:31:47 +0000 Subject: Change in osmo-msc[master]: Constify trans_assign_trans_id() parameters In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12447 ) Change subject: Constify trans_assign_trans_id() parameters ...................................................................... Patch Set 1: Why do we need this change? Which problems it would solve? -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 02 Jan 2019 11:31:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:34:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 11:34:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 02 Jan 2019 11:34:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:35:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 11:35:17 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12382 ) Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 02 Jan 2019 11:35:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:39:12 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 11:39:12 +0000 Subject: Change in osmo-msc[master]: Constify trans_assign_trans_id() parameters In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12447 ) Change subject: Constify trans_assign_trans_id() parameters ...................................................................... Patch Set 1: > Why do we need this change? Which problems it would solve? It makes reading code easier because this patch makes it obvious from the function signature that function does not change its parameters without the need to read entire function. -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 02 Jan 2019 11:39:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 11:49:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 11:49:16 +0000 Subject: Change in osmo-msc[master]: Constify transaction helpers parameters In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12447 to look at the new patch set (#2). Change subject: Constify transaction helpers parameters ...................................................................... Constify transaction helpers parameters Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae --- M include/osmocom/msc/transaction.h M src/libmsc/transaction.c 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/12447/2 -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 13:05:43 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 13:05:43 +0000 Subject: Change in osmo-bsc[master]: LCLS: use Status for HO-COMPLETE message In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12379 ) Change subject: LCLS: use Status for HO-COMPLETE message ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab Gerrit-Change-Number: 12379 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 02 Jan 2019 13:05:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 14:30:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 2 Jan 2019 14:30:33 +0000 Subject: Change in osmo-bsc[master]: IPA: log OML/RSL link drop reason Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12448 Change subject: IPA: log OML/RSL link drop reason ...................................................................... IPA: log OML/RSL link drop reason There could multiple reason for OML or RSL link towards BTS to be dropped: ctrl command, vty, new link etc. Introduce "reason" parameter to corresponding functions and log it on link drop to simplify troubleshooting issues with more complex setups. Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 --- M include/osmocom/bsc/ipaccess.h M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 5 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/48/12448/1 diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h index 692e795..3853270 100644 --- a/include/osmocom/bsc/ipaccess.h +++ b/include/osmocom/bsc/ipaccess.h @@ -30,9 +30,9 @@ uint8_t data[0]; } __attribute__((packed)); -void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason); void ipaccess_drop_oml_deferred(struct gsm_bts *bts); -void ipaccess_drop_rsl(struct gsm_bts_trx *trx); +void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason); struct sdp_header_item { struct sdp_header_entry header_entry; diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 171feaf..ca182d7 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -106,7 +106,7 @@ llist_for_each_entry_reverse(trx, &bts->trx_list, list) abis_nm_ipaccess_restart(trx); } else - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "ctrl net.apply-configuration"); } cmd->reply = "Tried to drop the BTS"; @@ -189,7 +189,7 @@ return CTRL_CMD_ERROR; } - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "ctrl bts.apply-configuration"); cmd->reply = "Tried to drop the BTS"; return CTRL_CMD_REPLY; } diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 791abf6..0aa8e49 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -227,7 +227,7 @@ trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n"); - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "rf check"); break; } } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 032305e..876273e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4433,11 +4433,11 @@ /* close all connections */ if (strcmp(argv[1], "oml") == 0) { - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "vty"); } else if (strcmp(argv[1], "rsl") == 0) { /* close all rsl connections */ llist_for_each_entry(trx, &bts->trx_list, list) { - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "vty"); } } else { vty_out(vty, "Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index cf81a22..56103b6 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -389,12 +389,12 @@ } /* These are exported because they are used by the VTY interface. */ -void ipaccess_drop_rsl(struct gsm_bts_trx *trx) +void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason) { if (!trx->rsl_link) return; - LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link.\n", trx->bts->nr, trx->nr); + LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link: %s\n", trx->bts->nr, trx->nr, reason); e1inp_sign_link_destroy(trx->rsl_link); trx->rsl_link = NULL; @@ -402,7 +402,7 @@ paging_flush_bts(trx->bts, NULL); } -void ipaccess_drop_oml(struct gsm_bts *bts) +void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason) { struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; @@ -413,14 +413,14 @@ if (!bts->oml_link) return; - LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link.\n", bts->nr); + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link: %s\n", bts->nr, reason); e1inp_sign_link_destroy(bts->oml_link); bts->oml_link = NULL; bts->uptime = 0; /* we have issues reconnecting RSL, drop everything. */ llist_for_each_entry(trx, &bts->trx_list, list) - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "OML link drop"); gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL); @@ -438,7 +438,7 @@ continue; LOGP(DLINP, LOGL_NOTICE, "Dropping BTS(%u) due BTS(%u).\n", rdep_bts->nr, bts->nr); - ipaccess_drop_oml(rdep_bts); + ipaccess_drop_oml(rdep_bts, "Dependency link drop"); } } @@ -447,7 +447,7 @@ static void ipaccess_drop_oml_deferred_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *) data; - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "Deferred link drop"); } /*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in * current code context. This may be needed if we want to destroy the OML link @@ -537,7 +537,7 @@ switch(type) { case E1INP_SIGN_OML: /* remove old OML signal link for this BTS. */ - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "new OML link"); if (!bts_depend_check(bts)) { LOGP(DLINP, LOGL_NOTICE, @@ -568,7 +568,7 @@ return NULL; /* remove old RSL link for this TRX. */ - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "new RSL link"); /* set new RSL link for this TRX. */ line = bts->oml_link->ts->line; @@ -609,7 +609,7 @@ osmo_timer_del(&link->trx->rsl_connect_timeout); } if (bts != NULL) - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "link down"); } /* This function is called if we receive one OML/RSL message. */ -- To view, visit https://gerrit.osmocom.org/12448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 Gerrit-Change-Number: 12448 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 14:32:28 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 Jan 2019 14:32:28 +0000 Subject: Change in meta-telephony[201705]: Add recipe for osmo-pcap, both server and client In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/3534 ) Change subject: Add recipe for osmo-pcap, both server and client ...................................................................... Patch Set 1: Code-Review-2 (2 comments) Please make sure to rewrite the recipe so it compiles and packages everything fine against current osmo-pcap master. https://gerrit.osmocom.org/#/c/3534/1/recipes-osmocom/osmo-pcap/files/osmo-pcap-server.service File recipes-osmocom/osmo-pcap/files/osmo-pcap-server.service: https://gerrit.osmocom.org/#/c/3534/1/recipes-osmocom/osmo-pcap/files/osmo-pcap-server.service at 2 PS1, Line 2: Description=Osmocom PCAP aggregation server As of current master, there are already service files available under contrib/systemd. https://gerrit.osmocom.org/#/c/3534/1/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb File recipes-osmocom/osmo-pcap/osmo-pcap_git.bb: https://gerrit.osmocom.org/#/c/3534/1/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb at 7 PS1, Line 7: SRCREV = "${AUTOREV}" This patch is using AUTOREV so it shouldn't be sent against 201705 branch but against laforge/nightly. Once this patch is merged into laforge/nightly we do next release I'll move it to match next release tag. -- To view, visit https://gerrit.osmocom.org/3534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I5bb85b118029d1559a958803184690a9d0f23e4a Gerrit-Change-Number: 3534 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Wed, 02 Jan 2019 14:32:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 2 16:11:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 2 Jan 2019 16:11:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7832?= Message-ID: <1082530071.389.1546445466205.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 919.02 KB...] from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from RANAP_IRATmeasurementParameters.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: 'struct MemberJ' declared inside parameter list A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from ../../include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h:15, from RANAP_IRAT-Measurement-Configuration.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: 'struct MemberJ' declared inside parameter list A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ CC RANAP_EUTRANFrequencies.lo CC RANAP_SubscriberProfileIDforRFP.lo CC RANAP_SourceStatisticsDescriptor.lo CC RANAP_MeasBand.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from RANAP_EUTRANFrequencies.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: 'struct MemberJ' declared inside parameter list A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ CC RANAP_SupportedRAB-ParameterBitrateList.lo CC RANAP_SupportedBitrate.lo CC RANAP_SourceUTRANCellID.lo CC RANAP_SRB-ID.lo CC RANAP_SRB-TrCH-Mapping.lo CC RANAP_SRB-TrCH-MappingItem.lo CC RANAP_SRVCC-HO-Indication.lo CC RANAP_SRVCC-Information.lo CC RANAP_SRVCC-Operation-Possible.lo CC RANAP_SubflowSDU-Size.lo CC RANAP_TAC.lo CC RANAP_TAI.lo CC RANAP_Target-ToSource-TransparentContainer.lo CC RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.lo CC RANAP_TargetBSS-ToSourceBSS-TransparentContainer.lo CC RANAP_TargetID.lo CC RANAP_TargetCellId.lo CC RANAP_TargetENB-ID.lo CC RANAP_TargetRNC-ID.lo CC RANAP_TargetRNC-ToSourceRNC-TransparentContainer.lo CC RANAP_TemporaryUE-ID.lo CC RANAP_TBCD-STRING.lo CC RANAP_Time-UE-StayedInCell.lo CC RANAP_Time-UE-StayedInCell-EnhancedGranularity.lo CC RANAP_TimingDifferenceULDL.lo CC RANAP_TimeToMBMSDataTransfer.lo CC RANAP_TMSI.lo CC RANAP_TMGI.lo CC RANAP_TraceInformation.lo CC RANAP_TraceDepth.lo CC RANAP_TracePropagationParameters.lo CC RANAP_TraceRecordingSessionInformation.lo CC RANAP_TraceRecordingSessionReference.lo CC RANAP_TraceReference.lo CC RANAP_TraceType.lo CC RANAP_TrafficClass.lo CC RANAP_TrafficHandlingPriority.lo CC RANAP_TransferDelay.lo CC RANAP_UnsuccessfullyTransmittedDataVolume.lo CC RANAP_TransportLayerAddress.lo CC RANAP_TrCH-ID.lo CC RANAP_TrCH-ID-List.lo CC RANAP_TriggerID.lo CC RANAP_TunnelInformation.lo CC RANAP_TypeOfError.lo CC RANAP_UE-AggregateMaximumBitRate.lo CC RANAP_UE-AggregateMaximumBitRateUplink.lo CC RANAP_UE-AggregateMaximumBitRateDownlink.lo CC RANAP_UE-History-Information.lo CC RANAP_UE-ID.lo CC RANAP_UESBI-Iu.lo CC RANAP_UESBI-IuA.lo CC RANAP_UESBI-IuB.lo CC RANAP_UL-GTP-PDU-SequenceNumber.lo CC RANAP_UL-N-PDU-SequenceNumber.lo CC RANAP_UPInformation.lo CC RANAP_UPInitialisationFrame.lo CC RANAP_UP-ModeVersions.lo CC RANAP_USCH-ID.lo CC RANAP_UserPlaneMode.lo CC RANAP_VelocityEstimate.lo CC RANAP_UTRAN-CellID.lo CC RANAP_HorizontalVelocity.lo CC RANAP_HorizontalWithVerticalVelocity.lo CC RANAP_HorizontalVelocityWithUncertainty.lo CC RANAP_HorizontalWithVerticalVelocityAndUncertainty.lo CC RANAP_HorizontalSpeedAndBearing.lo CC RANAP_VerticalVelocity.lo CC RANAP_VerticalSpeedDirection.lo CC RANAP_VerticalAccuracyCode.lo CC RANAP_VoiceSupportMatchIndicator.lo CC RANAP_RANAP-PDU.lo CC RANAP_InitiatingMessage.lo CC RANAP_SuccessfulOutcome.lo CC RANAP_UnsuccessfulOutcome.lo CC RANAP_Outcome.lo CC RANAP_Iu-ReleaseCommand.lo CC RANAP_Iu-ReleaseComplete.lo CC RANAP_RelocationRequired.lo CC RANAP_RelocationCommand.lo CC RANAP_RelocationPreparationFailure.lo CC RANAP_RelocationRequest.lo CC RANAP_RelocationRequestAcknowledge.lo CC RANAP_RelocationFailure.lo CC RANAP_RelocationCancel.lo CC RANAP_RelocationCancelAcknowledge.lo CC RANAP_SRNS-ContextRequest.lo CC RANAP_RAB-DataForwardingList-SRNS-CtxReq.lo CC RANAP_DataVolumeReportRequest.lo CC RANAP_SRNS-ContextResponse.lo CC RANAP_SecurityModeCommand.lo CC RANAP_SecurityModeComplete.lo CC RANAP_SecurityModeReject.lo CC RANAP_DataVolumeReport.lo CC RANAP_Reset.lo CC RANAP_ResetAcknowledge.lo CC RANAP_RAB-ReleaseRequest.lo CC RANAP_RedirectionIndication.lo CC RANAP_RAB-ReleaseList.lo CC RANAP_Iu-ReleaseRequest.lo CC RANAP_RelocationDetect.lo CC RANAP_RelocationComplete.lo CC RANAP_Paging.lo CC RANAP_CommonID.lo CC RANAP_CN-InvokeTrace.lo CC RANAP_CN-DeactivateTrace.lo CC RANAP_LocationReportingControl.lo CC RANAP_LocationReport.lo CC RANAP_InitialUE-Message.lo CC RANAP_DirectTransfer.lo CC RANAP_Overload.lo CC RANAP_ErrorIndication.lo CC RANAP_SRNS-DataForwardCommand.lo CC RANAP_ForwardSRNS-Context.lo CC RANAP_RAB-AssignmentRequest.lo CC RANAP_RAB-SetupOrModifyList.lo CC RANAP_RAB-AssignmentResponse.lo CC RANAP_PrivateMessage.lo CC RANAP_ResetResource.lo CC RANAP_ResetResourceAcknowledge.lo CC RANAP_RANAP-RelocationInformation.lo CC RANAP_RAB-ModifyRequest.lo CC RANAP_LocationRelatedDataRequest.lo CC RANAP_LocationRelatedDataResponse.lo CC RANAP_LocationRelatedDataFailure.lo CC RANAP_InformationTransferIndication.lo CC RANAP_InformationTransferConfirmation.lo CC RANAP_InformationTransferFailure.lo CC RANAP_UESpecificInformationIndication.lo CC RANAP_DirectInformationTransfer.lo CC RANAP_UplinkInformationExchangeRequest.lo CC RANAP_UplinkInformationExchangeResponse.lo CC RANAP_UplinkInformationExchangeFailure.lo CC RANAP_MBMSSessionStart.lo CC RANAP_MBMSSessionStartResponse.lo CC RANAP_MBMSSessionStartFailure.lo CC RANAP_MBMSSessionUpdate.lo CC RANAP_MBMSSessionUpdateResponse.lo CC RANAP_MBMSSessionUpdateFailure.lo CC RANAP_MBMSSessionStop.lo CC RANAP_MBMSSessionStopResponse.lo CC RANAP_MBMSUELinkingRequest.lo CC RANAP_MBMSUELinkingResponse.lo CC RANAP_MBMSRegistrationRequest.lo CC RANAP_MBMSRegistrationResponse.lo CC RANAP_MBMSRegistrationFailure.lo CC RANAP_MBMSCNDe-RegistrationRequest.lo CC RANAP_MBMSCNDe-RegistrationResponse.lo CC RANAP_MBMSRABEstablishmentIndication.lo CC RANAP_MBMSRABReleaseRequest.lo CC RANAP_MBMSRABRelease.lo CC RANAP_MBMSRABReleaseFailure.lo CC RANAP_EnhancedRelocationCompleteRequest.lo CC RANAP_EnhancedRelocationCompleteResponse.lo CC RANAP_EnhancedRelocationCompleteFailure.lo CC RANAP_EnhancedRelocationCompleteConfirm.lo CC RANAP_RANAP-EnhancedRelocationInformationRequest.lo CC RANAP_RANAP-EnhancedRelocationInformationResponse.lo CC RANAP_SRVCC-CSKeysRequest.lo CC RANAP_SRVCC-CSKeysResponse.lo CC RANAP_UeRadioCapabilityMatchRequest.lo CC RANAP_UeRadioCapabilityMatchResponse.lo /bin/bash: line 1: 1382 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.13-45696\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.13-45696\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.13-45696\" -DSTDC_HEADERS=1 -I. -Wall -I../../include -I/build/deps/install/stow/libasn1c/include/ -I/build/deps/install/stow/libasn1c/include/asn1c -I/build/deps/install/stow/libosmocore/include/ -g -O2 -Wall -MT RANAP_UeRadioCapabilityMatchRequest.lo -MD -MP -MF .deps/RANAP_UeRadioCapabilityMatchRequest.Tpo -c -o RANAP_UeRadioCapabilityMatchRequest.lo RANAP_UeRadioCapabilityMatchRequest.c Makefile:2495: recipe for target 'RANAP_UeRadioCapabilityMatchRequest.lo' failed make[4]: *** [RANAP_UeRadioCapabilityMatchRequest.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory '/build/deps/osmo-iuh/src/ranap' Makefile:631: recipe for target 'install-recursive' failed make[3]: Leaving directory '/build/deps/osmo-iuh/src' make[3]: *** [install-recursive] Error 1 Makefile:790: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/osmo-iuh/src' make[2]: *** [install] Error 2 Makefile:446: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory '/build/deps/osmo-iuh' make: *** [install] Error 2 Makefile:745: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Jan 2 16:15:29 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 2 Jan 2019 16:15:29 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7833?= In-Reply-To: <1082530071.389.1546445466205.JavaMail.jenkins@jenkins.osmocom.org> References: <1082530071.389.1546445466205.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1786629213.390.1546445729808.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Jan 2 16:24:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 Jan 2019 16:24:53 +0000 Subject: Change in osmo-msc[master]: fix vlr ops.subscr_assoc re-association Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12449 Change subject: fix vlr ops.subscr_assoc re-association ...................................................................... fix vlr ops.subscr_assoc re-association In rare cases, a conn is already associated with a subscriber. So far, we abort()ed on that, bringing the entire osmo-msc down. Rather log an error and keep the service running. In vlr.ops.subscr_assoc, add success/failure return value, and abort the LU/PARQ on error. I haven't figured out in detail yet why/how a subscriber would re-launch a LU/PARQ on a conn that is already associated, so far it is merely clear that we do not want to crash the MSC if that happens. A log is in OS#3742. Related: OS#3742, OS#3743 Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c 4 files changed, 26 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12449/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 20a9c0f..3c778a9 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -235,7 +235,7 @@ void (*subscr_update)(struct vlr_subscr *vsub); /* notify MSC/SGSN that the given subscriber has been associated * with this msc_conn_ref */ - void (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); + int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); /* Forward a parsed GSUP message towards MSC message router */ int (*forward_gsup_msg)(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index dc0476b..2d34949 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1764,12 +1764,22 @@ } /* VLR informs us that the subscriber has been associated with a conn */ -static void msc_vlr_subscr_assoc(void *msc_conn_ref, +static int msc_vlr_subscr_assoc(void *msc_conn_ref, struct vlr_subscr *vsub) { struct ran_conn *conn = msc_conn_ref; OSMO_ASSERT(vsub); - OSMO_ASSERT(!conn->vsub); + if (conn->vsub) { + if (conn->vsub == vsub) + LOGPCONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", + vlr_subscr_name(vsub)); + else { + LOGPCONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," + " cannot associate with %s\n", vlr_subscr_name(vsub)); + return -EINVAL; + } + } + conn->vsub = vlr_subscr_get(vsub); OSMO_ASSERT(conn->vsub); conn->vsub->cs.attached_via_ran = conn->via_ran; @@ -1778,6 +1788,7 @@ * associated with the conn: merge the new Classmark into vsub->classmark. Don't overwrite valid * vsub->classmark with unset classmark, though. */ update_classmark(&conn->temporary_classmark, &conn->vsub->classmark); + return 0; } static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub, diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 3a0760d..3b40285 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -72,7 +72,7 @@ bool implicitly_accepted_parq_by_ciphering_cmd; }; -static void assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) +static int assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) { struct proc_arq_priv *par = fi->priv; struct vlr_instance *vlr = par->vlr; @@ -81,7 +81,7 @@ par->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); + return vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); } static const char *vlr_proc_arq_result_name(const struct osmo_fsm_inst *fi) @@ -371,8 +371,10 @@ GSM48_REJECT_NETWORK_FAILURE); } vsub->proc_arq_fsm = fi; - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub) != 0) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); return; } @@ -414,8 +416,10 @@ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub)) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index e635305..b00f8ce 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -954,7 +954,8 @@ lfp->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub); + if (vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub)) + lu_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE); return 0; } -- To view, visit https://gerrit.osmocom.org/12449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f Gerrit-Change-Number: 12449 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 16:24:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 Jan 2019 16:24:53 +0000 Subject: Change in osmo-msc[master]: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12450 Change subject: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates ...................................................................... vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates A patch not yet merged to master uncovered a cleanup bug: if the vlr_auth_fsm terminates in error, the vlr_subscr->auth_fsm may not be reset to NULL even though the FSM instance has been deallocated. Fix by a .cleanup callback. The patch uncovering the bug is 1fbf45c291f7e1f09ef2e862abfeca6a23efdc03, 'enrich context for vlr_subscr_name and ran_conn fi name', which sets auth_fsm context, on a non-NULL auth_fsm that has been deallocated. The error looks like: at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:957 file=file at entry=0x5611d8f10c28 "../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c", line=line at entry=1467) at ../../../src/libosmocore/src/fsm.c:580 parent_event_failure=parent_event_failure at entry=6, parent_event_data=parent_event_data at entry=0x0, vlr=0x5611d98862b0, msc_conn_ref=msc_conn_ref at entry=0x5611d9aa8150, type=VLR_LU_TYPE_REGULAR, tmsi=4294967295, imsi=0x7ffd756c1cf0 "262423403004874", old_lai=0x7ffd756c1ce0, new_lai=0x7ffd756c1ce8, authentication_required=true, ciphering_required=true, is_r99=false, is_utran=false, assign_tmsi=true) at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:1467 at ../../../../src/osmo-msc/src/libmsc/gsm_04_08.c:443 Unfortunately I am not sure whether we have saved logging leading up to this error. Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd --- M src/libvlr/vlr_auth_fsm.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/12450/1 diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 8419696..ccf3660 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -240,9 +240,6 @@ /* Terminate the Auth FSM Instance and notify parent */ static void auth_fsm_term(struct osmo_fsm_inst *fi, enum gsm48_reject_value result) { - struct auth_fsm_priv *afp = fi->priv; - struct vlr_subscr *vsub = afp->vsub; - LOGPFSM(fi, "Authentication terminating with result %s\n", vlr_auth_fsm_result_name(result)); @@ -254,6 +251,12 @@ /* return the result to the parent FSM */ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, &result); +} + +static void auth_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct auth_fsm_priv *afp = fi->priv; + struct vlr_subscr *vsub = afp->vsub; vsub->auth_fsm = NULL; } @@ -583,6 +586,7 @@ .allstate_action = NULL, .log_subsys = DVLR, .event_names = fsm_auth_event_names, + .cleanup = auth_fsm_cleanup, }; /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/12450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd Gerrit-Change-Number: 12450 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 22:58:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 22:58:44 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... libmsc/VTY: introduce kill-switch for routing SMS over GSUP As a rudiment of OsmoNiTB, OsmoMSC is still involved in SMS processing, storage (in SQLite DB), and routing (via SMPP). In real networks this is done by the external entity called SMSC (SMS Centre), while the MSC is doing re-encapsulation of GSM 04.11 SM-TL (Transport Layer) payload (i.e. TPDU) between SM-RL (Relay Layer) and MAP. Since OsmoMSC itself is not a 'Network in The Box' anymore, it makes sense to replicate the 'traditional' behaviour of MSC. The problem is that this behaviour cannot co-exist with the current implementation, so the key idea is to rip out the local SMS storage and routing from OsmoMSC, and (re)implement it in a separate process (OsmoSMSC?). As a temporary solution, this change introduces a 'kill-switch' VTY option that enables routing of SMS messages over GSUP towards ESME (through VLR and HLR), but breaks the local storage and routing. This is why it's disabled by default. As soon as we move the SMS processing and storage away from OsmoMSC, this behaviour would be enabled by default, and the VTY option would be hidden and deprecated. At the moment, this option basically does nothing, and will take an effect in the follow-up changes. Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Related: OS#3587 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c M tests/test_nodes.vty 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Max: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index d2511cb..dab082d 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -160,6 +160,14 @@ struct gsm_sms_queue *sms_queue; + /* The "SMS over GSUP" kill-switch that basically breaks internal + * SMS routing (i.e. SQLite DB and SMPP), and enables forwarding + * of short messages over GSUP towards ESME (through VLR and HLR). + * Please see OS#3587 for details. This is a temporary solution, + * so it should be removed as soon as we move the SMS processing + * logic to an external process (OsmoSMSC?). REMOVE ME! */ + bool sms_over_gsup; + /* control interface */ struct ctrl_handle *ctrl; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 7745e5d..201d2aa 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -476,6 +476,24 @@ return CMD_SUCCESS; } +/* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */ +DEFUN(cfg_msc_sms_over_gsup, cfg_msc_sms_over_gsup_cmd, + "sms-over-gsup", + "Enable routing of SMS messages over GSUP\n") +{ + gsmnet->sms_over_gsup = true; + return CMD_SUCCESS; +} + +/* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */ +DEFUN(cfg_msc_no_sms_over_gsup, cfg_msc_no_sms_over_gsup_cmd, + "no sms-over-gsup", + NO_STR "Disable routing of SMS messages over GSUP\n") +{ + gsmnet->sms_over_gsup = false; + return CMD_SUCCESS; +} + static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -512,6 +530,9 @@ if (gsmnet->msc_ipa_name) vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); + if (gsmnet->sms_over_gsup) + vty_out(vty, " sms-over-gsup%s", VTY_NEWLINE); + mgcp_client_config_write(vty, " "); #ifdef BUILD_IU ranap_iu_vty_config_write(vty, " "); @@ -1533,6 +1554,8 @@ install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); install_element(MSC_NODE, &cfg_msc_ipa_name_cmd); + install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd); + install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index d080082..18467d9 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -41,6 +41,8 @@ paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME + sms-over-gsup + no sms-over-gsup 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/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 22:58:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 Jan 2019 22:58:45 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: forward MO SMS messages over GSUP Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Depends-on: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I7abc95b8e416f7308d54e11be11c08586d18e6c5 Related Change-Id: (TTCN) Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Related: OS#3587 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_04_11.h A include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c A src/libmsc/gsm_04_11_gsup.c 7 files changed, 249 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index d98bc9c..13ac166 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -5,6 +5,7 @@ debug.h \ gsm_04_08.h \ gsm_04_11.h \ + gsm_04_11_gsup.h \ gsm_04_14.h \ gsm_04_80.h \ gsm_09_11.h \ diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 95098c9..b739918 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -2,6 +2,7 @@ #define _GSM_04_11_H #include +#include struct vlr_subscr; struct ran_conn; diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h new file mode 100644 index 0000000..94ff8f6 --- /dev/null +++ b/include/osmocom/msc/gsm_04_11_gsup.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +struct osmo_gsup_message; +struct vlr_subscr; +struct gsm_trans; +struct msgb; + +int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr); +int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, + uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len); +int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 9183ff9..72da747 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -35,6 +35,7 @@ gsm_04_08.c \ gsm_04_08_cc.c \ gsm_04_11.c \ + gsm_04_11_gsup.c \ gsm_04_14.c \ gsm_04_80.c \ gsm_09_11.c \ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index dc0476b..b042baf 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1791,6 +1791,14 @@ DEBUGP(DMSC, "Routed to GSM 09.11 SS/USSD handler\n"); return gsm0911_gsup_handler(vsub, gsup_msg); + /* GSM 04.11 code implementing MO SMS */ + case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: + case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT: + case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR: + case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT: + DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n"); + return gsm411_gsup_mo_handler(vsub, gsup_msg); + default: LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n", osmo_gsup_message_type_name(gsup_msg->message_type)); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 62f3bba..788a0a9 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -664,10 +664,20 @@ /* Receive a 04.11 TPDU inside RP-DATA / user data */ static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans, - struct gsm411_rp_hdr *rph) + struct gsm411_rp_hdr *rph, + uint8_t *dst, uint8_t dst_len) { int rc = 0; + if (trans->net->sms_over_gsup) { + /* RP-ACK or RP-ERROR is triggered as soon as we get the response */ + rc = gsm411_gsup_mo_fwd_sm_req(trans, msg, rph->msg_ref, dst, dst_len); + if (rc) /* GSUP message sending error */ + return gsm411_send_rp_error(trans, rph->msg_ref, rc); + + return 0; + } + rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref); if (rc == 0) return gsm411_send_rp_ack(trans, rph->msg_ref); @@ -715,7 +725,7 @@ DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); - return gsm411_rx_rp_ud(msg, trans, rph); + return gsm411_rx_rp_ud(msg, trans, rph, dst, dst_len); } static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms) @@ -852,6 +862,15 @@ { int rc; + if (trans->net->sms_over_gsup) { + /* RP-ACK or RP-ERROR is triggered as soon as we get the response */ + rc = gsm411_gsup_mo_ready_for_sm_req(trans, rph->msg_ref); + if (rc) /* GSUP message sending error */ + return gsm411_send_rp_error(trans, rph->msg_ref, rc); + + return 0; + } + rc = gsm411_send_rp_ack(trans, rph->msg_ref); /* MS tells us that it has memory for more SMS, we need diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c new file mode 100644 index 0000000..5c01072 --- /dev/null +++ b/src/libmsc/gsm_04_11_gsup.c @@ -0,0 +1,203 @@ +/* + * (C) 2018 by Vadim Yanitskiy + * + * 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 + +/* Common helper for preparing to be encoded GSUP message */ +static void gsup_sm_msg_init(struct osmo_gsup_message *gsup_msg, + enum osmo_gsup_message_type msg_type, const char *imsi, + uint8_t *sm_rp_mr) +{ + /* Init a mew GSUP message */ + memset(gsup_msg, 0x00, sizeof(*gsup_msg)); + gsup_msg->message_type = msg_type; + + /* SM-RP-MR (Message Reference) */ + gsup_msg->sm_rp_mr = sm_rp_mr; + + /* Fill in subscriber's IMSI */ + OSMO_STRLCPY_ARRAY(gsup_msg->imsi, imsi); +} + +int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, + uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len) +{ + uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 }; + struct osmo_gsup_message gsup_msg; + size_t bcd_len; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX GSUP MO-forwardSM-Req\n"); + + /* Assign SM-RP-MR to transaction state */ + trans->sms.sm_rp_mr = sm_rp_mr; + + /* Encode subscriber's MSISDN */ + bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf), + 0, trans->vsub->msisdn); + if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) { + LOGP(DLSMS, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n"); + return -EINVAL; + } + + /* Initialize a new GSUP message */ + gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + trans->vsub->imsi, &sm_rp_mr); + + /* According to 12.2.3, the MSISDN from VLR is inserted here */ + gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN; + gsup_msg.sm_rp_oa_len = bcd_len; + gsup_msg.sm_rp_oa = bcd_buf; + + /* SM-RP-DA should (already) contain SMSC address */ + gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR; + gsup_msg.sm_rp_da_len = sm_rp_da_len; + gsup_msg.sm_rp_da = sm_rp_da; + + /* SM-RP-UI (TPDU) is pointed by msgb->l4h */ + gsup_msg.sm_rp_ui_len = msgb_l4len(msg); + gsup_msg.sm_rp_ui = (uint8_t *) msgb_sms(msg); + + return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg); +} + +int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX GSUP READY-FOR-SM Req\n"); + + /* Assign SM-RP-MR to transaction state */ + trans->sms.sm_rp_mr = sm_rp_mr; + + /* Initialize a new GSUP message */ + gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, + trans->vsub->imsi, &sm_rp_mr); + + /* Indicate SMMA as the Alert Reason */ + gsup_msg.sm_alert_rsn = OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL; + + return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg); +} + +/* Triggers either RP-ACK or RP-ERROR on response from SMSC */ +int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg) +{ + struct vlr_instance *vlr; + struct gsm_network *net; + struct gsm_trans *trans; + struct ran_conn *conn; + const char *msg_name; + bool msg_is_err; + + /* Obtain required pointers */ + vlr = vsub->vlr; + net = (struct gsm_network *) vlr->user_ctx; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + + /* Determine the message type and name */ + msg_is_err = OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type); + switch (gsup_msg->message_type) { + case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: + case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT: + msg_name = "MO-forwardSM"; + break; + case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR: + case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT: + msg_name = "MO-ReadyForSM"; + break; + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + LOGP(DLSMS, LOGL_DEBUG, "RX %s-%s\n", msg_name, + msg_is_err ? "Err" : "Res"); + + /* Make sure that 'SMS over GSUP' is expected */ + if (!net->sms_over_gsup) { + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "Unexpected MO SMS over GSUP, " + "ignoring message...\n"); + return -EIO; + } + + /* Verify GSUP message */ + if (!gsup_msg->sm_rp_mr) + goto msg_error; + if (msg_is_err && !gsup_msg->sm_rp_cause) + goto msg_error; + + /* Attempt to find a DTAP-connection */ + conn = connection_for_subscr(vsub); + if (!conn) { + /* FIXME: should we establish it then? */ + LOGP(DLSMS, LOGL_NOTICE, "No connection found for %s, " + "ignoring %s-%s message...\n", vlr_subscr_name(vsub), + msg_name, msg_is_err ? "Err" : "Res"); + return -EIO; /* TODO: notify sender about that? */ + } + + /* Attempt to find DTAP-transaction */ + trans = trans_find_by_sm_rp_mr(conn, *(gsup_msg->sm_rp_mr)); + if (!trans) { + LOGP(DLSMS, LOGL_NOTICE, "No transaction found for %s, " + "ignoring %s-%s message...\n", vlr_subscr_name(vsub), + msg_name, msg_is_err ? "Err" : "Res"); + return -EIO; /* TODO: notify sender about that? */ + } + + /* Send either RP-ERROR, or RP-ACK */ + if (msg_is_err) { + /* TODO: handle optional SM-RP-UI payload (requires API change) */ + gsm411_send_rp_error(trans, *(gsup_msg->sm_rp_mr), + *(gsup_msg->sm_rp_cause)); + } else { + gsm411_send_rp_ack(trans, *(gsup_msg->sm_rp_mr)); + } + + return 0; + +msg_error: + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "RX malformed %s-%s\n", + msg_name, msg_is_err ? "Err" : "Res"); + return -EINVAL; +} -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 23:29:17 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 Jan 2019 23:29:17 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 123 PS1, Line 123: osmo_fsm_inst > I still think as long as we use asciidoc, we should use it properly ;) I checked and in fact I am using it properly. If you verify the generated doxygen HTML, you will see that with this doc text, there already is a working cross link to struct osmo_fsm_inst. - see doxygen doc for '\ref': "Creates a reference to a named section, subsection, page or anchor." \ref actually isn't about referencing documented data structures or functions! http://www.doxygen.nl/manual/commands.html#cmdref - see doc for \a: "Displays the argument in italics." \a is merely cosmetic, it doesn't affect cross referencing. http://www.doxygen.nl/manual/commands.html#cmda (Notice also that there are misleading cross references. For example, the 'level' arg of this macro references the uint8_t level, member of struct gsmtap_osmocore_log_hdr.) The bottom line is that in my opinion we should remove all '\a' and '\ref' from cross references to functions and structs. Only references to pages or subsections should remain. -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 02 Jan 2019 23:29:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 2 23:31:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 Jan 2019 23:31:48 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... Patch Set 2: Code-Review+2 ...and that's why I am going to pass this patch now. -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 02 Jan 2019 23:31:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:31:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:31:02 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... add API doc for LOGPFSM* macros Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 --- M include/osmocom/core/fsm.h 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index ee71451..8db8cce 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -119,9 +119,24 @@ void osmo_fsm_log_addr(bool log_addr); +/*! Log using FSM instance's context, on explicit logging level. + * \param fi An osmo_fsm_inst. + * \param level A logging level, e.g. LOGL_INFO. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ #define LOGPFSML(fi, level, fmt, args...) \ LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args) +/*! Log using FSM instance's context, on explicit logging level, and with explicit source file and line info. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param level A logging level, e.g. LOGL_INFO. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ LOGPSRC((fi)->fsm->log_subsys, level, \ caller_file, caller_line, \ @@ -130,9 +145,25 @@ osmo_fsm_state_name((fi)->fsm, (fi)->state), \ ## args) +/*! Log using FSM instance's context. + * The log level to log on is obtained from the FSM instance. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ #define LOGPFSM(fi, fmt, args...) \ LOGPFSML(fi, (fi)->log_level, fmt, ## args) +/*! Log using FSM instance's context, with explicit source file and line info. + * The log level to log on is obtained from the FSM instance. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ LOGPFSMLSRC(fi, (fi)->log_level, \ caller_file, caller_line, \ -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:31:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:31:07 +0000 Subject: Change in libosmocore[master]: LOGPFSM*: guard against fi == NULL In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12385 ) Change subject: LOGPFSM*: guard against fi == NULL ...................................................................... LOGPFSM*: guard against fi == NULL The LOGPFSM macros are in such wide use that they should guard against a NULL fi pointer. In case of NULL, default to subsys = DLGLOBAL, loglevel = LOGL_ERROR and state = "fi=NULL". Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 --- M include/osmocom/core/fsm.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 8db8cce..f1080cd 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -138,11 +138,11 @@ * \param args Format string arguments. */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ - LOGPSRC((fi)->fsm->log_subsys, level, \ + LOGPSRC((fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ caller_file, caller_line, \ "%s{%s}: " fmt, \ osmo_fsm_inst_name(fi), \ - osmo_fsm_state_name((fi)->fsm, (fi)->state), \ + (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", \ ## args) /*! Log using FSM instance's context. @@ -153,7 +153,7 @@ * \param args Format string arguments. */ #define LOGPFSM(fi, fmt, args...) \ - LOGPFSML(fi, (fi)->log_level, fmt, ## args) + LOGPFSML(fi, (fi) ? (fi)->log_level : LOGL_ERROR, fmt, ## args) /*! Log using FSM instance's context, with explicit source file and line info. * The log level to log on is obtained from the FSM instance. @@ -165,7 +165,7 @@ * \param args Format string arguments. */ #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ - LOGPFSMLSRC(fi, (fi)->log_level, \ + LOGPFSMLSRC(fi, (fi) ? (fi)->log_level : LOGL_ERROR, \ caller_file, caller_line, \ fmt, ## args) -- To view, visit https://gerrit.osmocom.org/12385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 Gerrit-Change-Number: 12385 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:31:09 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:31:09 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12386 ) Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... add LOGPFSMSL(), LOGPFSMSLSRC() Using an FSM instace's logging context is very useful. Sometimes it makes sense to log something on a different logging category than the FSM definition's default category. For example, an MSC conn has aspects concerning MM, CC, RR, MGCP, ..., and currently all of those log on DMM. This came up in I358cfbaf0f44f25148e8b9bafcb9257b1952b35a, where I want to log an MGCP event using a ran_conn context, and used the conn->fi->id. That of course omits context like the current conn FSM state... I remember at least one other place where I recently added logging using some fi->id as context, so it might turn out useful in various places. Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d --- M include/osmocom/core/fsm.h 1 file changed, 30 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index f1080cd..5bf5328 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -119,6 +119,34 @@ void osmo_fsm_log_addr(bool log_addr); +/*! Log using FSM instance's context, on explicit logging subsystem and level. + * \param fi An osmo_fsm_inst. + * \param subsys A logging subsystem, e.g. DLGLOBAL. + * \param level A logging level, e.g. LOGL_INFO. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ +#define LOGPFSMSL(fi, subsys, level, fmt, args...) \ + LOGPFSMSLSRC(fi, subsys, level, __FILE__, __LINE__, fmt, ## args) + +/*! Log using FSM instance's context, on explicit logging subsystem and level, + * and passing explicit source file and line information. + * \param fi An osmo_fsm_inst. + * \param subsys A logging subsystem, e.g. DLGLOBAL. + * \param level A logging level, e.g. LOGL_INFO. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like format string. + * \param args Format string arguments. + */ +#define LOGPFSMSLSRC(fi, subsys, level, caller_file, caller_line, fmt, args...) \ + LOGPSRC(subsys, level, \ + caller_file, caller_line, \ + "%s{%s}: " fmt, \ + osmo_fsm_inst_name(fi), \ + (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", ## args) + + /*! Log using FSM instance's context, on explicit logging level. * \param fi An osmo_fsm_inst. * \param level A logging level, e.g. LOGL_INFO. @@ -138,12 +166,8 @@ * \param args Format string arguments. */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ - LOGPSRC((fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ - caller_file, caller_line, \ - "%s{%s}: " fmt, \ - osmo_fsm_inst_name(fi), \ - (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", \ - ## args) + LOGPFSMSLSRC(fi, (fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ + caller_file, caller_line, fmt, ## args) /*! Log using FSM instance's context. * The log level to log on is obtained from the FSM instance. -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:34:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:34:15 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 2: > not a "call assignment" but a "channel assignment" could be read as: "Call: Assignment", but yes, I agree. -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 00:34:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:34:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:34:53 +0000 Subject: Change in osmo-msc[master]: cosmetics in msc_mgcp_call_release() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12396 ) Change subject: cosmetics in msc_mgcp_call_release() ...................................................................... cosmetics in msc_mgcp_call_release() Use local variables instead of writing trans->conn-> all the time. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308 --- M src/libmsc/msc_mgcp.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 71f36b3..6170c10 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1143,26 +1143,29 @@ int msc_mgcp_call_release(struct gsm_trans *trans) { struct mgcp_ctx *mgcp_ctx; + struct ran_conn *conn = trans->conn; OSMO_ASSERT(trans); - if (!trans->conn) { + if (!conn) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid conn, call release failed\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - if (!trans->conn->rtp.mgcp_ctx) { + mgcp_ctx = conn->rtp.mgcp_ctx; + if (!mgcp_ctx) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid mgcp context, call release failed.\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - if (!trans->conn->rtp.mgcp_ctx->fsm) { + if (!mgcp_ctx->fsm) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) no FSM, call release failed\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - mgcp_ctx = trans->conn->rtp.mgcp_ctx; + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call release: tearing down MGW endpoint\n", + trans->transaction_id, vlr_subscr_name(trans->vsub)); /* Inform the FSM that as soon as it reaches ST_HALT it may free * all context information immediately */ @@ -1176,10 +1179,7 @@ * overwriting the context pointer with NULL. The FSM will now * take care for a graceful shutdown and when done it will free * all related context information */ - trans->conn->rtp.mgcp_ctx = NULL; - - LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) call release initiated\n", - vlr_subscr_name(trans->vsub)); + conn->rtp.mgcp_ctx = NULL; return 0; } -- To view, visit https://gerrit.osmocom.org/12396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308 Gerrit-Change-Number: 12396 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:34:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:34:54 +0000 Subject: Change in osmo-msc[master]: release RTP stream only for matching CC transaction In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12397 ) Change subject: release RTP stream only for matching CC transaction ...................................................................... release RTP stream only for matching CC transaction Do not break the currently ongoing call when rejecting a second incoming caller. There may be multiple (up to seven) simultaneous CC transactions, and there is one mgcp_ctx for the currently active RTP stream. Release the MGCP context only when the active CC transaction is releasing. Before this patch, any CC transaction release would destroy the single MGCP context, possibly breaking the currently ongoing call (another CC trans). This also fixes a possible use-after-free if there were pending MGCP message responses for the MGCP context; they are canceled properly for a released transaction, but since one transaction would free the other transaction's MGCP state, the clean up did not take place and possibly caused an mgcp client response handling to access a freed mgcp_ctx. Related: OS#3735 Change-Id: I1f8746e7babfcd3028a4d2c0ba260c608c686c76 --- M src/libmsc/msc_mgcp.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 6170c10..23e68e7 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1164,6 +1164,12 @@ return -EINVAL; } + if (mgcp_ctx->trans != trans) { + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) call release for background CC transaction\n", + trans->transaction_id, vlr_subscr_name(trans->vsub)); + return 0; + } + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call release: tearing down MGW endpoint\n", trans->transaction_id, vlr_subscr_name(trans->vsub)); -- To view, visit https://gerrit.osmocom.org/12397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f8746e7babfcd3028a4d2c0ba260c608c686c76 Gerrit-Change-Number: 12397 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:36:06 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:36:06 +0000 Subject: Change in osmo-bsc[master]: fix call-during-call: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix call-during-call: switch off re-using lchan during assignment ...................................................................... Patch Set 1: ping? -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 00:36:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:42:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:42:07 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#9). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/9 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:46:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:46:03 +0000 Subject: Change in osmo-msc[master]: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12450 to look at the new patch set (#2). Change subject: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates ...................................................................... vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates Probably fixes this segfault: at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:957 file=file at entry=0x5611d8f10c28 "../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c", line=line at entry=1467) at ../../../src/libosmocore/src/fsm.c:580 parent_event_failure=parent_event_failure at entry=6, parent_event_data=parent_event_data at entry=0x0, vlr=0x5611d98862b0, msc_conn_ref=msc_conn_ref at entry=0x5611d9aa8150, type=VLR_LU_TYPE_REGULAR, tmsi=4294967295, imsi=0x7ffd756c1cf0 "262423403004874", old_lai=0x7ffd756c1ce0, new_lai=0x7ffd756c1ce8, authentication_required=true, ciphering_required=true, is_r99=false, is_utran=false, assign_tmsi=true) at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:1467 at ../../../../src/osmo-msc/src/libmsc/gsm_04_08.c:443 The segfault is indirectly caused by 1fbf45c291f7e1f09ef2e862abfeca6a23efdc03, 'enrich context for vlr_subscr_name and ran_conn fi name', which sets auth_fsm context, on a non-NULL auth_fsm that has been deallocated. Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd --- M src/libvlr/vlr_auth_fsm.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/12450/2 -- To view, visit https://gerrit.osmocom.org/12450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd Gerrit-Change-Number: 12450 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 00:52:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 00:52:04 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#4). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Related: OS#3355 Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/4 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 01:13:09 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 01:13:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12357 to look at the new patch set (#4). Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... mgcp_client: make domain part of endpoint configurable So far, both osmo-msc and osmo-bsc always pass endpoint names of the form '... at mgw' to osmo-mgw. Allow configuring the 'mgw' part. Note that the actual way to pass a differing name is to pass a composed 'rtpbridge/*@foo' to mgcp_msg_gen() in the struct mgcp_msg. So this merely adds a common VTY config for the domain name part, changes to clients are necessary. - add mgcp_client_rtpbridge_wildcard() (useful for AoIP endpoints) - add mgcp_client_endpoint_domain() (useful for SCCPlite endpoints) - add mgcp client vty cfg 'mgw endpoint-domain NAME' Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. Also: our MGCP clients osmo-bsc and osmo-msc use code dup to compose the initial 'rtpbridge/*@mgw' rtpbridge wildcard. It should be defined by this API instead. This will be used by: * osmo-msc I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 * osmo-bsc I492023e9dca0233ec0a077032455d9f2e3880f78 After these, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint on two separate osmo-mgw instances: osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc There can also be '0 at bsc' and '1 at msc' endpoints on one single osmo-mgw instance with: osmo-mgw.cfg: mgcp domain * and same osmo-{bsc,msc}.cfg as above. (By default, everything will still use '@mgw') Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c M tests/mgcp_client/mgcp_client_test.err 4 files changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/12357/4 -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 01:20:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 01:20:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/#/c/12357/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12357/3//COMMIT_MSG at 20 PS3, Line 20: Rationale: reading pcaps becomes so much easier when each of osmo-bsc and : osmo-msc address their MGW with differing domain names. Otherwise, both will : have a '0 at mgw' endpoint and it gets really confusing. > How cold both use the same endpoint? The endpoint names (local part in front of @) is allocated by [?] In a scenario where both osmo-msc and osmo-bsc use the same osmo-mgw, indeed each new endpoint will get a new number. But when you have one osmo-mgw each, then both osmo-mgw instances independently create endpoints, so for the first call occuring, both actually create a '0 at mgw' and wireshark shows identically named endpoints on separate osmo-mgw instances. Then there is the need to also look at the source/dest address and/or port numbers to figure out what is going on. https://gerrit.osmocom.org/#/c/12357/3/include/osmocom/mgcp_client/mgcp_client.h File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/#/c/12357/3/include/osmocom/mgcp_client/mgcp_client.h at 28 PS3, Line 28: MG > why 64? Is there some kind of maximum DNS domain name length we should use? I'm not sure at all. In fact I was just picking something at random and not bothering with details, just to quickly use this at 35c3. Same with other parts of this patch. I'm glad code review worked nicely here :) Found MGCP_ENDPOINT_MAXLEN, though that would include the "123@" part, it is a good rough choice I guess. https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c at 830 PS3, Line 830: > Oh, wow, this breaks Gerrit's syntax highlighting :D yeah, I'm also getting C comment warnings when trying to write 'rtpbridge/*@foo' in a comment :P -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 01:20:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 01:21:35 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 01:21:35 +0000 Subject: Change in libosmocore[master]: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12451 Change subject: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type ...................................................................... gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type In the MSC, we have RAN types GERAN_A and UTRAN_IU, now we need a similar enum in osmo-hlr's GSUP client. Naming: in the MAP specifications, the RAN type is mostly called RAT type, (Radio Access Network vs. Radio Access Technology?). Since GSUP is more about MAP messages, I'm calling the enum osmo_rat_type. Rationale: osmo-msc and osmo-sgsn want to tell the osmo-hlr which RAT a subscriber is calling on. A subsequent patch will extend the GSUP protocol and add a RAT types IE. Change-Id: I659687aef7a4d67ca372a39fef31dee07aed7631 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/12451/1 diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index fe5903d..095ac41 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -241,3 +241,16 @@ int gsm_7bit_encode(uint8_t *result, const char *data) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead"); int gsm_7bit_encode_ussd(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n_ussd() instead"); int gsm_7bit_encode_oct(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead"); + +enum osmo_rat_type { + OSMO_RAT_UNKNOWN = 0, + OSMO_RAT_GERAN_A, + OSMO_RAT_UTRAN_IU, + + /* keep this last */ + OSMO_RAT_COUNT +}; + +extern const struct value_string osmo_rat_type_names[]; +inline static const char *osmo_rat_type_name(enum osmo_rat_type val) +{ return get_value_string(osmo_rat_type_names, val); } diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 8b4b558..3862047 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -997,3 +997,11 @@ return gsm_7bit_encode_n(result, GSM_7BIT_LEGACY_MAX_BUFFER_SIZE, data, octets); } + +/* This is also used by osmo-hlr's db schema */ +const struct value_string osmo_rat_type_names[] = { + { OSMO_RAT_UNKNOWN, "unknown" }, + { OSMO_RAT_GERAN_A, "GERAN-A" }, + { OSMO_RAT_UTRAN_IU, "UTRAN-Iu" }, + {} +}; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 76b3fd0..bb97878 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -553,5 +553,7 @@ sgsap_ue_emm_mode_names; sgsap_ie_tlvdef; +osmo_rat_type_names; + local: *; }; -- To view, visit https://gerrit.osmocom.org/12451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I659687aef7a4d67ca372a39fef31dee07aed7631 Gerrit-Change-Number: 12451 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 01:21:35 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 01:21:35 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12452 Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... gsup: add OSMO_GSUP_RAT_TYPES_IE Corresponds to the Supported RAT Types Indicator from 3GPP TS 29.002. See 8.1.2 MAP_UPDATE_LOCATION service. This is useful to communicate the RAN / RAT type of the current subscriber during Location Updating Request. The use case we have in mind for VLR <-> HLR would require only a single RAT type, but 29.002 specifies a list of supported RAT types. Hence implement this as a list. So far, have room for eight RAT types in the gsup_msg. That is an arbitrary random choice without any rationale. Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.err 3 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/12452/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 6adb0bf..8384e24 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #define OSMO_GSUP_PORT 4222 @@ -83,6 +84,7 @@ OSMO_GSUP_AUTS_IE = 0x26, OSMO_GSUP_RES_IE = 0x27, OSMO_GSUP_CN_DOMAIN_IE = 0x28, + OSMO_GSUP_RAT_TYPES_IE = 0x29, OSMO_GSUP_SESSION_ID_IE = 0x30, OSMO_GSUP_SESSION_STATE_IE = 0x31, @@ -275,6 +277,9 @@ const uint8_t *imei_enc; size_t imei_enc_len; enum osmo_gsup_imei_result imei_result; + + enum osmo_rat_type rat_types[8]; + size_t rat_types_len; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 3d2a8e2..29cf488 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -282,6 +282,7 @@ struct osmo_gsup_message *gsup_msg) { int rc; + int i; uint8_t tag; /* the shift/match functions expect non-const pointers, but we'll * either copy the data or cast pointers back to const before returning @@ -442,6 +443,16 @@ gsup_msg->cn_domain = *value; break; + case OSMO_GSUP_RAT_TYPES_IE: + if (value_len > ARRAY_SIZE(gsup_msg->rat_types)) { + LOGP(DLGSUP, LOGL_ERROR, "nr of RAT types %zu > %zu\n", value_len, ARRAY_SIZE(gsup_msg->rat_types)); + return -GMM_CAUSE_COND_IE_ERR; + } + for (i = 0; i < value_len; i++) + gsup_msg->rat_types[i] = value[i]; + gsup_msg->rat_types_len = value_len; + break; + case OSMO_GSUP_CHARG_CHAR_IE: gsup_msg->pdp_charg_enc = value; gsup_msg->pdp_charg_enc_len = value_len; @@ -676,6 +687,20 @@ msgb_tlv_put(msg, OSMO_GSUP_CN_DOMAIN_IE, 1, &dn); } + if (gsup_msg->rat_types_len) { + int i; + uint8_t *len = msgb_tl_put(msg, OSMO_GSUP_RAT_TYPES_IE); + *len = gsup_msg->rat_types_len; + for (i = 0; i < gsup_msg->rat_types_len; i++) { + if (!gsup_msg->rat_types[i] || gsup_msg->rat_types[i] >= OSMO_RAT_COUNT) { + LOGP(DLGSUP, LOGL_ERROR, "Failed to encode RAT type %s (nr %d)\n", + osmo_rat_type_name(gsup_msg->rat_types[i]), i); + return -EINVAL; + } + msgb_v_put(msg, gsup_msg->rat_types[i]); + } + } + if (gsup_msg->pdp_charg_enc) { msgb_tlv_put(msg, OSMO_GSUP_CHARG_CHAR_IE, gsup_msg->pdp_charg_enc_len, gsup_msg->pdp_charg_enc); diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 73b35fc..ea6fa15 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -101,26 +101,26 @@ DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures - message 2: tested 21248 modifications, 2575 parse failures + message 2: tested 21248 modifications, 2577 parse failures message 3: tested 2816 modifications, 510 parse failures message 4: tested 3584 modifications, 770 parse failures - message 5: tested 20736 modifications, 4022 parse failures + message 5: tested 20736 modifications, 4024 parse failures message 6: tested 3584 modifications, 771 parse failures message 7: tested 3584 modifications, 770 parse failures message 8: tested 2816 modifications, 510 parse failures message 9: tested 2816 modifications, 510 parse failures message 10: tested 3584 modifications, 770 parse failures message 11: tested 3328 modifications, 769 parse failures - message 12: tested 54016 modifications, 4626 parse failures - message 13: tested 11520 modifications, 1026 parse failures + message 12: tested 54016 modifications, 4628 parse failures + message 13: tested 11520 modifications, 1028 parse failures message 14: tested 5120 modifications, 1030 parse failures - message 15: tested 10752 modifications, 1262 parse failures + message 15: tested 10752 modifications, 1263 parse failures message 16: tested 7680 modifications, 1271 parse failures message 17: tested 8448 modifications, 2053 parse failures - message 18: tested 11264 modifications, 2307 parse failures + message 18: tested 11264 modifications, 2308 parse failures message 19: tested 5120 modifications, 1031 parse failures message 20: tested 6656 modifications, 1546 parse failures message 21: tested 3584 modifications, 771 parse failures - message 22: tested 5632 modifications, 771 parse failures + message 22: tested 5632 modifications, 772 parse failures message 23: tested 3584 modifications, 770 parse failures message 24: tested 3584 modifications, 771 parse failures -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:16:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:16:53 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 15 PS1, Line 15: 0x08bde4ec > TMSIs are typically (in the telecom world) represented as uppercase hex digits. [?] ack https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 30 PS1, Line 30: Leading zeros are clutter > well, the only reson to use them would be to align log output of multiple lines at the same column, [?] the output is already non-aligned from FSM name, MSISDN length, FSM instance state... DMM RAN_conn(UTRAN-Iu-42_unknown_CM_SERVICE_REQ){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(UTRAN-Iu-42_unknown_CM_SERVICE_REQ){PR_ARQ_S_INIT}: Allocated -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 03 Jan 2019 02:16:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:17:16 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:17:16 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12454 Change subject: use osmo_rat_type from libosmocore ...................................................................... use osmo_rat_type from libosmocore Replace locally defined enum ran_type with libosmocore's new enum osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names. The string representations change, which has cosmetic effects on the test suite expectations. Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 36 files changed, 835 insertions(+), 850 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/12454/1 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:17:16 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:17:16 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12453 Change subject: refactor ran_conn_get_conn_id() ...................................................................... refactor ran_conn_get_conn_id() Instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function has no callers; these will be introduced by I66a68ce2eb8957a35855a3743d91a86299900834 Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f --- M src/libmsc/ran_conn.c 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/12453/1 diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 9b63f16..1d956a4 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -491,22 +491,27 @@ .timer_cb = ran_conn_fsm_timeout, }; +/* Return statically allocated string of the ran_conn RAT type and id. */ char *ran_conn_get_conn_id(struct ran_conn *conn) { - char *id; + static char id[42]; + uint32_t conn_id; switch (conn->via_ran) { case RAN_GERAN_A: - id = talloc_asprintf(conn, "GERAN_A-%08x", conn->a.conn_id); + conn_id = conn->a.conn_id; break; case RAN_UTRAN_IU: - id = talloc_asprintf(conn, "UTRAN_IU-%08x", iu_get_conn_id(conn->iu.ue_ctx)); + conn_id = iu_get_conn_id(conn->iu.ue_ctx); break; default: - LOGP(DMM, LOGL_ERROR, "RAN of conn %p unknown!\n", conn); - return NULL; + return "ran-unknown"; } + if (snprintf(id, sizeof(id), "%s-%u", ran_type_name(conn->via_ran), conn_id) >= sizeof(id)) { + /* Truncation should never happen: ran_type_name() plus a uint32_t in decimal is clearly bounded. */ + LOGP(DMM, LOGL_ERROR, "Conn id truncated: %s-%u -> %s\n", ran_type_name(conn->via_ran), conn_id, id); + } return id; } -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:17:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:17:15 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#3). Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... enrich context for vlr_subscr_name and ran_conn fi name Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(GERAN-A-3_IMSI-901700000014706_MSISDN-2023_TMSI-0x08BDE4EC_PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 16 files changed, 11,380 insertions(+), 11,140 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/3 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:17:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:17:22 +0000 Subject: Change in osmo-msc[master]: send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12455 Change subject: send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU ...................................................................... send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU Use new OSMO_GSUP_RAT_TYPES_IE to transmit the subscriber's RAT type to the HLR. Depends: I3e399ca8a85421f77a9a15e608413d1507722955 (osmo-hlr) Change-Id: I1b0c43c5ab03bc4dd146fdb3f5479b131d4f3b67 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 25 files changed, 177 insertions(+), 175 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/12455/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 7aad502..2f9139d 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -638,6 +638,8 @@ gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; + gsup_msg.rat_types[0] = vsub->cs.attached_via_ran; + gsup_msg.rat_types_len = 1; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg); return rc; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index bdbdae3..cee6046 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -85,7 +85,7 @@ if (via_ran == OSMO_RAT_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290101"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -98,7 +98,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index e721579..5da6426 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -73,8 +73,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -503,8 +503,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -941,8 +941,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1452,8 +1452,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1984,8 +1984,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -2319,8 +2319,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index b5f6b6c..e9140f8 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -122,7 +122,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 8f65c58..5a77f37 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -89,8 +89,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -472,8 +472,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -854,8 +854,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1202,8 +1202,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1547,8 +1547,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 46dd9a1..a2e22e6 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -75,7 +75,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -269,7 +269,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -446,7 +446,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05545afc8d72"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -551,7 +551,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -654,7 +654,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -785,7 +785,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290101"); ms_sends_msg("0554" "9b36efdf"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 920f717..6d6595b 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -91,8 +91,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -538,8 +538,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -954,8 +954,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1188,8 +1188,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1419,8 +1419,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1663,8 +1663,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index a641ec2..f362116 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -77,7 +77,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -292,7 +292,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -531,7 +531,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -641,7 +641,7 @@ vlr_subscr_put(vsub); btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("063217094b32244332244372f5"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -736,7 +736,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -915,7 +915,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1109,7 +1109,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1330,7 +1330,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index f0be4d7..9b9c303 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -98,8 +98,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -598,8 +598,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1133,8 +1133,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1375,8 +1375,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - Subscriber has the IMEISV @@ -1592,8 +1592,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1848,8 +1848,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2324,8 +2324,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2820,8 +2820,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 13bed42..6aae71c 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -114,7 +114,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -203,7 +203,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -326,7 +326,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -371,7 +371,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -424,7 +424,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 063928f..b331922 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -236,8 +236,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -385,8 +385,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -537,8 +537,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -769,8 +769,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1037,8 +1037,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1120,8 +1120,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index b23a7a7..3911ae3 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -73,7 +73,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index f7939f0..b70243a 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -119,8 +119,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index 3702a0c..d1d10c6 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -125,7 +125,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -198,7 +198,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 682f200..7ec719f 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -182,8 +182,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -380,8 +380,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 3162149..1095595 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -35,7 +35,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -177,7 +177,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -327,7 +327,7 @@ BTW("subscriber sends LU Request, this time with the TMSI"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130" "05f4" "03020100"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -471,7 +471,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -555,7 +555,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -618,7 +618,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -698,7 +698,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -754,7 +754,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559095332244332244372f6"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -840,7 +840,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -934,7 +934,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 11d6e8b..3235892 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -29,8 +29,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -348,8 +348,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -667,8 +667,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -853,8 +853,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1036,8 +1036,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1261,8 +1261,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1430,8 +1430,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1631,8 +1631,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1793,8 +1793,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1997,8 +1997,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -2211,8 +2211,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 66d2e39..8200bda 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -30,7 +30,7 @@ btw("Location Update Request on one connection"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ { btw("Location Update Request"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 3d428aa..3e2e478 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -29,8 +29,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -182,8 +182,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -306,8 +306,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -437,8 +437,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -563,8 +563,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -755,8 +755,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -950,8 +950,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1133,8 +1133,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1355,8 +1355,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -1597,8 +1597,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 4587383..3f2bb7a 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -85,7 +85,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -116,7 +116,7 @@ BTW("verify that the MS can send another LU request"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -168,7 +168,7 @@ thwart_rx_non_initial_requests(); btw("MS tells us the IMSI, causes a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("0559089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 7a1102f..8476309 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -121,8 +121,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -236,8 +236,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -414,8 +414,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_TMSI-0x23422342_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000004620_TMSI-0x23422342: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_TMSI-0x23422342_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 0390196..ab0386c 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -47,7 +47,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102"); + gsup_expect_tx("04010809710000004026f0280102290101"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 6e0684e..671eddc 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -29,8 +29,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH @@ -228,8 +228,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR GSUP tx: 04010809710000004026f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index beeea22..b5bedbc 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -124,7 +124,7 @@ if (via_ran == OSMO_RAT_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290101"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -137,7 +137,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -493,7 +493,7 @@ if (via_ran == OSMO_RAT_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290101"); ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -506,7 +506,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102"); + gsup_expect_tx("04010809710000000156f0280102290102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 6ec9525..bffb35a 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -73,8 +73,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -549,8 +549,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1064,8 +1064,8 @@ DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290101 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED @@ -1292,8 +1292,8 @@ DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU) DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0280102 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 +DVLR GSUP tx: 04010809710000000156f0280102290102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 -- To view, visit https://gerrit.osmocom.org/12455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1b0c43c5ab03bc4dd146fdb3f5479b131d4f3b67 Gerrit-Change-Number: 12455 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:18:05 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:18:05 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12388 ) Change subject: make sure early lchan act failure resets the lchan ...................................................................... make sure early lchan act failure resets the lchan Fix crash after AMR configuration fails. The crash is due to an assertion that finds a non-NULL conn in the lchan, when re-using an lchan that has failed in AMR configuration earlier on. That is because the AMR config still happens in state UNUSED. DCHAN ERROR lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) lchan allocation failed in state UNUSED: Can not generate multirate configuration IE ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) After failure handling, already in state UNUSED ... ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: Received Event LCHAN_EV_ACTIVATE (lchan_fsm.c:324) Assert failed !lchan->conn ../../../../src/osmo-bsc/src/osmo-bsc/lchan_fsm.c:491 The FSM design idea is that when returning to the UNUSED state, all lchan state is cleared. However, when calling lchan_activate(), a failure may happen still in state UNUSED, so that we don't transition *back* to UNUSED properly. So, first transition out of UNUSED before failures can happen. (Other ways to solve this would be to invoke lchan clearing even if already in UNUSED, but semantically, transitioning first makes more sense.) Upon LCHAN_EV_ACTIVATE, just remember the lchan_activate_info and transition to WAIT_TS_READY, so that on lchan_fail(), we can normally transition back to UNUSED and clear the lchan. Move the initial lchan activation code to lchan_fsm_wait_ts_ready_onenter(). Also, there is a bit of duplication of members of the lchan->activate (lchan state) and the lchan_activate_info (passed to lchan_activate()) structs. The fix for this also removes the dup: Add struct lchan_activate_info as child struct at lchan->activate.info, drop the other lchan->activate members that would dup .info.*. Move struct lchan_activate_info declaration to gsm_data.h. Apply the new '.info' member struct throughout the code. Related: OS#3737 Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 8 files changed, 105 insertions(+), 107 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index cf34c6f..2090142 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -503,6 +503,19 @@ static inline const char *lchan_activate_mode_name(enum lchan_activate_mode activ_for) { return get_value_string(lchan_activate_mode_names, activ_for); } +struct lchan_activate_info { + enum lchan_activate_mode activ_for; + struct gsm_subscriber_connection *for_conn; + /* This always is for a specific lchan, so its lchan->type indicates full or half rate. + * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ + enum gsm48_chan_mode chan_mode; + uint16_t s15_s0; + bool requires_voice_stream; + bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ + uint16_t msc_assigned_cic; + struct gsm_lchan *re_use_mgw_endpoint_from_lchan; +}; + struct gsm_lchan { /* The TS that we're part of */ struct gsm_bts_trx_ts *ts; @@ -517,18 +530,14 @@ struct mgwep_ci *mgw_endpoint_ci_bts; struct { - enum lchan_activate_mode activ_for; + struct lchan_activate_info info; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ bool immediate_assignment_sent; /*! This flag ensures that when an lchan activation has succeeded, and we have already * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors * occur later, e.g. during release, that we don't send a NACK out of context. */ bool concluded; - bool requires_voice_stream; - bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ - uint16_t msc_assigned_cic; enum gsm0808_cause gsm0808_error_cause; - struct gsm_lchan *re_use_mgw_endpoint_from_lchan; } activate; struct { diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 48cd383..55ab024 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -52,19 +52,6 @@ void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); -struct lchan_activate_info { - enum lchan_activate_mode activ_for; - struct gsm_subscriber_connection *for_conn; - /* This always is for a specific lchan, so its lchan->type indicates full or half rate. - * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ - enum gsm48_chan_mode chan_mode; - uint16_t s15_s0; - bool requires_voice_stream; - bool wait_before_switching_rtp; - uint16_t msc_assigned_cic; - struct gsm_lchan *old_lchan; -}; - void lchan_activate(struct gsm_lchan *lchan, struct lchan_activate_info *info); void lchan_ready_to_switch_rtp(struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 93362f8..a24f7f9 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -385,7 +385,7 @@ .s15_s0 = req->s15_s0, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, - .old_lchan = conn->lchan, + .re_use_mgw_endpoint_from_lchan = conn->lchan, }; lchan_activate(conn->assignment.new_lchan, &info); } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 85e754f..c1ac6eb 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -550,7 +550,7 @@ } else verb = MGCP_VERB_CRCX; - gscon_ensure_mgw_endpoint(conn, for_lchan->activate.msc_assigned_cic); + gscon_ensure_mgw_endpoint(conn, for_lchan->activate.info.msc_assigned_cic); if (!conn->user_plane.mgw_endpoint) { LOGPFSML(conn->fi, LOGL_ERROR, "Unable to allocate endpoint info\n"); diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index aae50b9..35f2e55 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -360,7 +360,7 @@ .chan_mode = conn->lchan->tch_mode, .requires_voice_stream = conn->lchan->mgw_endpoint_ci_bts ? true : false, .msc_assigned_cic = conn->ho.inter_bsc_in.msc_assigned_cic, - .old_lchan = conn->lchan, + .re_use_mgw_endpoint_from_lchan = conn->lchan, .wait_before_switching_rtp = true, }; @@ -706,7 +706,7 @@ ho_perf_params.chosen_encr_alg = lchan->encr.alg_id; ho_perf_params.chosen_encr_alg_present = true; - if (ho->new_lchan->activate.requires_voice_stream) { + if (ho->new_lchan->activate.info.requires_voice_stream) { /* Speech Version (chosen) 3.2.2.51 */ ho_perf_params.speech_version_chosen = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); ho_perf_params.speech_version_chosen_present = true; @@ -1010,7 +1010,7 @@ struct gsm_subscriber_connection *conn = ho_fi_conn(fi); struct handover *ho = &conn->ho; - if (ho->new_lchan->activate.requires_voice_stream + if (ho->new_lchan->activate.info.requires_voice_stream && (ho->scope & HO_INTER_BSC_IN)) ho_fsm_state_chg(HO_ST_WAIT_MGW_ENDPOINT_TO_MSC); else diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index c873025..fc1bcbf 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -151,7 +151,7 @@ return; lchan->activate.concluded = true; - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect * to the MSC and establish a subscriber connection. */ @@ -201,7 +201,7 @@ default: LOG_LCHAN(lchan, LOGL_NOTICE, "lchan %s fully established\n", - lchan_activate_mode_name(lchan->activate.activ_for)); + lchan_activate_mode_name(lchan->activate.info.activ_for)); break; } } @@ -238,7 +238,7 @@ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fsm, state_was), ## args); \ - lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ + lchan_on_activation_failure(_lchan, _lchan->activate.info.activ_for, _lchan->conn); \ if (fi->state != state_chg) \ lchan_fsm_state_chg(state_chg); \ else \ @@ -481,8 +481,6 @@ { struct lchan_activate_info *info = data; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - struct gsm_bts *bts = lchan->ts->trx->bts; - struct gsm48_multi_rate_conf mr_conf; switch (event) { @@ -493,63 +491,8 @@ lchan_set_last_error(lchan, NULL); lchan->release.requested = false; - lchan->conn = info->for_conn; - lchan->activate.activ_for = info->activ_for; - lchan->activate.requires_voice_stream = info->requires_voice_stream; - lchan->activate.wait_before_switching_rtp = info->wait_before_switching_rtp; - lchan->activate.msc_assigned_cic = info->msc_assigned_cic; + lchan->activate.info = *info; lchan->activate.concluded = false; - lchan->activate.re_use_mgw_endpoint_from_lchan = info->old_lchan; - - if (info->old_lchan) - lchan->encr = info->old_lchan->encr; - else { - lchan->encr = (struct gsm_encr){ - .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ - }; - } - - /* If there is a previous lchan, and the new lchan is on the same cell as previous one, - * take over power and TA values. Otherwise, use max power and zero TA. */ - if (info->old_lchan && info->old_lchan->ts->trx->bts == bts) { - lchan->ms_power = info->old_lchan->ms_power; - lchan->bs_power = info->old_lchan->bs_power; - lchan->rqd_ta = info->old_lchan->rqd_ta; - } else { - lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - /* From lchan_reset(): - * - bs_power is still zero, 0dB reduction, output power = Pn. - * - TA is still zero, to be determined by RACH. */ - } - - if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { - gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); - if (lchan_mr_config(lchan, &mr_conf) < 0) { - lchan_fail("Can not generate multirate configuration IE\n"); - return; - } - } - - switch (info->chan_mode) { - - case GSM48_CMODE_SIGN: - lchan->rsl_cmode = RSL_CMOD_SPD_SIGN; - lchan->tch_mode = GSM48_CMODE_SIGN; - break; - - case GSM48_CMODE_SPEECH_V1: - case GSM48_CMODE_SPEECH_EFR: - case GSM48_CMODE_SPEECH_AMR: - lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; - lchan->tch_mode = info->chan_mode; - break; - - default: - lchan_fail("Not implemented: cannot activate for chan mode %s", - gsm48_chan_mode_name(info->chan_mode)); - return; - } - lchan_fsm_state_chg(LCHAN_ST_WAIT_TS_READY); break; @@ -561,18 +504,75 @@ static void lchan_fsm_wait_ts_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); - struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); + struct gsm48_multi_rate_conf mr_conf; + struct gsm_bts *bts = lchan->ts->trx->bts; + struct mgwep_ci *use_mgwep_ci; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; + struct lchan_activate_info *info = &lchan->activate.info; if (lchan->release.requested) { lchan_fail("Release requested while activating"); return; } + lchan->conn = info->for_conn; + + if (old_lchan) + lchan->encr = old_lchan->encr; + else { + lchan->encr = (struct gsm_encr){ + .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ + }; + } + + /* If there is a previous lchan, and the new lchan is on the same cell as previous one, + * take over power and TA values. Otherwise, use max power and zero TA. */ + if (old_lchan && old_lchan->ts->trx->bts == bts) { + lchan->ms_power = old_lchan->ms_power; + lchan->bs_power = old_lchan->bs_power; + lchan->rqd_ta = old_lchan->rqd_ta; + } else { + lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); + /* From lchan_reset(): + * - bs_power is still zero, 0dB reduction, output power = Pn. + * - TA is still zero, to be determined by RACH. */ + } + + if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { + gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); + if (lchan_mr_config(lchan, &mr_conf) < 0) { + lchan_fail("Can not generate multirate configuration IE\n"); + return; + } + } + + switch (info->chan_mode) { + + case GSM48_CMODE_SIGN: + lchan->rsl_cmode = RSL_CMOD_SPD_SIGN; + lchan->tch_mode = GSM48_CMODE_SIGN; + break; + + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; + lchan->tch_mode = info->chan_mode; + break; + + default: + lchan_fail("Not implemented: cannot activate for chan mode %s", + gsm48_chan_mode_name(info->chan_mode)); + return; + } + + use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); + LOG_LCHAN(lchan, LOGL_INFO, "Activation requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s\n", - lchan_activate_mode_name(lchan->activate.activ_for), - lchan->activate.requires_voice_stream ? "yes" : "no", - lchan->activate.requires_voice_stream ? + lchan_activate_mode_name(lchan->activate.info.activ_for), + lchan->activate.info.requires_voice_stream ? "yes" : "no", + lchan->activate.info.requires_voice_stream ? (use_mgwep_ci ? mgwep_ci_name(use_mgwep_ci) : "new") : "none", gsm_lchant_name(lchan->type), @@ -583,7 +583,7 @@ osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_REQUESTED, lchan); /* Prepare an MGW endpoint CI if appropriate. */ - if (lchan->activate.requires_voice_stream) + if (lchan->activate.info.requires_voice_stream) lchan_rtp_fsm_start(lchan); } @@ -627,7 +627,7 @@ return; } - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: act_type = RSL_ACT_INTRA_IMM_ASS; break; @@ -709,7 +709,7 @@ return; } - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: rc = rsl_tx_imm_assignment(lchan); @@ -764,7 +764,7 @@ default: LOG_LCHAN(lchan, LOGL_NOTICE, "lchan %s is now active\n", - lchan_activate_mode_name(lchan->activate.activ_for)); + lchan_activate_mode_name(lchan->activate.info.activ_for)); break; } @@ -784,7 +784,7 @@ switch (event) { case LCHAN_EV_RLL_ESTABLISH_IND: - if (!lchan->activate.requires_voice_stream + if (!lchan->activate.info.requires_voice_stream || lchan_rtp_established(lchan)) lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); return; @@ -1381,6 +1381,8 @@ if (!lchan) return; + lchan->activate.info.for_conn = NULL; + conn = lchan->conn; if (conn) { /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 6ab3da4..84cc287 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -111,9 +111,9 @@ /* Use old lchan only if there is an MGW endpoint present. Otherwise, on ROLLBACK, we might put * an endpoint "back" to an lchan that never had one to begin with. */ - if (lchan->activate.re_use_mgw_endpoint_from_lchan - && !lchan->activate.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts) - lchan->activate.re_use_mgw_endpoint_from_lchan = NULL; + if (lchan->activate.info.re_use_mgw_endpoint_from_lchan + && !lchan->activate.info.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts) + lchan->activate.info.re_use_mgw_endpoint_from_lchan = NULL; lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE); } @@ -127,8 +127,8 @@ return lchan->mgw_endpoint_ci_bts; if (lchan_state_is(lchan, LCHAN_ST_ESTABLISHED)) return NULL; - if (lchan->activate.re_use_mgw_endpoint_from_lchan) - return lchan->activate.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts; + if (lchan->activate.info.re_use_mgw_endpoint_from_lchan) + return lchan->activate.info.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts; return NULL; } @@ -147,7 +147,7 @@ return; } - mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.msc_assigned_cic); + mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.info.msc_assigned_cic); if (!mgwep) { lchan_rtp_fail("Internal error: cannot obtain MGW endpoint handle for conn"); return; @@ -232,7 +232,7 @@ { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - if (lchan->activate.wait_before_switching_rtp) { + if (lchan->activate.info.wait_before_switching_rtp) { LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Waiting for an event by caller before switching RTP\n"); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP); @@ -305,7 +305,7 @@ return; case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.wait_before_switching_rtp = false; + lchan->activate.info.wait_before_switching_rtp = false; return; case LCHAN_RTP_EV_RELEASE: @@ -365,7 +365,7 @@ return; case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.wait_before_switching_rtp = false; + lchan->activate.info.wait_before_switching_rtp = false; return; case LCHAN_RTP_EV_RELEASE: @@ -437,7 +437,7 @@ uint32_t prev_state) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); @@ -514,7 +514,7 @@ static void lchan_rtp_fsm_rollback_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; if (!lchan->mgw_endpoint_ci_bts || !old_lchan) { osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0); @@ -526,7 +526,7 @@ static void lchan_rtp_fsm_rollback(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; switch (event) { @@ -560,7 +560,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); /* Make sure that we will not hand back the MGW endpoint to any old lchan from here on. */ - lchan->activate.re_use_mgw_endpoint_from_lchan = NULL; + lchan->activate.info.re_use_mgw_endpoint_from_lchan = NULL; } static void lchan_rtp_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 60ec5fb..f2ccf2c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1101,7 +1101,7 @@ }; /* speech_codec_chosen */ - if (ho->new_lchan->activate.requires_voice_stream && gscon_is_aoip(conn)) { + if (ho->new_lchan->activate.info.requires_voice_stream && gscon_is_aoip(conn)) { int perm_spch = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); params.speech_codec_chosen_present = true; rc = gsm0808_speech_codec_from_chan_type(¶ms.speech_codec_chosen, perm_spch); -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:18:06 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:18:06 +0000 Subject: Change in osmo-bsc[master]: comments: describe some lchan details In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12406 ) Change subject: comments: describe some lchan details ...................................................................... comments: describe some lchan details (requested by pespin) Change-Id: I04ec4ce1fd2b7b110bb496186aae39ecfbbc3628 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2090142..9f7ce8d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -509,10 +509,13 @@ /* This always is for a specific lchan, so its lchan->type indicates full or half rate. * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ enum gsm48_chan_mode chan_mode; + /* AMR config */ uint16_t s15_s0; bool requires_voice_stream; bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ uint16_t msc_assigned_cic; + /* During intra-BSC handover, we keep the MGW endpoint intact and just re-route to the new lchan. This + * activate_info is for the new lchan, the re_use_mgw_endpoint_from_lchan points at the old lchan. */ struct gsm_lchan *re_use_mgw_endpoint_from_lchan; }; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index fc1bcbf..f344cf9 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -533,7 +533,7 @@ lchan->rqd_ta = old_lchan->rqd_ta; } else { lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - /* From lchan_reset(): + /* Upon last entering the UNUSED state, from lchan_reset(): * - bs_power is still zero, 0dB reduction, output power = Pn. * - TA is still zero, to be determined by RACH. */ } -- To view, visit https://gerrit.osmocom.org/12406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I04ec4ce1fd2b7b110bb496186aae39ecfbbc3628 Gerrit-Change-Number: 12406 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:27:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:27:01 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12454 to look at the new patch set (#2). Change subject: use osmo_rat_type from libosmocore ...................................................................... use osmo_rat_type from libosmocore Replace locally defined enum ran_type with libosmocore's new enum osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names. The string representations change, which has cosmetic effects on the test suite expectations. Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore) Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 36 files changed, 835 insertions(+), 850 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/12454/2 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:50:26 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#4). Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... enrich context for vlr_subscr_name and ran_conn fi name Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(GERAN-A-3_IMSI-901700000014706_MSISDN-2023_TMSI-0x08BDE4EC_PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 16 files changed, 11,380 insertions(+), 11,140 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/4 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:50:26 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12403 to look at the new patch set (#4). Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... tweak fsm_msc_mgcp FSM and FI name Instead of MGW(MGW_99) use a name of msc-mgcp(MSISDN:2331_GERAN_A:00000017_trans99) 1. The FSM is communication towards an MGW, not the MGW itself. When reading combined logging (gsmtap_log), it is confusing to read 'MGW' in a log coming from the MSC. The API is also called msc_mgcp_*. 2. Calling the FSM instance 'MGW_' again doesn't make sense. 3. Indicate 'trans' before the trans_id (trans_id was already shown, but not indicated what it was). 4. Also indicate the actual subscriber's identification. 5. Also indicate the RAN connection and conn_id. This comes up while trying to understand a call coming in on an already established call: parsing the log with a human brain is near torture without this info, taking extremely long to get grips on. Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 --- M src/libmsc/msc_mgcp.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/03/12403/4 -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:50:26 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12404 to look at the new patch set (#4). Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... err log: fully log MS supported A5 algos on mismatch Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 --- M src/libmsc/gsm_04_08.c 1 file changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/04/12404/4 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:50:26 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12405 to look at the new patch set (#4). Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... msc_vlr_tests: tweak logging in verbose mode Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/05/12405/4 -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:50:29 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:50:29 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc.c: drop non-sensible error message Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12456 Change subject: gsm_04_08_cc.c: drop non-sensible error message ...................................................................... gsm_04_08_cc.c: drop non-sensible error message Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/12456/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index be9a451..7172184 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1659,8 +1659,6 @@ uint32_t addr = inet_addr(trans->conn->rtp.local_addr_cn); uint16_t port = trans->conn->rtp.local_port_cn; - LOGP(DMNCC, LOGL_ERROR, "RTP create for non-existing trans\n"); - if (addr == INADDR_NONE) { LOGP(DMNCC, LOGL_ERROR, "(subscriber:%s) external MNCC is signalling invalid IP-Address\n", -- To view, visit https://gerrit.osmocom.org/12456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe Gerrit-Change-Number: 12456 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:51:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:51:13 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12457 Change subject: mncc socket: add field ran ...................................................................... mncc socket: add field ran Send the currently used RAT type via MNCC socket. Patch-by: lynxis Tweaked-by: neels Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/12457/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index d2f0541..d01c180 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -155,6 +155,7 @@ int notify; /* 0..127 */ int emergency; char imsi[16]; + uint8_t ran; /*< enum osmo_rat_type */ unsigned char lchan_type; unsigned char lchan_mode; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index be9a451..6d41414 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -252,6 +252,8 @@ #endif mncc->msg_type = msg_type; + if (trans && trans->conn) + mncc->ran = (uint8_t)trans->conn->via_ran; msg = msgb_alloc(sizeof(struct gsm_mncc), "MNCC"); if (!msg) @@ -590,6 +592,8 @@ TLVP_VAL(&tp, GSM48_IE_CC_CAP)-1); } + setup.ran = (uint8_t)trans->conn->via_ran; + new_cc_state(trans, GSM_CSTATE_INITIATED); LOGP(DCC, setup.emergency ? LOGL_NOTICE : LOGL_INFO, "Subscriber %s (%s) sends %sSETUP to %s\n", -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:55:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:55:13 +0000 Subject: Change in osmo-sip-connector[master]: mncc socket: add RAT type, included from osmo-msc Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12458 Change subject: mncc socket: add RAT type, included from osmo-msc ...................................................................... mncc socket: add RAT type, included from osmo-msc Patch-by: lynxis Tweaked-by: neels Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore), I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc (osmo-msc) Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 --- M src/mncc_protocol.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/58/12458/1 diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 4950a77..d53a553 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -155,6 +155,7 @@ int notify; /* 0..127 */ int emergency; char imsi[16]; + uint8_t ran; unsigned char lchan_type; unsigned char lchan_mode; -- To view, visit https://gerrit.osmocom.org/12458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 Gerrit-Change-Number: 12458 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:55:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:55:13 +0000 Subject: Change in osmo-sip-connector[master]: add SIP P-Access-Network-Info in MO/invites: RAT types Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12459 Change subject: add SIP P-Access-Network-Info in MO/invites: RAT types ...................................................................... add SIP P-Access-Network-Info in MO/invites: RAT types Indicate GERAN or UTRAN in SIP headers. Patch-by: lynxis Tweaked-by: neels Change-Id: I186c315d22816b2552b16ec0788718e05de28c3d --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/59/12459/1 diff --git a/src/call.h b/src/call.h index 65d1111..8c7a92f 100644 --- a/src/call.h +++ b/src/call.h @@ -5,6 +5,7 @@ #include #include #include +#include #include @@ -30,6 +31,8 @@ const char *source; const char *dest; + + enum osmo_rat_type ran; }; enum { diff --git a/src/mncc.c b/src/mncc.c index ea6a9fc..f16bb5f 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -452,6 +452,7 @@ "MNCC leg(%u) failed to allocate call\n", data->callref); return mncc_send(conn, MNCC_REJ_REQ, data->callref); } + call->ran = data->ran; leg = (struct mncc_call_leg *) call->initial; leg->base.connect_call = mncc_call_leg_connect; diff --git a/src/sip.c b/src/sip.c index adf20d8..f33f90d 100644 --- a/src/sip.c +++ b/src/sip.c @@ -25,6 +25,7 @@ #include "sdp.h" #include +#include #include #include @@ -416,6 +417,7 @@ const char *calling_num, const char *called_num) { struct call_leg *other = leg->base.call->initial; + char *paccess_rat_hdr; char *from = talloc_asprintf(leg, "sip:%s@%s:%d", calling_num, @@ -427,11 +429,25 @@ agent->app->sip.remote_port); char *sdp = sdp_create_file(leg, other); + switch (leg->base.call->ran) { + case OSMO_RAT_GERAN_A: + paccess_rat_hdr = "P-Access-Network-Info: 3GPP-GERAN"; + break; + case OSMO_RAT_UTRAN_IU: + paccess_rat_hdr = "P-Access-Network-Info: 3GPP-UTRAN"; + break; + case OSMO_RAT_UNKNOWN: + default: + paccess_rat_hdr = "P-Access-Network-Info: 3GPP-UNKNOWN"; + break; + } + leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; nua_invite(leg->nua_handle, SIPTAG_FROM_STR(from), SIPTAG_TO_STR(to), + SIPTAG_HEADER_STR(paccess_rat_hdr), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_PAYLOAD_STR(sdp), -- To view, visit https://gerrit.osmocom.org/12459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I186c315d22816b2552b16ec0788718e05de28c3d Gerrit-Change-Number: 12459 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 02:57:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 02:57:01 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12457 ) Change subject: mncc socket: add field ran ...................................................................... Patch Set 1: I am quite unclear about versioning information on the MNCC socket and breaking other MNCC consumers. We have a matching patch for osmo-sip-connector, but it seems to me the MNCC socket could use fixing. On the other hand, we did talk to jolly at 35c3 about is 'osmo-cc' plans, which would ultimately replace this MNCC socket with a TCP based protocol. -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 03 Jan 2019 02:57:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 03:07:11 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 03:07:11 +0000 Subject: Change in osmo-sip-connector[master]: mncc socket: add RAT type, included from osmo-msc In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12458 to look at the new patch set (#2). Change subject: mncc socket: add RAT type, included from osmo-msc ...................................................................... mncc socket: add RAT type, included from osmo-msc Patch-by: lynxis Tweaked-by: neels Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore), I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc (osmo-msc) Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 --- M src/mncc_protocol.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/58/12458/2 -- To view, visit https://gerrit.osmocom.org/12458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 Gerrit-Change-Number: 12458 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 03:07:00 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 03:07:00 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran In-Reply-To: References: Message-ID: Hello lynxis lazus, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12457 to look at the new patch set (#2). Change subject: mncc socket: add field ran ...................................................................... mncc socket: add field ran Send the currently used RAT type via MNCC socket. Patch-by: lynxis Tweaked-by: neels Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/12457/2 -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 03:23:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 03:23:34 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: TODO: 29.002 specifies "RAT types" (plural), which is the only reason why this is a list. Let's clarify though whether that is really necessary / useful. For our purposes, we want to indicate the current actual RAT used for a LU, not a list of potential cells. I'm slightly confused / unclear about this. Any help/hints appreciated. -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 03:23:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 03:33:42 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 03:33:42 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: Code-Review-1 I finally found the ASN.1 definition of the RAT types indicator (search with a dash, doh), and this 'RAT Types indicator' is indeed intended as UpdateLocationArg, but for the VLR / SGSN capability sent towards the HLR, and not, it seems, about the current subscriber's connection? I can't find in 29.002 what the VLR/SGSN Capability bits are intended to be used for. It seems to me this patch's intention to use it to indicate the current conn's type is not accurate. Should we instead invent a custom separate IE (that transmits a single type instead of a list and makes things a lot simpler)? Is there another 29.002 IE that has slipped by my searching so far? -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 03:33:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 03:36:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 03:36:04 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: while at it, we might as well also add 3GPP 29.002 7.6.11.22 Cell Id Or SAI to indicate the current cell's CGI to the HLR -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 03:36:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 04:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 04:14:23 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: I notice now, in InsertSubscriberDataArg: AccessRestrictionData ::= BIT STRING { utranNotAllowed (0), geranNotAllowed (1), i.e. the HLR tells the VLR whether access is allowed or not, hence this should indeed be implemented differently than this patch suggests. This patch aimed at telling the HLR the RAT type during a LU; it worked well, but protocol wise I see it now as little more than a hack. It would be nice, though, to still notify the HLR of the RAT type, to indicate, next to the last_lu_seen date we already have, also the RAT type of the last LU. Before, I mentioned 'Cell Id or SAI', but relevant for the UpdateLocationArg is the PagingArea... PagingArea ::= SEQUENCE SIZE (1..5) OF LocationArea LocationArea ::= CHOICE { laiFixedLength (= PLMN + LAC) Unfortunately, it seems UpdateLocationArg does not include the ability to transfer a CI (full CGI would be PLMN + LAC + CI). We could decide to indicate these things in GSUP as an Osmocom-specific feature, and any MAP compatibility layer could just drop that extra information. -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 04:14:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 04:18:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 Jan 2019 04:18:58 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 04:18:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 09:25:54 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 3 Jan 2019 09:25:54 +0000 Subject: Change in pysim[master]: Add option to keep cards' ICCID when programming Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12460 Change subject: Add option to keep cards' ICCID when programming ...................................................................... Add option to keep cards' ICCID when programming This makes it easier to change only the network-related parameters while keeping SIM-specific data (used for inventory or DB for example) intact. Change-Id: I7a9c2fdd6af081fe478f1007bc322f3d7cb8d350 --- M pySim-prog.py 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/12460/1 diff --git a/pySim-prog.py b/pySim-prog.py index d6d7ad5..0c1e634 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -128,6 +128,9 @@ parser.add_option("--read-imsi", dest="read_imsi", action="store_true", help="Read the IMSI from the CARD", default=False ) + parser.add_option("--keep-iccid", dest="keep_iccid", action="store_true", + help="Use ICCID of the card as is", default=False + ) parser.add_option("-z", "--secret", dest="secret", metavar="STR", help="Secret used for ICCID/IMSI autogen", ) @@ -173,8 +176,8 @@ if options.read_csv is None: parser.error("CSV mode requires a CSV input file") elif options.source == 'cmdline': - if ((options.imsi is None) or (options.iccid is None)) and (options.num is None): - parser.error("If either IMSI or ICCID isn't specified, num is required") + if ((options.imsi is None) or (options.iccid is None)) and (options.num is None) and (options.keep_iccid is False): + parser.error("If either IMSI or ICCID isn't specified, num or keep-iccid is required") else: parser.error("Only `cmdline' and `csv' sources supported") @@ -267,7 +270,9 @@ iccid = opts.iccid if not _isnum(iccid, 19) and not _isnum(iccid, 20): raise ValueError('ICCID must be 19 or 20 digits !'); - + elif opts.keep_iccid is True: + # will be filled by the caller + iccid = 0 else: if opts.num is None: raise ValueError('Neither ICCID nor card number specified !') @@ -620,7 +625,10 @@ # Generate parameters if opts.source == 'cmdline': - cp = gen_parameters(opts) + cp = gen_parameters(opts) + if opts.keep_iccid is True: + (res, _) = scc.read_binary(EF['ICCID']) + cp['iccid'] = dec_iccid(res) elif opts.source == 'csv': if opts.read_imsi: if opts.dry_run: -- To view, visit https://gerrit.osmocom.org/12460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7a9c2fdd6af081fe478f1007bc322f3d7cb8d350 Gerrit-Change-Number: 12460 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:19:37 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 10:19:37 +0000 Subject: Change in libosmocore[master]: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12451 ) Change subject: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I659687aef7a4d67ca372a39fef31dee07aed7631 Gerrit-Change-Number: 12451 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 03 Jan 2019 10:19:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:24:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 10:24:14 +0000 Subject: Change in libosmocore[master]: gsup: add OSMO_GSUP_RAT_TYPES_IE In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12452 ) Change subject: gsup: add OSMO_GSUP_RAT_TYPES_IE ...................................................................... Patch Set 1: > i.e. the HLR tells the VLR whether access is allowed or not, hence this should indeed be implemented differently than this patch suggests. yes, and the HLR simply sends whatever is stored in the database to the VLR. > This patch aimed at telling the HLR the RAT type during a LU; it worked well, but protocol wise I see it now as little more than a hack. You can still add it as osmocom specific information. But the HLR shouldn't do anything with it other than logging or storing it for debugging purpose. -- To view, visit https://gerrit.osmocom.org/12452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93850710ab55a605bf61b95063a69682a2899bb1 Gerrit-Change-Number: 12452 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 03 Jan 2019 10:24:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:26:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 10:26:36 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12457 ) Change subject: mncc socket: add field ran ...................................................................... Patch Set 2: Code-Review-1 What I'm missing here is some kind of description on why it is added and for what it is intended to be used. Normally, a MNCC peer should not care about what kind of RAT is used. Also, the RAT can change at any time, even multiple times during a call. So in general, I would avoid falling into the same trap as we did when "lchan" information was added to MNCC. Call Control should not care about this and should live on a much higher layer. So please let's state explicitly why it is added and what it's used for before taking any decisions on merging this. Also, any change to the layout of MNCC should bump the related version, shouldn't it? -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 03 Jan 2019 10:26:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:27:48 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 10:27:48 +0000 Subject: Change in osmo-sip-connector[master]: add SIP P-Access-Network-Info in MO/invites: RAT types In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12459 ) Change subject: add SIP P-Access-Network-Info in MO/invites: RAT types ...................................................................... Patch Set 2: Code-Review-1 The commitlog should state *why* something is done, not just what it is done. That's the single most frequent problem I see in commit logs of any software project. So please explain why this information is added, what kind of specifications relate to it, how it is used, ... -- To view, visit https://gerrit.osmocom.org/12459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I186c315d22816b2552b16ec0788718e05de28c3d Gerrit-Change-Number: 12459 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 03 Jan 2019 10:27:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:36:14 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 3 Jan 2019 10:36:14 +0000 Subject: Change in pysim[master]: Use reference array for reading ICCID Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12461 Change subject: Use reference array for reading ICCID ...................................................................... Use reference array for reading ICCID Change-Id: Iad0a328c6f0c9a4ab678efe068801849be48d8fc --- M pySim-read.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/12461/1 diff --git a/pySim-read.py b/pySim-read.py index 4356453..7e23752 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -95,7 +95,7 @@ print("Reading ...") # EF.ICCID - (res, sw) = scc.read_binary(['3f00', '2fe2']) + (res, sw) = scc.read_binary(EF['ICCID']) if sw == '9000': print("ICCID: %s" % (dec_iccid(res),)) else: -- To view, visit https://gerrit.osmocom.org/12461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad0a328c6f0c9a4ab678efe068801849be48d8fc Gerrit-Change-Number: 12461 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 10:36:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 3 Jan 2019 10:36:15 +0000 Subject: Change in pysim[master]: Don't try to parse result if select_file() failed Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12462 Change subject: Don't try to parse result if select_file() failed ...................................................................... Don't try to parse result if select_file() failed Change-Id: I25b859374e33654e58d07061926bf8529eab87f3 --- M pySim/commands.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/12462/1 diff --git a/pySim/commands.py b/pySim/commands.py index 73c2247..faae61a 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -109,6 +109,8 @@ if not hasattr(type(ef), '__iter__'): ef = [ef] r = self.select_file(ef) + if len(r[-1]) == 0: + return (None, None) if length is None: length = self.__len(r) - offset pdu = self.cla_byte + 'b0%04x%02x' % (offset, (min(256, length) & 0xff)) -- To view, visit https://gerrit.osmocom.org/12462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I25b859374e33654e58d07061926bf8529eab87f3 Gerrit-Change-Number: 12462 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 11:58:36 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 11:58:36 +0000 Subject: Change in pysim[master]: Use reference array for reading ICCID In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12461 ) Change subject: Use reference array for reading ICCID ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12461/1/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/#/c/12461/1/pySim-read.py at 98 PS1, Line 98: You're replacing tabs with spaces. -- To view, visit https://gerrit.osmocom.org/12461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad0a328c6f0c9a4ab678efe068801849be48d8fc Gerrit-Change-Number: 12461 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 11:58:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:19:19 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:19:19 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c at 964 PS3, Line 964: return 0; Maybe it's a good idea to print some NOTICE here? https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c at 966 PS3, Line 966: trans->assignment_done = true; The log line says that call assignment is being started, but here you're setting 'assignment_done' to true. This looks a bit confusing to me. What if msc_mgcp_call_assignment() would fail? Shouldn't we check the rc before setting 'assignment_done'? -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 12:19:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:23:37 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:23:37 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c at 966 PS3, Line 966: trans->assignment_done = true; > The log line says that call assignment is being started, but [?] Ah, ok. The following commit renames this flag, so it's much cleaner. -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 12:23:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:30:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:30:45 +0000 Subject: Change in osmo-msc[master]: move trans->assignment_done to cc.assignment_started In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12399 ) Change subject: move trans->assignment_done to cc.assignment_started ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f Gerrit-Change-Number: 12399 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 12:30:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:49:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:49:55 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 03 Jan 2019 12:49:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:51:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:51:24 +0000 Subject: Change in osmo-msc[master]: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12450 ) Change subject: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd Gerrit-Change-Number: 12450 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 12:51:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 12:57:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 12:57:29 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c at 512 PS1, Line 512: Truncation should never happen Why should we care about it then? I would rather check if rc > 0, because: "If an output error is encountered, a negative value is returned." -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 12:57:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 13:00:04 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 13:00:04 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c at 508 PS1, Line 508: return "ran-unknown"; Just wondering: wouldn't this cause a compiler warning that we are missing 'const' qualifier here? AFAIR, the string literal are "const char *"... -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 13:00:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 13:11:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 13:11:35 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 13:11:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 13:13:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 13:13:53 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc.c: drop non-sensible error message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12456 ) Change subject: gsm_04_08_cc.c: drop non-sensible error message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe Gerrit-Change-Number: 12456 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 13:13:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:07:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:07:08 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 03 Jan 2019 16:07:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:08:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:08:20 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12404/4/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12404/4/src/libmsc/gsm_04_08.c at 121 PS4, Line 121: static const char *classmark_a5_name(const struct gsm_classmark *cm) could make sense to have this in libosmocore rather than here, but not a strict requirement. -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 16:08:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:09:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:09:14 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12454 ) Change subject: use osmo_rat_type from libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 03 Jan 2019 16:09:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:10:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:10:15 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c at 495 PS1, Line 495: char *ran_conn_get_conn_id(struct ran_conn *conn) I think we should/could return 'const char *' here, right? The caller is not supposed to modify the returned static buffer... -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 16:10:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:13:26 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:13:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 16:13:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:13:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:13:35 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 03 Jan 2019 16:13:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:13:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:13:59 +0000 Subject: Change in osmo-msc[master]: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12450 ) Change subject: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd Gerrit-Change-Number: 12450 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 16:13:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:14:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:14:34 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 03 Jan 2019 16:14:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:16:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:16:57 +0000 Subject: Change in osmo-msc[master]: fix vlr ops.subscr_assoc re-association In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12449 ) Change subject: fix vlr ops.subscr_assoc re-association ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f Gerrit-Change-Number: 12449 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 03 Jan 2019 16:16:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 16:17:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 Jan 2019 16:17:38 +0000 Subject: Change in osmo-bsc[master]: IPA: log OML/RSL link drop reason In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12448 ) Change subject: IPA: log OML/RSL link drop reason ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 Gerrit-Change-Number: 12448 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 03 Jan 2019 16:17:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 17:53:42 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 17:53:42 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop redundant length check In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/12436 ) Change subject: layer23/sap_interface.c: drop redundant length check ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I3be5f0ea742c1ecd3df8c60db0d4de5691b14cfc Gerrit-Change-Number: 12436 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 17:54:09 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 3 Jan 2019 17:54:09 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop optional SAP message handler In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/12440 ) Change subject: layer23/sap_interface.c: drop optional SAP message handler ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib5baa3785f478c762cbb0836d4f85b826b55c9ea Gerrit-Change-Number: 12440 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 19:10:58 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 3 Jan 2019 19:10:58 +0000 Subject: Change in osmo-bsc[master]: IPA: log OML/RSL link drop reason In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12448 ) Change subject: IPA: log OML/RSL link drop reason ...................................................................... IPA: log OML/RSL link drop reason There could multiple reason for OML or RSL link towards BTS to be dropped: ctrl command, vty, new link etc. Introduce "reason" parameter to corresponding functions and log it on link drop to simplify troubleshooting issues with more complex setups. Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 --- M include/osmocom/bsc/ipaccess.h M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 5 files changed, 17 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h index 692e795..3853270 100644 --- a/include/osmocom/bsc/ipaccess.h +++ b/include/osmocom/bsc/ipaccess.h @@ -30,9 +30,9 @@ uint8_t data[0]; } __attribute__((packed)); -void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason); void ipaccess_drop_oml_deferred(struct gsm_bts *bts); -void ipaccess_drop_rsl(struct gsm_bts_trx *trx); +void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason); struct sdp_header_item { struct sdp_header_entry header_entry; diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 171feaf..ca182d7 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -106,7 +106,7 @@ llist_for_each_entry_reverse(trx, &bts->trx_list, list) abis_nm_ipaccess_restart(trx); } else - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "ctrl net.apply-configuration"); } cmd->reply = "Tried to drop the BTS"; @@ -189,7 +189,7 @@ return CTRL_CMD_ERROR; } - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "ctrl bts.apply-configuration"); cmd->reply = "Tried to drop the BTS"; return CTRL_CMD_REPLY; } diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 791abf6..0aa8e49 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -227,7 +227,7 @@ trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n"); - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "rf check"); break; } } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 032305e..876273e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4433,11 +4433,11 @@ /* close all connections */ if (strcmp(argv[1], "oml") == 0) { - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "vty"); } else if (strcmp(argv[1], "rsl") == 0) { /* close all rsl connections */ llist_for_each_entry(trx, &bts->trx_list, list) { - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "vty"); } } else { vty_out(vty, "Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index cf81a22..56103b6 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -389,12 +389,12 @@ } /* These are exported because they are used by the VTY interface. */ -void ipaccess_drop_rsl(struct gsm_bts_trx *trx) +void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason) { if (!trx->rsl_link) return; - LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link.\n", trx->bts->nr, trx->nr); + LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link: %s\n", trx->bts->nr, trx->nr, reason); e1inp_sign_link_destroy(trx->rsl_link); trx->rsl_link = NULL; @@ -402,7 +402,7 @@ paging_flush_bts(trx->bts, NULL); } -void ipaccess_drop_oml(struct gsm_bts *bts) +void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason) { struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; @@ -413,14 +413,14 @@ if (!bts->oml_link) return; - LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link.\n", bts->nr); + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link: %s\n", bts->nr, reason); e1inp_sign_link_destroy(bts->oml_link); bts->oml_link = NULL; bts->uptime = 0; /* we have issues reconnecting RSL, drop everything. */ llist_for_each_entry(trx, &bts->trx_list, list) - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "OML link drop"); gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL); @@ -438,7 +438,7 @@ continue; LOGP(DLINP, LOGL_NOTICE, "Dropping BTS(%u) due BTS(%u).\n", rdep_bts->nr, bts->nr); - ipaccess_drop_oml(rdep_bts); + ipaccess_drop_oml(rdep_bts, "Dependency link drop"); } } @@ -447,7 +447,7 @@ static void ipaccess_drop_oml_deferred_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *) data; - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "Deferred link drop"); } /*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in * current code context. This may be needed if we want to destroy the OML link @@ -537,7 +537,7 @@ switch(type) { case E1INP_SIGN_OML: /* remove old OML signal link for this BTS. */ - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "new OML link"); if (!bts_depend_check(bts)) { LOGP(DLINP, LOGL_NOTICE, @@ -568,7 +568,7 @@ return NULL; /* remove old RSL link for this TRX. */ - ipaccess_drop_rsl(trx); + ipaccess_drop_rsl(trx, "new RSL link"); /* set new RSL link for this TRX. */ line = bts->oml_link->ts->line; @@ -609,7 +609,7 @@ osmo_timer_del(&link->trx->rsl_connect_timeout); } if (bts != NULL) - ipaccess_drop_oml(bts); + ipaccess_drop_oml(bts, "link down"); } /* This function is called if we receive one OML/RSL message. */ -- To view, visit https://gerrit.osmocom.org/12448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 Gerrit-Change-Number: 12448 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 3 22:43:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 3 Jan 2019 22:43:04 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/12457 ) Change subject: mncc socket: add field ran ...................................................................... Patch Set 2: > What I'm missing here is some kind of description on why it is > added and for what it is intended to be used. Normally, a MNCC > peer should not care about what kind of RAT is used. Also, the RAT > can change at any time, even multiple times during a call. So in > general, I would avoid falling into the same trap as we did when > "lchan" information was added to MNCC. Call Control should not > care about this and should live on a much higher layer. So please > let's state explicitly why it is added and what it's used for > before taking any decisions on merging this. Also, any change to > the layout of MNCC should bump the related version, shouldn't it? The idea is to push the information back via SIP to the PBX (there is already a Sipheader). We could do special extension e.g. read what RAT you're using. Thomas from the PoC @ 35c3 asked for this header. I don't know for what we would like to use it atm. -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 03 Jan 2019 22:43:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 01:42:00 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 01:42:00 +0000 Subject: Change in libosmocore[master]: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12451 ) Change subject: gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type ...................................................................... gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type In the MSC, we have RAN types GERAN_A and UTRAN_IU, now we need a similar enum in osmo-hlr's GSUP client. Naming: in the MAP specifications, the RAN type is mostly called RAT type, (Radio Access Network vs. Radio Access Technology?). Since GSUP is more about MAP messages, I'm calling the enum osmo_rat_type. Rationale: osmo-msc and osmo-sgsn want to tell the osmo-hlr which RAT a subscriber is calling on. A subsequent patch will extend the GSUP protocol and add a RAT types IE. Change-Id: I659687aef7a4d67ca372a39fef31dee07aed7631 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map 3 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index fe5903d..095ac41 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -241,3 +241,16 @@ int gsm_7bit_encode(uint8_t *result, const char *data) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead"); int gsm_7bit_encode_ussd(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n_ussd() instead"); int gsm_7bit_encode_oct(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead"); + +enum osmo_rat_type { + OSMO_RAT_UNKNOWN = 0, + OSMO_RAT_GERAN_A, + OSMO_RAT_UTRAN_IU, + + /* keep this last */ + OSMO_RAT_COUNT +}; + +extern const struct value_string osmo_rat_type_names[]; +inline static const char *osmo_rat_type_name(enum osmo_rat_type val) +{ return get_value_string(osmo_rat_type_names, val); } diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 8b4b558..3862047 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -997,3 +997,11 @@ return gsm_7bit_encode_n(result, GSM_7BIT_LEGACY_MAX_BUFFER_SIZE, data, octets); } + +/* This is also used by osmo-hlr's db schema */ +const struct value_string osmo_rat_type_names[] = { + { OSMO_RAT_UNKNOWN, "unknown" }, + { OSMO_RAT_GERAN_A, "GERAN-A" }, + { OSMO_RAT_UTRAN_IU, "UTRAN-Iu" }, + {} +}; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 76b3fd0..bb97878 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -553,5 +553,7 @@ sgsap_ue_emm_mode_names; sgsap_ie_tlvdef; +osmo_rat_type_names; + local: *; }; -- To view, visit https://gerrit.osmocom.org/12451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I659687aef7a4d67ca372a39fef31dee07aed7631 Gerrit-Change-Number: 12451 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 01:45:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 01:45:58 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c at 964 PS3, Line 964: return 0; > Maybe it's a good idea to print some NOTICE here? No: if we've already done the Assignment step before, subsequent attempts should just silently not do anything. No use to keep logging "Assignment happened some time ago" over and over. The msc_mgcp_try_call_assignment() is called three or four times during call establishing, only one will trigger an Assignment. https://gerrit.osmocom.org/#/c/12398/3/src/libmsc/msc_mgcp.c at 966 PS3, Line 966: trans->assignment_done = true; > Ah, ok. The following commit renames this flag, so it's much cleaner. exactly; 'assignment_done' also confused me, it will be renamed to 'assignment_started'. -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 01:45:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 01:46:47 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 01:46:47 +0000 Subject: Change in osmo-msc[master]: fix vlr ops.subscr_assoc re-association In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12449 ) Change subject: fix vlr ops.subscr_assoc re-association ...................................................................... fix vlr ops.subscr_assoc re-association In rare cases, a conn is already associated with a subscriber. So far, we abort()ed on that, bringing the entire osmo-msc down. Rather log an error and keep the service running. In vlr.ops.subscr_assoc, add success/failure return value, and abort the LU/PARQ on error. I haven't figured out in detail yet why/how a subscriber would re-launch a LU/PARQ on a conn that is already associated, so far it is merely clear that we do not want to crash the MSC if that happens. A log is in OS#3742. Related: OS#3742, OS#3743 Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c 4 files changed, 26 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 20a9c0f..3c778a9 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -235,7 +235,7 @@ void (*subscr_update)(struct vlr_subscr *vsub); /* notify MSC/SGSN that the given subscriber has been associated * with this msc_conn_ref */ - void (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); + int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); /* Forward a parsed GSUP message towards MSC message router */ int (*forward_gsup_msg)(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b042baf..81bda76 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1764,12 +1764,22 @@ } /* VLR informs us that the subscriber has been associated with a conn */ -static void msc_vlr_subscr_assoc(void *msc_conn_ref, +static int msc_vlr_subscr_assoc(void *msc_conn_ref, struct vlr_subscr *vsub) { struct ran_conn *conn = msc_conn_ref; OSMO_ASSERT(vsub); - OSMO_ASSERT(!conn->vsub); + if (conn->vsub) { + if (conn->vsub == vsub) + LOGPCONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", + vlr_subscr_name(vsub)); + else { + LOGPCONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," + " cannot associate with %s\n", vlr_subscr_name(vsub)); + return -EINVAL; + } + } + conn->vsub = vlr_subscr_get(vsub); OSMO_ASSERT(conn->vsub); conn->vsub->cs.attached_via_ran = conn->via_ran; @@ -1778,6 +1788,7 @@ * associated with the conn: merge the new Classmark into vsub->classmark. Don't overwrite valid * vsub->classmark with unset classmark, though. */ update_classmark(&conn->temporary_classmark, &conn->vsub->classmark); + return 0; } static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub, diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 3a0760d..3b40285 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -72,7 +72,7 @@ bool implicitly_accepted_parq_by_ciphering_cmd; }; -static void assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) +static int assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) { struct proc_arq_priv *par = fi->priv; struct vlr_instance *vlr = par->vlr; @@ -81,7 +81,7 @@ par->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); + return vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); } static const char *vlr_proc_arq_result_name(const struct osmo_fsm_inst *fi) @@ -371,8 +371,10 @@ GSM48_REJECT_NETWORK_FAILURE); } vsub->proc_arq_fsm = fi; - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub) != 0) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); return; } @@ -414,8 +416,10 @@ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub)) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index e635305..b00f8ce 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -954,7 +954,8 @@ lfp->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub); + if (vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub)) + lu_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE); return 0; } -- To view, visit https://gerrit.osmocom.org/12449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f Gerrit-Change-Number: 12449 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 01:53:39 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 01:53:39 +0000 Subject: Change in libosmocore[master]: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12463 Change subject: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* ...................................................................... fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* Keep #defines to still support previous wrong spelling. Change-Id: Id4cf812f0bc3cd40f6bfa05166f817a07a647f71 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/12463/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 676d1cf..5e93abe 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -50,9 +50,9 @@ BSS_MAP_MSG_RESERVED_0 = 0, /* ASSIGNMENT MESSAGES */ - BSS_MAP_MSG_ASSIGMENT_RQST = 1, - BSS_MAP_MSG_ASSIGMENT_COMPLETE = 2, - BSS_MAP_MSG_ASSIGMENT_FAILURE = 3, + BSS_MAP_MSG_ASSIGNMENT_RQST = 1, + BSS_MAP_MSG_ASSIGNMENT_COMPLETE = 2, + BSS_MAP_MSG_ASSIGNMENT_FAILURE = 3, BSS_MAP_MSG_CHAN_MOD_RQST = 8, /* HANDOVER MESSAGES */ @@ -158,6 +158,10 @@ BSS_MAP_MSG_LCLS_NOTIFICATION = 0x76, }; +#define BSS_MAP_MSG_ASSIGMENT_RQST BSS_MAP_MSG_ASSIGNMENT_RQST +#define BSS_MAP_MSG_ASSIGMENT_COMPLETE BSS_MAP_MSG_ASSIGNMENT_COMPLETE +#define BSS_MAP_MSG_ASSIGMENT_FAILURE BSS_MAP_MSG_ASSIGNMENT_FAILURE + enum GSM0808_IE_CODING { GSM0808_IE_CIRCUIT_IDENTITY_CODE = 1, GSM0808_IE_RESERVED_0 = 2, -- To view, visit https://gerrit.osmocom.org/12463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4cf812f0bc3cd40f6bfa05166f817a07a647f71 Gerrit-Change-Number: 12463 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 02:02:28 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 02:02:28 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12453/1/src/libmsc/ran_conn.c at 512 PS1, Line 512: Truncation should never happen > Why should we care about it then? [?] I took this from stsp's pattern if (strlcpy(...) >= sizeof(buf)) and you're right, snprintf() can return negative. Why care: if the future changes the string to become too long for some reason, be loud about that. -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 02:02:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 02:05:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 02:05:07 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12453 to look at the new patch set (#2). Change subject: refactor ran_conn_get_conn_id() ...................................................................... refactor ran_conn_get_conn_id() Instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function has no callers; these will be introduced by I66a68ce2eb8957a35855a3743d91a86299900834 Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f --- M include/osmocom/msc/ran_conn.h M src/libmsc/ran_conn.c 2 files changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/12453/2 -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 02:05:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 02:05:07 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12454 to look at the new patch set (#3). Change subject: use osmo_rat_type from libosmocore ...................................................................... use osmo_rat_type from libosmocore Replace locally defined enum ran_type with libosmocore's new enum osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names. The string representations change, which has cosmetic effects on the test suite expectations. Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore) Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 36 files changed, 832 insertions(+), 848 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/12454/3 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 02:05:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 02:05:07 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#5). Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... enrich context for vlr_subscr_name and ran_conn fi name Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(GERAN-A-3_IMSI-901700000014706_MSISDN-2023_TMSI-0x08BDE4EC_PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 16 files changed, 11,379 insertions(+), 11,140 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/5 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 02:55:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 02:55:34 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Patch Set 2: hold on, I want to squash some other stuff here first... -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 02:55:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 03:39:30 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 03:39:30 +0000 Subject: Change in libosmocore[master]: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12464 Change subject: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS ...................................................................... osmo_rat_type: add OSMO_RAT_EUTRAN_SGS osmo-msc is about to implement the SGs interface and requires a RAT indicator for that. Change-Id: I00588396bfe03feba38ecb0717d584594f0b2b46 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/12464/1 diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 095ac41..7d0beca 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -246,6 +246,7 @@ OSMO_RAT_UNKNOWN = 0, OSMO_RAT_GERAN_A, OSMO_RAT_UTRAN_IU, + OSMO_RAT_EUTRAN_SGS, /* keep this last */ OSMO_RAT_COUNT diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 3862047..9eb41fb 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -1003,5 +1003,6 @@ { OSMO_RAT_UNKNOWN, "unknown" }, { OSMO_RAT_GERAN_A, "GERAN-A" }, { OSMO_RAT_UTRAN_IU, "UTRAN-Iu" }, + { OSMO_RAT_EUTRAN_SGS, "EUTRAN-SGs" }, {} }; -- To view, visit https://gerrit.osmocom.org/12464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I00588396bfe03feba38ecb0717d584594f0b2b46 Gerrit-Change-Number: 12464 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:40:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:40:24 +0000 Subject: Change in libosmocore[master]: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12463 ) Change subject: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4cf812f0bc3cd40f6bfa05166f817a07a647f71 Gerrit-Change-Number: 12463 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 04 Jan 2019 07:40:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:40:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:40:47 +0000 Subject: Change in libosmocore[master]: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12464 ) Change subject: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I00588396bfe03feba38ecb0717d584594f0b2b46 Gerrit-Change-Number: 12464 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 04 Jan 2019 07:40:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:43:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:43:59 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12454 ) Change subject: use osmo_rat_type from libosmocore ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 04 Jan 2019 07:43:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:44:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:44:14 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 07:44:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:45:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:45:01 +0000 Subject: Change in osmo-gsm-tester[master]: mobile: Switch from removed cli option to vty port In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12445 ) Change subject: mobile: Switch from removed cli option to vty port ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 Gerrit-Change-Number: 12445 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 04 Jan 2019 07:45:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:45:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:45:40 +0000 Subject: Change in pysim[master]: Don't try to parse result if select_file() failed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12462 ) Change subject: Don't try to parse result if select_file() failed ...................................................................... Patch Set 1: Code-Review-1 existing code uses tabs. fine otherwise. -- To view, visit https://gerrit.osmocom.org/12462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I25b859374e33654e58d07061926bf8529eab87f3 Gerrit-Change-Number: 12462 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 04 Jan 2019 07:45:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:48:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:48:10 +0000 Subject: Change in osmo-sip-connector[master]: mncc socket: add RAT type, included from osmo-msc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12458 ) Change subject: mncc socket: add RAT type, included from osmo-msc ...................................................................... Patch Set 2: Code-Review-1 commit log is missing the rationale, see my comments regarding this change on the osmo-msc side. -- To view, visit https://gerrit.osmocom.org/12458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 Gerrit-Change-Number: 12458 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 04 Jan 2019 07:48:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:48:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:48:46 +0000 Subject: Change in osmo-sip-connector[master]: mncc socket: add RAT type, included from osmo-msc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12458 ) Change subject: mncc socket: add RAT type, included from osmo-msc ...................................................................... Patch Set 2: also, any changes to the MNCC binary structures require a MNCC version change across all MNCC-implementing programs. -- To view, visit https://gerrit.osmocom.org/12458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idde8b2cd62662468e1748ac43b6695c9aaaac520 Gerrit-Change-Number: 12458 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 04 Jan 2019 07:48:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:49:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:49:20 +0000 Subject: Change in osmo-bsc[master]: LCLS: use enum values instead of magic numbers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12378 ) Change subject: LCLS: use enum values instead of magic numbers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Gerrit-Change-Number: 12378 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 04 Jan 2019 07:49:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:49:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:49:46 +0000 Subject: Change in osmo-msc[master]: Constify transaction helpers parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12447 ) Change subject: Constify transaction helpers parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 07:49:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 07:52:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 Jan 2019 07:52:20 +0000 Subject: Change in pysim[master]: Checking in pySim-fairwaves-prog.py utility. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/5746 ) Change subject: Checking in pySim-fairwaves-prog.py utility. ...................................................................... Patch Set 1: Code-Review-1 I think the proper way to go about this is not to have a vendor-specific program in pySim-prog, but to implement this properly, i.e. have the same feature sset irrespective of the used card, and have parser/input plugins for different CSV formats used. It could very well be a different command/program/"main-file", than the existing somewhat unintuitive pySim-prog, but in general we should implement the same functionality / usage for all supported cards. -- To view, visit https://gerrit.osmocom.org/5746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f58e1b45d1785d59cef161eab1388332a97936b Gerrit-Change-Number: 5746 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-CC: Max Gerrit-Comment-Date: Fri, 04 Jan 2019 07:52:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 09:38:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 4 Jan 2019 09:38:08 +0000 Subject: Change in osmo-msc[master]: Constify transaction helpers parameters In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12447 ) Change subject: Constify transaction helpers parameters ...................................................................... Constify transaction helpers parameters Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae --- M include/osmocom/msc/transaction.h M src/libmsc/transaction.c 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 0760c07..e82f0a5 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -98,11 +98,11 @@ -struct gsm_trans *trans_find_by_id(struct ran_conn *conn, +struct gsm_trans *trans_find_by_id(const struct ran_conn *conn, uint8_t proto, uint8_t trans_id); -struct gsm_trans *trans_find_by_callref(struct gsm_network *net, +struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, uint32_t callref); -struct gsm_trans *trans_find_by_sm_rp_mr(struct ran_conn *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(const struct ran_conn *conn, uint8_t sm_rp_mr); struct gsm_trans *trans_alloc(struct gsm_network *net, @@ -111,9 +111,9 @@ uint32_t callref); void trans_free(struct gsm_trans *trans); -int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, +int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, uint8_t protocol, uint8_t ti_flag); struct gsm_trans *trans_has_conn(const struct ran_conn *conn); -void trans_conn_closed(struct ran_conn *conn); +void trans_conn_closed(const struct ran_conn *conn); #endif diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index a0f7b31..f62d6b4 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -38,7 +38,7 @@ * \param[in] trans_id Transaction ID of transaction * \returns Matching transaction, if any */ -struct gsm_trans *trans_find_by_id(struct ran_conn *conn, +struct gsm_trans *trans_find_by_id(const struct ran_conn *conn, uint8_t proto, uint8_t trans_id) { struct gsm_trans *trans; @@ -59,7 +59,7 @@ * \param[in] callref Call Reference of transaction * \returns Matching transaction, if any */ -struct gsm_trans *trans_find_by_callref(struct gsm_network *net, +struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, uint32_t callref) { struct gsm_trans *trans; @@ -76,7 +76,7 @@ * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) * \returns Matching transaction, NULL otherwise */ -struct gsm_trans *trans_find_by_sm_rp_mr(struct ran_conn *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(const struct ran_conn *conn, uint8_t sm_rp_mr) { struct gsm_network *net = conn->network; @@ -182,7 +182,7 @@ * \param[in] protocol Protocol for whihc to find ID * \param[in] ti_flag FIXME */ -int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, +int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, uint8_t protocol, uint8_t ti_flag) { struct gsm_trans *trans; @@ -234,7 +234,7 @@ * facilities, which will then send the necessary release indications. * \param[in] conn Connection that is going to be closed. */ -void trans_conn_closed(struct ran_conn *conn) +void trans_conn_closed(const struct ran_conn *conn) { struct gsm_trans *trans; -- To view, visit https://gerrit.osmocom.org/12447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If002a1ff6ba4218cc16592946798340fcb1852ae Gerrit-Change-Number: 12447 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 09:38:40 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 4 Jan 2019 09:38:40 +0000 Subject: Change in osmo-bsc[master]: LCLS: use enum values instead of magic numbers In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12378 ) Change subject: LCLS: use enum values instead of magic numbers ...................................................................... LCLS: use enum values instead of magic numbers Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 26b3244..2d5a077 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -50,11 +50,11 @@ enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn) { if (!conn->lcls.fi) - return 0xff; + return GSM0808_LCLS_STS_NA; switch (conn->lcls.fi->state) { case ST_NO_LCLS: - return 0xff; + return GSM0808_LCLS_STS_NA; case ST_NOT_YET_LS: return GSM0808_LCLS_STS_NOT_YET_LS; case ST_NOT_POSSIBLE_LS: @@ -76,7 +76,7 @@ enum gsm0808_lcls_status status = lcls_get_status(conn); struct msgb *msg; - if (status == 0xff) + if (status == GSM0808_LCLS_STS_NA) return; LOGPFSM(conn->lcls.fi, "Sending BSSMAP LCLS NOTIFICATION (%s)\n", @@ -384,7 +384,7 @@ return; return; case LCLS_EV_APPLY_CFG_CSC: - if (conn->lcls.config == 0xff) + if (conn->lcls.config == GSM0808_LCLS_CFG_NA) return; if (lcls_perform_correlation(conn) != 0) { /* Correlation leads to no result: Not Possible to LS */ @@ -887,7 +887,7 @@ void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg) { enum gsm0808_lcls_status status = lcls_get_status(conn); - if (status != 0xff) { + if (status != GSM0808_LCLS_STS_NA) { LOGPFSM(conn->fi, "Adding LCLS BSS-Status (%s) to %s\n", gsm0808_lcls_status_name(status), gsm0808_bssmap_name(msg->l3h[2])); -- To view, visit https://gerrit.osmocom.org/12378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Gerrit-Change-Number: 12378 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 15:15:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 15:15:29 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: fix: properly call sap_msg_free() In-Reply-To: References: Message-ID: Hello K?vin Redon, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12437 to look at the new patch set (#2). Change subject: layer23/sap_interface.c: fix: properly call sap_msg_free() ...................................................................... layer23/sap_interface.c: fix: properly call sap_msg_free() Passing NULL to sap_msg_free() is not only meaningless, but also would result in NULL pointer dereference. We should call it in successful case only, so let's fix this. Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/12437/2 -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:24:00 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:24:00 +0000 Subject: Change in libosmocore[master]: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12464 ) Change subject: osmo_rat_type: add OSMO_RAT_EUTRAN_SGS ...................................................................... osmo_rat_type: add OSMO_RAT_EUTRAN_SGS osmo-msc is about to implement the SGs interface and requires a RAT indicator for that. Change-Id: I00588396bfe03feba38ecb0717d584594f0b2b46 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 095ac41..7d0beca 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -246,6 +246,7 @@ OSMO_RAT_UNKNOWN = 0, OSMO_RAT_GERAN_A, OSMO_RAT_UTRAN_IU, + OSMO_RAT_EUTRAN_SGS, /* keep this last */ OSMO_RAT_COUNT diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 3862047..9eb41fb 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -1003,5 +1003,6 @@ { OSMO_RAT_UNKNOWN, "unknown" }, { OSMO_RAT_GERAN_A, "GERAN-A" }, { OSMO_RAT_UTRAN_IU, "UTRAN-Iu" }, + { OSMO_RAT_EUTRAN_SGS, "EUTRAN-SGs" }, {} }; -- To view, visit https://gerrit.osmocom.org/12464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I00588396bfe03feba38ecb0717d584594f0b2b46 Gerrit-Change-Number: 12464 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:24:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:24:01 +0000 Subject: Change in libosmocore[master]: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12463 ) Change subject: fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* ...................................................................... fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* Keep #defines to still support previous wrong spelling. Change-Id: Id4cf812f0bc3cd40f6bfa05166f817a07a647f71 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 676d1cf..5e93abe 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -50,9 +50,9 @@ BSS_MAP_MSG_RESERVED_0 = 0, /* ASSIGNMENT MESSAGES */ - BSS_MAP_MSG_ASSIGMENT_RQST = 1, - BSS_MAP_MSG_ASSIGMENT_COMPLETE = 2, - BSS_MAP_MSG_ASSIGMENT_FAILURE = 3, + BSS_MAP_MSG_ASSIGNMENT_RQST = 1, + BSS_MAP_MSG_ASSIGNMENT_COMPLETE = 2, + BSS_MAP_MSG_ASSIGNMENT_FAILURE = 3, BSS_MAP_MSG_CHAN_MOD_RQST = 8, /* HANDOVER MESSAGES */ @@ -158,6 +158,10 @@ BSS_MAP_MSG_LCLS_NOTIFICATION = 0x76, }; +#define BSS_MAP_MSG_ASSIGMENT_RQST BSS_MAP_MSG_ASSIGNMENT_RQST +#define BSS_MAP_MSG_ASSIGMENT_COMPLETE BSS_MAP_MSG_ASSIGNMENT_COMPLETE +#define BSS_MAP_MSG_ASSIGMENT_FAILURE BSS_MAP_MSG_ASSIGNMENT_FAILURE + enum GSM0808_IE_CODING { GSM0808_IE_CIRCUIT_IDENTITY_CODE = 1, GSM0808_IE_RESERVED_0 = 2, -- To view, visit https://gerrit.osmocom.org/12463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4cf812f0bc3cd40f6bfa05166f817a07a647f71 Gerrit-Change-Number: 12463 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:24:59 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:24:59 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... remove code dup: add msc_mgcp_try_call_assignment() Various places in the code check a flag whether assignment was started and launch it. To fix incoming-call-during-ongoing-call, I will tweak that logic. To be able to do that only in one place, remove code dup. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore: LOGPFSMSL) Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_mgcp.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c 5 files changed, 24 insertions(+), 27 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 9d8b01d..f7cc932 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -57,6 +57,7 @@ mgcp_trans_id_t mgw_pending_trans; }; +int msc_mgcp_try_call_assignment(struct gsm_trans *trans); int msc_mgcp_call_assignment(struct gsm_trans *trans); int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5567da9..be9a451 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -736,12 +736,7 @@ new_cc_state(trans, GSM_CSTATE_MO_TERM_CALL_CONF); /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; + rc = msc_mgcp_try_call_assignment(trans); /* don't continue, if there were problems with * the call assignment. */ @@ -780,14 +775,7 @@ return rc; /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; - - return rc; + return msc_mgcp_try_call_assignment(trans); } static int gsm48_cc_rx_alerting(struct gsm_trans *trans, struct msgb *msg) @@ -1706,7 +1694,6 @@ static int tch_rtp_create(struct gsm_network *net, uint32_t callref) { struct gsm_trans *trans; - int rc; /* Find callref */ trans = trans_find_by_callref(net, callref); @@ -1737,14 +1724,7 @@ trans->tch_rtp_create = true; /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; - - return rc; + return msc_mgcp_try_call_assignment(trans); } /* Trigger TCH_RTP_CREATE acknowledgement */ diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 23e68e7..5a8ee79 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -951,6 +951,22 @@ .event_names = msc_mgcp_fsm_evt_names, }; +/* Try to invoke call assignment and set trans->assignment_done flag if invoked. + * This is relevant for already ongoing calls -- scenario: + * - subscriber is in an active voice call, + * - another call is coming in. + * For the second call coming in, we must wait to establish RTP and assignment until the first call is CC-Disconnected. + */ +int msc_mgcp_try_call_assignment(struct gsm_trans *trans) +{ + struct ran_conn *conn = trans->conn; + if (trans->assignment_done) + return 0; + LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); + trans->assignment_done = true; + return msc_mgcp_call_assignment(trans); +} + /* Notify that a new call begins. This will create a connection for the * RAN and the CN on the MGW. * Parameter: diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index bdb8f44..8a5e719 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -32,7 +32,7 @@ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=osmo_get_rand_id \ -Wl,--wrap=msc_mgcp_call_release \ - -Wl,--wrap=msc_mgcp_call_assignment \ + -Wl,--wrap=msc_mgcp_try_call_assignment \ -Wl,--wrap=a_iface_tx_cipher_mode \ -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ -Wl,--wrap=osmo_sccp_tx_data_msg \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 8ae559e..de7600c 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -652,9 +652,9 @@ return 0; } -/* override, requires '-Wl,--wrap=msc_mgcp_call_assignment' */ -int __real_msc_mgcp_call_assignment(struct gsm_trans *trans); -int __wrap_msc_mgcp_call_assignment(struct gsm_trans *trans) +/* override, requires '-Wl,--wrap=msc_mgcp_try_call_assignment' */ +int __real_msc_mgcp_try_call_assignment(struct gsm_trans *trans); +int __wrap_msc_mgcp_try_call_assignment(struct gsm_trans *trans) { log("MS <--Call Assignment-- MSC: subscr=%s callref=0x%x", vlr_subscr_name(trans->vsub), trans->callref); -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:25:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:25:01 +0000 Subject: Change in osmo-msc[master]: move trans->assignment_done to cc.assignment_started In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12399 ) Change subject: move trans->assignment_done to cc.assignment_started ...................................................................... move trans->assignment_done to cc.assignment_started The flag is set to true when an assignment has been started, and it is only relevant for a CC transaction. So fix naming and place in cc struct. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f --- M include/osmocom/msc/transaction.h M src/libmsc/msc_mgcp.c 2 files changed, 4 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index e82f0a5..6e67f39 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -52,9 +52,6 @@ /* bearer capabilities (rate and codec) */ struct gsm_mncc_bearer_cap bearer_cap; - /* status of the assignment, true when done */ - bool assignment_done; - /* if true, TCH_RTP_CREATE is sent after the * assignment is done */ bool tch_rtp_create; @@ -71,6 +68,7 @@ struct osmo_timer_list timer; struct osmo_timer_list timer_guard; struct gsm_mncc msg; /* stores setup/disconnect/release message */ + bool assignment_started; } cc; struct { struct gsm411_smc_inst smc_inst; diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 5a8ee79..8e2e7a9 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -951,7 +951,7 @@ .event_names = msc_mgcp_fsm_evt_names, }; -/* Try to invoke call assignment and set trans->assignment_done flag if invoked. +/* Try to invoke call assignment and set trans->cc.assignment_started flag if invoked. * This is relevant for already ongoing calls -- scenario: * - subscriber is in an active voice call, * - another call is coming in. @@ -960,10 +960,10 @@ int msc_mgcp_try_call_assignment(struct gsm_trans *trans) { struct ran_conn *conn = trans->conn; - if (trans->assignment_done) + if (trans->cc.assignment_started) return 0; LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); - trans->assignment_done = true; + trans->cc.assignment_started = true; return msc_mgcp_call_assignment(trans); } -- To view, visit https://gerrit.osmocom.org/12399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f Gerrit-Change-Number: 12399 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:25:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:25:02 +0000 Subject: Change in osmo-msc[master]: fix: incoming call during ongoing call In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12400 ) Change subject: fix: incoming call during ongoing call ...................................................................... fix: incoming call during ongoing call If a call is already busy and another call is coming in, do not try to immediately assign an lchan (before this patch, it fails because there already is an mgcp_ctx for the conn). Leave the second CC transaction waiting. When a call is hung up, as soon as the old mgcp_ctx is discarded, look for other CC transactions that are waiting. If there is one, trigger assignment, so a new mgcp_ctx is set up for the new call. This fixes the following scenario: - from A, call B. - from C, call B; B rings during ongoing call. - in B, pick up the call, choose to drop the old call. After this patch, and with osmo-bsc patch with change-id I0c00ec2c120e5008281755adcd4944a3ce4d8355 we are now able to talk to the new caller. I currently haven't tested yet what happens if there is *three* peers trying to talk to the same number, running out of lab phones (not really, just not bothering now). Possibly we should be taking over the particular call indicated by the CC TI; instead, the current patch version takes on whichever waiting call it finds first. This is fine if *one* additional call comes in on an ongoing call, and this is already a huge improvement to what we had before. Related: OS#3735 Change-Id: I0ba216b737909e92080a722db26e3577726c63cb --- M src/libmsc/msc_mgcp.c 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 8e2e7a9..4c17768 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -962,6 +962,10 @@ struct ran_conn *conn = trans->conn; if (trans->cc.assignment_started) return 0; + if (conn->rtp.mgcp_ctx) { + LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Another call is already ongoing, not assigning yet\n"); + return 0; + } LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); trans->cc.assignment_started = true; return msc_mgcp_call_assignment(trans); @@ -1152,6 +1156,23 @@ return 0; } +static struct gsm_trans *find_waiting_call(struct ran_conn *conn) +{ + struct gsm_trans *trans; + struct gsm_network *net = conn->network; + + llist_for_each_entry(trans, &net->trans_list, entry) { + if (trans->conn != conn) + continue; + if (trans->protocol != GSM48_PDISC_CC) + continue; + if (trans->cc.assignment_started) + continue; + return trans; + } + return NULL; +} + /* Release ongoing call. * Parameter: * trans: connection context. @@ -1160,6 +1181,7 @@ { struct mgcp_ctx *mgcp_ctx; struct ran_conn *conn = trans->conn; + struct gsm_trans *waiting_trans; OSMO_ASSERT(trans); @@ -1203,5 +1225,14 @@ * all related context information */ conn->rtp.mgcp_ctx = NULL; + /* If there is another call still waiting to be activated, this is the time when the mgcp_ctx is available again + * and the other call can start assigning. */ + waiting_trans = find_waiting_call(conn); + if (waiting_trans) { + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call waiting: starting Assignment\n", + waiting_trans->transaction_id, vlr_subscr_name(trans->vsub)); + msc_mgcp_try_call_assignment(waiting_trans); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/12400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0ba216b737909e92080a722db26e3577726c63cb Gerrit-Change-Number: 12400 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:25:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:25:03 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 24 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index f7cc932..304e967 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -60,5 +60,6 @@ int msc_mgcp_try_call_assignment(struct gsm_trans *trans); int msc_mgcp_call_assignment(struct gsm_trans *trans); int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); +int msc_mgcp_ass_fail(struct ran_conn *conn); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 4c17768..5b4ee26 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1094,6 +1094,25 @@ return 0; } +/* Notify the MGCP context that Assignment failed. + * This will end the "ringing" on the other call leg, and will usually result in L3 and conn release (i.e. when no other + * transactions are still pending, which is usually the case). */ +int msc_mgcp_ass_fail(struct ran_conn *conn) +{ + struct mgcp_ctx *mgcp_ctx; + + OSMO_ASSERT(conn); + + mgcp_ctx = conn->rtp.mgcp_ctx; + if (!mgcp_ctx) + return -EINVAL; + + LOGPFSMSL(conn->fi, DMGCP, LOGL_ERROR, "Assignment failed\n"); + + osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_TEARDOWN_ERROR, mgcp_ctx); + return 0; +} + /* Make the connection of a previously assigned call complete * Parameter: * trans: transaction context. diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 37c1d15..1a1ba3c 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../../bscconfig.h" #ifdef BUILD_IU @@ -123,7 +124,9 @@ /* Receive an ASSIGNMENT FAILURE from BSC */ void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { - LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); + LOGPFSMSL(conn->fi, DRR, LOGL_ERROR, "Assignment Failure: cause=%u rr_cause=%u.\n", + cause, rr_cause ? *rr_cause : 0); + msc_mgcp_ass_fail(conn); } /* Receive a CLASSMARK CHANGE from BSC */ -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:25:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:25:04 +0000 Subject: Change in osmo-msc[master]: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12450 ) Change subject: vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates ...................................................................... vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates Probably fixes this segfault: at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:957 file=file at entry=0x5611d8f10c28 "../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c", line=line at entry=1467) at ../../../src/libosmocore/src/fsm.c:580 parent_event_failure=parent_event_failure at entry=6, parent_event_data=parent_event_data at entry=0x0, vlr=0x5611d98862b0, msc_conn_ref=msc_conn_ref at entry=0x5611d9aa8150, type=VLR_LU_TYPE_REGULAR, tmsi=4294967295, imsi=0x7ffd756c1cf0 "262423403004874", old_lai=0x7ffd756c1ce0, new_lai=0x7ffd756c1ce8, authentication_required=true, ciphering_required=true, is_r99=false, is_utran=false, assign_tmsi=true) at ../../../../src/osmo-msc/src/libvlr/vlr_lu_fsm.c:1467 at ../../../../src/osmo-msc/src/libmsc/gsm_04_08.c:443 The segfault is indirectly caused by 1fbf45c291f7e1f09ef2e862abfeca6a23efdc03, 'enrich context for vlr_subscr_name and ran_conn fi name', which sets auth_fsm context, on a non-NULL auth_fsm that has been deallocated. Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd --- M src/libvlr/vlr_auth_fsm.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 8419696..ccf3660 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -240,9 +240,6 @@ /* Terminate the Auth FSM Instance and notify parent */ static void auth_fsm_term(struct osmo_fsm_inst *fi, enum gsm48_reject_value result) { - struct auth_fsm_priv *afp = fi->priv; - struct vlr_subscr *vsub = afp->vsub; - LOGPFSM(fi, "Authentication terminating with result %s\n", vlr_auth_fsm_result_name(result)); @@ -254,6 +251,12 @@ /* return the result to the parent FSM */ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, &result); +} + +static void auth_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct auth_fsm_priv *afp = fi->priv; + struct vlr_subscr *vsub = afp->vsub; vsub->auth_fsm = NULL; } @@ -583,6 +586,7 @@ .allstate_action = NULL, .log_subsys = DVLR, .event_names = fsm_auth_event_names, + .cleanup = auth_fsm_cleanup, }; /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/12450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c528eed295be2ee673ea295804372f388a0dccd Gerrit-Change-Number: 12450 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 4 16:26:03 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 4 Jan 2019 16:26:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmocore_=C2=BB_a2=3Ddefault?= =?UTF-8?Q?,a3=3Ddefault,a4=3Ddefault,amd64,osmocom-master-debian9_#681?= Message-ID: <501555917.418.1546619163599.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Neels Hofmeyr] osmo_rat_type: add OSMO_RAT_EUTRAN_SGS [Neels Hofmeyr] fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* ------------------------------------------ [...truncated 826.16 KB...] :1084: warning: unable to resolve reference to `msg' for \ref command :1089: warning: unable to resolve reference to `msg' for \ref command :33: warning: unable to resolve reference to `abis_oml_mdisc' for \ref command :33: warning: unable to resolve reference to `abis_oml_mdisc' for \ref command fault/arch/amd64/label/osmocom-master-debian9/src/gsm/milenage/common.h... Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating docs for file Generating page documentation... Generating group documentation... Generating class documentation... Generating docs for compound abis_nm_channel... Generating docs for compound abis_nm_sw_desc... Generating docs for compound abis_om_fom_hdr... Generating docs for compound abis_om_hdr... Generating docs for compound abis_om_obj_inst... Generating docs for compound abis_rsl_cchan_hdr... Generating docs for compound abis_rsl_chan_nr... Generating docs for compound abis_rsl_common_hdr... Generating docs for compound abis_rsl_dchan_hdr... Generating docs for compound abis_rsl_link_id... Generating docs for compound abis_rsl_rll_hdr... Generating docs for compound bssmap_header... Generating docs for compound dl_rel_req_param... Generating docs for compound dtap_header... Generating docs for compound gan_cch_desc_ie... Generating docs for compound gan_rc_csr_hdr... Generating docs for compound gprs_cipher_impl... Generating docs for compound gprs_cs_desc... Generating docs for compound gprs_ra_id... Generating docs for compound gsm0808_cell_id... Generating docs for compound gsm0808_cell_id_list... Generating docs for compound gsm0808_cell_id_list2... Generating docs for compound gsm0808_cell_id_u... Generating docs for compound gsm0808_channel_type... Generating docs for compound gsm0808_encrypt_info... Generating docs for compound gsm0808_handover_complete... Generating docs for compound gsm0808_handover_failure... Generating docs for compound gsm0808_handover_performed... Generating docs for compound gsm0808_handover_required... Generating docs for compound gsm0808_old_bss_to_new_bss_info... Generating docs for compound gsm0808_speech_codec... Generating docs for compound gsm0808_speech_codec_list... Generating docs for compound gsm29118_paging_req... Generating docs for compound gsm29118_reset_msg... Generating docs for compound gsm341_etws_message... Generating docs for compound gsm341_ms_message... Generating docs for compound gsm411_rp_hdr... Generating docs for compound gsm411_smc_inst... Generating docs for compound gsm411_smr_inst... Generating docs for compound gsm412_block_type... Generating docs for compound gsm412_sched_msg... Generating docs for compound gsm414_close_mslot_loop_ack... Generating docs for compound gsm414_close_mslot_loop_cmd... Generating docs for compound gsm414_egprs_st_sb_loop_cmd... Generating docs for compound gsm414_gprs_test_mode_cmd... Generating docs for compound gsm48_act_pdp_ctx_req... Generating docs for compound gsm48_add_ass... Generating docs for compound gsm48_ass_cmd... Generating docs for compound gsm48_ass_cpl... Generating docs for compound gsm48_ass_fail... Generating docs for compound gsm48_attach_ack... Generating docs for compound gsm48_auth_ciph_req... Generating docs for compound gsm48_auth_ciph_resp... Generating docs for compound gsm48_auth_req... Generating docs for compound gsm48_auth_resp... Generating docs for compound gsm48_cell_desc... Generating docs for compound gsm48_cell_options... Generating docs for compound gsm48_cell_sel_par... Generating docs for compound gsm48_chan_desc... Generating docs for compound gsm48_chan_mode_modify... Generating docs for compound gsm48_chan_rel... Generating docs for compound gsm48_cip_mode_cmd... Generating docs for compound gsm48_classmark1... Generating docs for compound gsm48_classmark2... Generating docs for compound gsm48_cm_change... Generating docs for compound gsm48_control_channel_descr... Generating docs for compound gsm48_frq_redef... Generating docs for compound gsm48_gprs_susp_req... Generating docs for compound gsm48_hdr... Generating docs for compound gsm48_ho_cmd... Generating docs for compound gsm48_ho_cpl... Generating docs for compound gsm48_ho_fail... Generating docs for compound gsm48_imm_ass... Generating docs for compound gsm48_imm_ass_ext... Generating docs for compound gsm48_imm_ass_rej... Generating docs for compound gsm48_imsi_detach_ind... Generating docs for compound gsm48_loc_area_id... Generating docs for compound gsm48_loc_upd_req... Generating docs for compound gsm48_meas_res... Generating docs for compound gsm48_multi_rate_conf... Generating docs for compound gsm48_pag_resp... Generating docs for compound gsm48_pag_rsp... Generating docs for compound gsm48_paging1... Generating docs for compound gsm48_paging2... Generating docs for compound gsm48_paging3... Generating docs for compound gsm48_power_cmd... Generating docs for compound gsm48_qos... Generating docs for compound gsm48_ra_id... Generating docs for compound gsm48_ra_upd_ack... Generating docs for compound gsm48_rach_control... Generating docs for compound gsm48_range_1024... Generating docs for compound gsm48_range_128... Generating docs for compound gsm48_range_256... Generating docs for compound gsm48_range_512... Generating docs for compound gsm48_req_ref... Generating docs for compound gsm48_rr_status... Generating docs for compound gsm48_service_request... Generating docs for compound gsm48_start_time... Generating docs for compound gsm48_sync_ind... Generating docs for compound gsm48_system_information_type_1... Generating docs for compound gsm48_system_information_type_13... Generating docs for compound gsm48_system_information_type_2... Generating docs for compound gsm48_system_information_type_2bis... Generating docs for compound gsm48_system_information_type_2quater... Generating docs for compound gsm48_system_information_type_2ter... Generating docs for compound gsm48_system_information_type_3... Generating docs for compound gsm48_system_information_type_4... Generating docs for compound gsm48_system_information_type_5... Generating docs for compound gsm48_system_information_type_5bis... Generating docs for compound gsm48_system_information_type_5ter... Generating docs for compound gsm48_system_information_type_6... Generating docs for compound gsm48_system_information_type_header... Generating docs for compound gsm48_var_bit... Generating docs for compound gsm_freq_range... Generating docs for compound gsm_meas_rep_unidir... Generating docs for compound gsm_mncc_bearer_cap... Generating docs for compound gsm_mncc_cause... Generat:125: warning: Found unknown command `\breif' :125: warning: Found unknown command `\breif' ing docs for compound gsm_mncc_cccap... Generating docs for compound gsm_mncc_facility... Generating docs for compound gsm_mncc_number... Generating docs for compound gsm_mncc_progress... Generating docs for compound gsm_mncc_ssversion... Generating docs for compound gsm_mncc_useruser... Generating docs for compound gsm_rx_lev_qual... Generating docs for compound gsm_sysinfo_freq... Generating docs for compound gsm_time... Generating docs for compound info_act_cnf_param... Generating docs for compound info_act_req_param... Generating docs for compound info_ciph_req_param... Generating docs for compound info_meas_ind_param... Generating docs for compound info_time_ind_param... Generating docs for compound ipac_preproc_ave_cfg... Generating docs for compound ipac_preproc_cfg... Generating docs for compound ipac_preproc_ho_candidates... Generating docs for compound ipac_preproc_ho_comp... Generating docs for compound ipac_preproc_ho_ctl_param... Generating docs for compound ipac_preproc_ho_thresh... Generating docs for compound ipac_preproc_ncell_dflts... Generating docs for compound ipaccess_head... Generating docs for compound ipaccess_head_ext... Generating docs for compound ipaccess_unit... Generating docs for compound l2downstate... Generating docs for compound lapd_cr_ent... Generating docs for compound lapd_datalink... Generating docs for compound lapd_history... Generating docs for compound lapd_msg_ctx... Generating docs for compound lapdm_channel... Generating docs for compound lapdm_datalink... Generating docs for compound lapdm_entity... Generating docs for compound lapdm_msg_ctx... Generating docs for compound mdl_error_ind_param... Generating docs for compound mph_info_param... Generating docs for compound osmo_auth_impl... Generating docs for compound osmo_auth_vector... Generating docs for compound osmo_cell_global_id... Generating docs for compound osmo_dlsap_prim... Generating docs for compound osmo_earfcn_si2q... Generating docs for compound osmo_eutran_cell_global_id... Generating docs for compound osmo_gcr_parsed... Generating docs for compound osmo_gsn_address... Generating docs for compound osmo_gsup_message... Generating docs for compound osmo_gsup_pdp_info... Generating docs for compound osmo_gummei... Generating docs for compound osmo_guti... Generating docs for compound osmo_lac_and_ci_id... Generating docs for compound osmo_lcls... Generating docs for compound osmo_location_area_id... Generating docs for compound osmo_mme_id... Generating docs for compound osmo_oap_client_config... Generating docs for compound osmo_oap_client_state... Generating docs for compound osmo_oap_message... Generating docs for compound osmo_phsap_prim... Generating docs for compound osmo_plmn_id... Generating docs for compound osmo_routing_area_id... Generating docs for compound osmo_service_area_id... Generating docs for compound osmo_shared_network_area_id... Generating docs for compound osmo_sub_auth_data... Generating docs for compound osmo_tracking_area_id... Generating docs for compound ph_conn_ind_param... Generating docs for compound ph_data_param... Generating docs for compound ph_rach_ind_param... Generating docs for compound ph_rach_req_param... Generating docs for compound ph_tch_param... Generating docs for compound rsl_ie_cb_cmd_type... Generating docs for compound rsl_ie_chan_ident... Generating docs for compound rsl_ie_chan_mode... Generating docs for compound rsl_mrpci... Generating docs for compound rxlev_stats... Generating docs for compound sdp_firmware... Generating docs for compound sdp_header_entry... Generating docs for compound smcdatastate... Generating docs for compound smcdownstate... Generating docs for compound smrdatastate... Generating docs for compound smrdownstate... Generating docs for compound ss_request... Generating docs for compound tlv_def... Generating docs for compound tlv_definition... Generating docs for compound tlv_p_entry... Generating docs for compound tlv_parsed... Generating docs for compound ussd_request... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... lookup cache used 6955/65536 hits=36555 misses=7094 finished... make[2]: Leaving directory ' Makefile:615: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:906: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:28:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:28:04 +0000 Subject: Change in osmo-msc[master]: mncc socket: add field ran In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12457 ) Change subject: mncc socket: add field ran ...................................................................... Patch Set 2: now I found the MNCC_SOCK_VERSION! Somehow thought there wasn't one. -- To view, visit https://gerrit.osmocom.org/12457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f28dbca1b515f9eaa6a8708a7ccfa1eb6f6b6cc Gerrit-Change-Number: 12457 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 04 Jan 2019 16:28:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:32:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:32:22 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Related: OS#3355 Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 201d2aa..8c11900 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -458,24 +458,6 @@ return CMD_SUCCESS; } -DEFUN(cfg_msc_ipa_name, - cfg_msc_ipa_name_cmd, - "ipa-name NAME", - "Set the IPA name of this MSC\n" - "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. " - "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " - "The default is 'MSC-00-00-00-00-00-00'.\n") -{ - if (vty->type != VTY_FILE) { - vty_out(vty, "The IPA name cannot be changed at run-time; " - "It can only be set in the configuraton file.%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); - return CMD_SUCCESS; -} - /* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */ DEFUN(cfg_msc_sms_over_gsup, cfg_msc_sms_over_gsup_cmd, "sms-over-gsup", @@ -527,9 +509,6 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } - if (gsmnet->msc_ipa_name) - vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); - if (gsmnet->sms_over_gsup) vty_out(vty, " sms-over-gsup%s", VTY_NEWLINE); @@ -1506,6 +1485,24 @@ return CMD_SUCCESS; } +DEFUN(cfg_hlr_ipa_name, + cfg_hlr_ipa_name_cmd, + "ipa-name NAME", + "Set the IPA name of this MSC\n" + "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. " + "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " + "The default is 'MSC-00-00-00-00-00-00'.\n") +{ + if (vty->type != VTY_FILE) { + vty_out(vty, "The IPA name cannot be changed at run-time; " + "It can only be set in the configuraton file.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); + return CMD_SUCCESS; +} + static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); @@ -1513,6 +1510,8 @@ gsmnet->gsup_server_addr_str, VTY_NEWLINE); vty_out(vty, " remote-port %u%s", gsmnet->gsup_server_port, VTY_NEWLINE); + if (gsmnet->msc_ipa_name) + vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); return CMD_SUCCESS; } @@ -1553,7 +1552,6 @@ install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); - install_element(MSC_NODE, &cfg_msc_ipa_name_cmd); install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd); install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd); @@ -1605,4 +1603,5 @@ install_node(&hlr_node, config_write_hlr); install_element(HLR_NODE, &cfg_hlr_remote_ip_cmd); install_element(HLR_NODE, &cfg_hlr_remote_port_cmd); + install_element(HLR_NODE, &cfg_hlr_ipa_name_cmd); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 18467d9..3fd37b0 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -40,7 +40,6 @@ cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN - ipa-name NAME sms-over-gsup no sms-over-gsup mgw local-ip A.B.C.D @@ -85,6 +84,7 @@ ... remote-ip A.B.C.D remote-port <1-65535> + ipa-name NAME OsmoMSC(config-hlr)# exit OsmoMSC(config)# exit -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:33:06 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:33:06 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 04 Jan 2019 16:33:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:33:12 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:33:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... trxcon/scheduler: fix RSSI -> RX level conversion Due to a mistake, average RSSI value of received bursts was not converted to GSM RX level (range 0..63), so trxcon has been sending incorrect values to the higher layers. Let's fix this, and also prevent possible division by zero. Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 --- M src/host/trxcon/sched_lchan_common.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 95e496b..540a57f 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -87,6 +87,7 @@ { const struct trx_lchan_desc *lchan_desc; struct l1ctl_info_dl dl_hdr; + int dbm_avg; /* Set up pointers */ lchan_desc = &trx_lchan_desc[lchan->type]; @@ -96,9 +97,18 @@ dl_hdr.link_id = lchan_desc->link_id; dl_hdr.band_arfcn = htons(trx->band_arfcn); dl_hdr.frame_nr = htonl(lchan->rx_first_fn); - dl_hdr.rx_level = -(lchan->meas.rssi_sum / lchan->meas.rssi_num); dl_hdr.num_biterr = bit_error_count; + /* Convert average RSSI to RX level */ + if (lchan->meas.rssi_num) { + /* RX level: 0 .. 63 in typical GSM notation (dBm + 110) */ + dbm_avg = lchan->meas.rssi_sum / lchan->meas.rssi_num; + dl_hdr.rx_level = dbm2rxlev(dbm_avg); + } else { + /* No measurements, assuming the worst */ + dl_hdr.rx_level = 0; + } + /* FIXME: set proper values */ dl_hdr.snr = 0; -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:33:40 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:33:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... mgcp_client: make domain part of endpoint configurable So far, both osmo-msc and osmo-bsc always pass endpoint names of the form '... at mgw' to osmo-mgw. Allow configuring the 'mgw' part. Note that the actual way to pass a differing name is to pass a composed 'rtpbridge/*@foo' to mgcp_msg_gen() in the struct mgcp_msg. So this merely adds a common VTY config for the domain name part, changes to clients are necessary. - add mgcp_client_rtpbridge_wildcard() (useful for AoIP endpoints) - add mgcp_client_endpoint_domain() (useful for SCCPlite endpoints) - add mgcp client vty cfg 'mgw endpoint-domain NAME' Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. Also: our MGCP clients osmo-bsc and osmo-msc use code dup to compose the initial 'rtpbridge/*@mgw' rtpbridge wildcard. It should be defined by this API instead. This will be used by: * osmo-msc I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 * osmo-bsc I492023e9dca0233ec0a077032455d9f2e3880f78 After these, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint on two separate osmo-mgw instances: osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc There can also be '0 at bsc' and '1 at msc' endpoints on one single osmo-mgw instance with: osmo-mgw.cfg: mgcp domain * and same osmo-{bsc,msc}.cfg as above. (By default, everything will still use '@mgw') Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c M tests/mgcp_client/mgcp_client_test.err 4 files changed, 66 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index c1fd1b0..98e58d7 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -22,6 +22,10 @@ int local_port; const char *remote_addr; int remote_port; + + /* By default, we are always addressing the MGW with e.g. 'rtpbridge/123 at mgw'. + * If this is nonempty, the contained name will be used instead of 'mgw'. */ + char endpoint_domain_name[MGCP_ENDPOINT_MAXLEN]; }; typedef unsigned int mgcp_trans_id_t; @@ -120,6 +124,9 @@ uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); +const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp); +const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp); + /* Invoked when an MGCP response is received or sending failed. When the * response is passed as NULL, this indicates failure during transmission. */ typedef void (* mgcp_response_cb_t )(struct mgcp_response *response, void *priv); diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 8fa82cd..03e1da7 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -705,6 +705,16 @@ mgcp->actual.remote_port = conf->remote_port >= 0 ? (uint16_t)conf->remote_port : MGCP_CLIENT_REMOTE_PORT_DEFAULT; + if (osmo_strlcpy(mgcp->actual.endpoint_domain_name, conf->endpoint_domain_name, + sizeof(mgcp->actual.endpoint_domain_name)) + >= sizeof(mgcp->actual.endpoint_domain_name)) { + LOGP(DLMGCP, LOGL_ERROR, "MGCP client: endpoint domain name is too long, max length is %zu: '%s'\n", + sizeof(mgcp->actual.endpoint_domain_name) - 1, conf->endpoint_domain_name); + talloc_free(mgcp); + return NULL; + } + LOGP(DLMGCP, LOGL_NOTICE, "MGCP client: using endpoint domain '@%s'\n", mgcp_client_endpoint_domain(mgcp)); + return mgcp; } @@ -811,6 +821,32 @@ return mgcp->remote_addr; } +/* To compose endpoint names, usually for CRCX, use this as domain name. + * For example, snprintf("rtpbridge\*@%s", mgcp_client_endpoint_domain(mgcp)). */ +const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp) +{ + return mgcp->actual.endpoint_domain_name[0] ? mgcp->actual.endpoint_domain_name : "mgw"; +} + +const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp) +{ + static char endpoint[MGCP_ENDPOINT_MAXLEN]; + int rc; + +#define RTPBRIDGE_WILDCARD_FMT "rtpbridge/*@%s" + rc = snprintf(endpoint, sizeof(endpoint), RTPBRIDGE_WILDCARD_FMT, mgcp_client_endpoint_domain(mgcp)); + if (rc > sizeof(endpoint) - 1) { + LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length of %zu: '" RTPBRIDGE_WILDCARD_FMT "'\n", + sizeof(endpoint) - 1, mgcp_client_endpoint_domain(mgcp)); + return NULL; + } + if (rc < 1) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot compose MGCP endpoint name\n"); + return NULL; + } + return endpoint; +} + struct mgcp_response_pending * mgcp_client_pending_add( struct mgcp_client *mgcp, mgcp_trans_id_t trans_id, diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 8fa0272..d4e78f1 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -137,6 +137,22 @@ BTS_START_STR UDP_PORT_STR) +DEFUN(cfg_mgw_endpoint_domain_name, + cfg_mgw_endpoint_domain_name_cmd, + "mgw endpoint-domain NAME", + MGW_STR "Set the domain name to send in MGCP messages, e.g. the part 'foo' in 'rtpbridge/*@foo'.\n" + "Domain name, should be alphanumeric.\n") +{ + if (osmo_strlcpy(global_mgcp_client_conf->endpoint_domain_name, argv[0], + sizeof(global_mgcp_client_conf->endpoint_domain_name)) + >= sizeof(global_mgcp_client_conf->endpoint_domain_name)) { + vty_out(vty, "%% Error: 'mgw endpoint-domain' name too long, max length is %zu: '%s'%s", + sizeof(global_mgcp_client_conf->endpoint_domain_name) - 1, argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + int mgcp_client_config_write(struct vty *vty, const char *indent) { const char *addr; @@ -160,6 +176,10 @@ vty_out(vty, "%smgw remote-port %u%s", indent, (uint16_t)port, VTY_NEWLINE); + if (global_mgcp_client_conf->endpoint_domain_name[0]) + vty_out(vty, "%smgw endpoint-domain %s%s", indent, + global_mgcp_client_conf->endpoint_domain_name, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -174,6 +194,7 @@ install_element(node, &cfg_mgw_remote_port_cmd); install_element(node, &cfg_mgw_endpoint_range_cmd); install_element(node, &cfg_mgw_rtp_bts_base_port_cmd); + install_element(node, &cfg_mgw_endpoint_domain_name_cmd); /* deprecated 'mgcpgw' commands */ install_element(node, &cfg_mgcpgw_local_ip_cmd); diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 1d5a1a0..627b2d9 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -1,6 +1,8 @@ +DLMGCP MGCP client: using endpoint domain '@mgw' DLMGCP message buffer to small, can not generate MGCP message test_mgcp_client_cancel(): +DLMGCP MGCP client: using endpoint domain '@mgw' - composed msg with trans_id=1 - not in queue yet, cannot cancel yet DLMGCP Cannot cancel, no such transaction: 1 -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:33:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:33:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: tweak some log levels INFO -> {DEBUG, ERROR} In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12407 ) Change subject: mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} ...................................................................... mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 03e1da7..29acd0a 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -205,7 +205,7 @@ if (pending->response_cb) pending->response_cb(response, pending->priv); else - LOGP(DLMGCP, LOGL_INFO, "MGCP response ignored (NULL cb)\n"); + LOGP(DLMGCP, LOGL_DEBUG, "MGCP response ignored (NULL cb)\n"); talloc_free(pending); } @@ -904,7 +904,7 @@ msgb_free(msg); goto mgcp_tx_error; } else - LOGP(DLMGCP, LOGL_INFO, "Queued %u bytes for MGCP GW\n", + LOGP(DLMGCP, LOGL_DEBUG, "Queued %u bytes for MGCP GW\n", msgb_l2len(msg)); return 0; @@ -928,10 +928,10 @@ struct mgcp_response_pending *pending = mgcp_client_response_pending_get(mgcp, trans_id); if (!pending) { /*! Note: it is not harmful to cancel a transaction twice. */ - LOGP(DLMGCP, LOGL_INFO, "Cannot cancel, no such transaction: %u\n", trans_id); + LOGP(DLMGCP, LOGL_ERROR, "Cannot cancel, no such transaction: %u\n", trans_id); return -ENOENT; } - LOGP(DLMGCP, LOGL_INFO, "Canceled transaction %u\n", trans_id); + LOGP(DLMGCP, LOGL_DEBUG, "Canceled transaction %u\n", trans_id); talloc_free(pending); return 0; /*! We don't really need to clean up the wqueue: In all sane cases, the msgb has already been sent -- To view, visit https://gerrit.osmocom.org/12407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb Gerrit-Change-Number: 12407 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:34:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:34:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11718 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP The idea of this test case is to verify MO SMS transmission over GSUP towards HLR. Basically, the algorythm is the following: 1.0 establish a RAN connection, 2.1 send CP-DATA/RP-DATA on BSSAP/DTAP, 2.2 expect MO-ForwardSM-Req on GSUP, 3.1 send MO-ForwardSM-Res on GSUP, 3.2 expect CP-DATA/RP-ACK on BSSAP/DTAP. Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 73 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 0ac61bc..202bce7 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -44,6 +44,7 @@ import from MobileL3_Types all; import from MobileL3_CommonIE_Types all; +import from MobileL3_SMS_Types all; import from L3_Templates all; import from L3_Common all; @@ -2028,6 +2029,75 @@ f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); } +/* Test MO-SMS from MS/BTS/BSC towards HLR (via GSUP) */ +private function f_tc_gsup_mo_sms(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var GSUP_PDU gsup_msg_rx; + var octetstring sm_tpdu; + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + + /* Prepare expected SM-RP-UI (SM TPDU) */ + enc_TPDU_RP_DATA_MS_SGSN_fast( + valueof(ts_SMS_SUBMIT(spars.tp.msg_ref, + spars.tp.da, spars.tp.pid, spars.tp.dcs, + spars.tp.udl, spars.tp.ud)), + sm_tpdu); + + 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(?), + /* TODO: can we use decmatch here? */ + sm_rp_ui := sm_tpdu + ); + + /* Submit an SMS on DTAP and expect MO-forwardSM-Req on GSUP */ + f_mo_sms_submit(spars); + alt { + [] GSUP.receive(mo_forwardSM) -> value gsup_msg_rx { + log("RX MO-forwardSM-Req"); + log(gsup_msg_rx); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Trigger RP-ACK by sending MO-forwardSM-Res */ + GSUP.send(valueof(ts_GSUP_MO_FORWARD_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars.rp.msg_ref))); + /* Expect RP-ACK on DTAP */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_gsup_mo_sms() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler(refers(f_tc_gsup_mo_sms), 88); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2913,6 +2983,8 @@ execute( TC_smpp_mo_sms() ); execute( TC_smpp_mt_sms() ); + execute( TC_gsup_mo_sms() ); + execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); execute( TC_lu_and_mo_ussd_during_mt_call() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 83c8010..49ca1e3 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -63,6 +63,7 @@ + -- To view, visit https://gerrit.osmocom.org/11718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Gerrit-Change-Number: 11718 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:34:25 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:34:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11776 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP The idea of this test case is to verify MO SMMA transmission over GSUP towards HLR. The algorythm is equivalent to MO SMS. Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Related: OS#3587 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 79 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: 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 bf83dd3..43a1190 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -837,6 +837,27 @@ } } +/* Submit a MO RP-SMMA over an already existing DTAP connection */ +function f_mo_smma(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + + var default d := activate(as_other_sms()); + + /* just in case this is routed to SMPP.. */ + f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue)); + + rp_mo := ts_RP_SMMA_MO(spars.rp.msg_ref); + 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 */ + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci)); + + deactivate(d); + setverdict(pass); +} + /* Submit a MO-SMS over an already existing DTAP connection */ function f_mo_sms_submit(inout SmsParameters spars) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 202bce7..ef626bf 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2098,6 +2098,62 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Test MO-SMMA from MS/BTS/BSC towards HLR (via GSUP) */ +private function f_tc_gsup_mo_smma(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var GSUP_PDU gsup_msg_rx; + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + + var template GSUP_PDU mo_ReadyForSM := tr_GSUP_MO_READY_FOR_SM_REQ( + imsi := g_pars.imsi, + sm_rp_mr := spars.rp.msg_ref, + sm_alert_rsn := GSUP_SM_ALERT_RSN_TYPE_MEM_AVAIL + ); + + /* Submit an SMS on DTAP and expect MO-forwardSM-Req on GSUP */ + f_mo_smma(spars); + alt { + [] GSUP.receive(mo_ReadyForSM) -> value gsup_msg_rx { + log("RX MO-ReadyForSM-Req"); + log(gsup_msg_rx); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Trigger RP-ACK by sending MO-forwardSM-Res */ + GSUP.send(valueof(ts_GSUP_MO_READY_FOR_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars.rp.msg_ref))); + /* Expect RP-ACK on DTAP */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_gsup_mo_smma() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler(refers(f_tc_gsup_mo_smma), 89); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2984,6 +3040,7 @@ execute( TC_smpp_mt_sms() ); execute( TC_gsup_mo_sms() ); + execute( TC_gsup_mo_smma() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 49ca1e3..b9c60c0 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -64,6 +64,7 @@ + -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:38:14 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12454 to look at the new patch set (#4). Change subject: use osmo_rat_type from libosmocore ...................................................................... use osmo_rat_type from libosmocore Replace locally defined enum ran_type with libosmocore's new enum osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names. The string representations change, which has cosmetic effects on the test suite expectations. Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore) Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 36 files changed, 831 insertions(+), 847 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/12454/4 -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:38:38 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 16:38:38 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12454 ) Change subject: use osmo_rat_type from libosmocore ...................................................................... Patch Set 4: Code-Review+2 re-add +2 lost from trivial rebase -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 04 Jan 2019 16:38:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:41:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:41:51 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: fix: properly call sap_msg_free() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12437 ) Change subject: layer23/sap_interface.c: fix: properly call sap_msg_free() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Fri, 04 Jan 2019 16:41:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 16:41:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 16:41:55 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: fix: properly call sap_msg_free() In-Reply-To: References: Message-ID: Vadim Yanitskiy has removed K?vin Redon from this change. ( https://gerrit.osmocom.org/12437 ) Change subject: layer23/sap_interface.c: fix: properly call sap_msg_free() ...................................................................... Removed reviewer K?vin Redon. -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 17:26:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 17:26:14 +0000 Subject: Change in osmo-msc[master]: use osmo_rat_type from libosmocore In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12454 ) Change subject: use osmo_rat_type from libosmocore ...................................................................... use osmo_rat_type from libosmocore Replace locally defined enum ran_type with libosmocore's new enum osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names. The string representations change, which has cosmetic effects on the test suite expectations. Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore) Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 36 files changed, 831 insertions(+), 847 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/12454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b Gerrit-Change-Number: 12454 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 18:18:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 18:18:29 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12439 to look at the new patch set (#3). Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... layer23/sap_interface.c: define missing enums and use them Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 55 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/12439/3 -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 18:18:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 18:18:29 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: avoid using 'osmo' prefix Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12465 Change subject: layer23/sap_interface.c: avoid using 'osmo' prefix ...................................................................... layer23/sap_interface.c: avoid using 'osmo' prefix The 'osmo' prefix is usually used by libosmo-* symbols. Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 --- M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/common/sim.c M src/host/layer23/src/mobile/app_mobile.c 5 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/12465/1 diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 486c36d..a3ecc92 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,7 +23,7 @@ #include struct osmosap_entity { - osmosap_cb_t msg_handler; + sap_cb_t msg_handler; uint8_t sap_state; uint16_t max_msg_size; }; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 270c565..5332982 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,14 +1,14 @@ #pragma once -typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); +typedef int (*sap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); -int osmosap_init(struct osmocom_ms *ms); +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); +int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb); +int sap_init(struct osmocom_ms *ms); -enum osmosap_state { +enum sap_state { SAP_SOCKET_ERROR, SAP_NOT_CONNECTED, SAP_IDLE, @@ -18,7 +18,7 @@ }; /* Table 5.1: Message Overview */ -enum osmosap_msg_type { +enum sap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, SAP_DISCONNECT_REQ = 0x02, @@ -43,7 +43,7 @@ }; /* Table 5.15: List of Parameter IDs */ -enum osmosap_param_type { +enum sap_param_type { SAP_MAX_MSG_SIZE = 0x00, SAP_CONNECTION_STATUS = 0x01, SAP_RESULT_CODE = 0x02, diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index b777cf6..a152c18 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -154,7 +154,7 @@ return msg; } -static int osmosap_send(struct osmocom_ms *ms, struct msgb *msg) +static int sap_send(struct osmocom_ms *ms, struct msgb *msg) { if(ms->sap_entity.sap_state == SAP_NOT_CONNECTED) sap_connect(ms); @@ -294,7 +294,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_PROCESSING_ATR_REQUEST; } @@ -458,7 +458,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_CONNECTION_UNDER_NEGOTIATION; } @@ -475,7 +475,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_NOT_CONNECTED; } @@ -499,7 +499,7 @@ if(!msg) return -ENOMEM; - rc = osmosap_send(ms, msg); + rc = sap_send(ms, msg); if (rc) return rc; @@ -546,7 +546,7 @@ } /* same signature as in L1CTL, so it can be called from sim.c */ -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) { //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , // osmo_hexdump(data, length)); @@ -554,7 +554,7 @@ } /* register message handler for messages that are sent from L2->L3 */ -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb) +int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb) { ms->sap_entity.msg_handler = cb; @@ -562,7 +562,7 @@ } /* init */ -int osmosap_init(struct osmocom_ms *ms) +int sap_init(struct osmocom_ms *ms) { struct osmosap_entity *sap = &ms->sap_entity; diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 9d14cd3..a63ae2a 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -205,7 +205,7 @@ * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { LOGP(DSIM, LOGL_INFO, "Using SAP backend\n"); - rc = osmosap_send_apdu(ms, data, length); + rc = sap_send_apdu(ms, data, length); } else { LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n"); rc = l1ctl_tx_sim_req(ms, data, length); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a2c02c0..27e1d9b 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -200,7 +200,7 @@ lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); /* init SAP client before SIM card starts up */ - osmosap_init(ms); + sap_init(ms); gsm_sim_init(ms); gsm48_cc_init(ms); -- To view, visit https://gerrit.osmocom.org/12465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 Gerrit-Change-Number: 12465 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 18:18:30 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 18:18:30 +0000 Subject: Change in osmocom-bb[master]: layer23/include/Makefile.am: add missing header Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12466 Change subject: layer23/include/Makefile.am: add missing header ...................................................................... layer23/include/Makefile.am: add missing header Change-Id: I0a379718eeb7db63696cabd5689e0625fb85d85e --- M src/host/layer23/include/osmocom/bb/common/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/12466/1 diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index cd3437e..e1ea7eb 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,2 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ - networks.h gps.h sysinfo.h osmocom_data.h utils.h + networks.h gps.h sysinfo.h osmocom_data.h utils.h \ + sap_interface.h -- To view, visit https://gerrit.osmocom.org/12466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a379718eeb7db63696cabd5689e0625fb85d85e Gerrit-Change-Number: 12466 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 18:18:30 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 4 Jan 2019 18:18:30 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: separate protocol definition Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12467 Change subject: layer23/sap_interface.c: separate protocol definition ...................................................................... layer23/sap_interface.c: separate protocol definition Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/sap_interface.h A src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/common/sap_interface.c A src/host/layer23/src/common/sap_proto.c 6 files changed, 200 insertions(+), 156 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/12467/1 diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index e1ea7eb..eb1dfb7 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ networks.h gps.h sysinfo.h osmocom_data.h utils.h \ - sap_interface.h + sap_proto.h sap_interface.h diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 5332982..96d056b 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -16,86 +16,3 @@ SAP_PROCESSING_ATR_REQUEST, SAP_PROCESSING_APDU_REQUEST }; - -/* Table 5.1: Message Overview */ -enum sap_msg_type { - SAP_CONNECT_REQ = 0x00, - SAP_CONNECT_RESP = 0x01, - SAP_DISCONNECT_REQ = 0x02, - SAP_DISCONNECT_RESP = 0x03, - SAP_DISCONNECT_IND = 0x04, - SAP_TRANSFER_APDU_REQ = 0x05, - SAP_TRANSFER_APDU_RESP = 0x06, - SAP_TRANSFER_ATR_REQ = 0x07, - SAP_TRANSFER_ATR_RESP = 0x08, - SAP_POWER_SIM_OFF_REQ = 0x09, - SAP_POWER_SIM_OFF_RESP = 0x0A, - SAP_POWER_SIM_ON_REQ = 0x0B, - SAP_POWER_SIM_ON_RESP = 0x0C, - SAP_RESET_SIM_REQ = 0x0D, - SAP_RESET_SIM_RESP = 0x0E, - SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, - SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, - SAP_STATUS_IND = 0x11, - SAP_ERROR_RESP = 0x12, - SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, - SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 -}; - -/* Table 5.15: List of Parameter IDs */ -enum sap_param_type { - SAP_MAX_MSG_SIZE = 0x00, - SAP_CONNECTION_STATUS = 0x01, - SAP_RESULT_CODE = 0x02, - SAP_DISCONNECTION_TYPE = 0x03, - SAP_COMMAND_APDU = 0x04, - SAP_COMMAND_APDU_7816 = 0x10, - SAP_RESPONSE_APDU = 0x05, - SAP_ATR = 0x06, - SAP_CARD_READER_STATUS = 0x07, - SAP_STATUS_CHANGE = 0x08, - SAP_TRANSPORT_PROTOCOL = 0x09 -}; - -/* Table 5.18: Possible values for ResultCode */ -enum sap_result_type { - SAP_RESULT_OK_REQ_PROC_CORR = 0x00, - SAP_RESULT_ERROR_NO_REASON = 0x01, - SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, - SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, - SAP_RESULT_ERROR_CARD_REMOVED = 0x04, - SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, - SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, - SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, -}; - -/* Table 5.19: Possible values for StatusChange */ -enum sap_card_status_type { - SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, - SAP_CARD_STATUS_RESET = 0x01, - SAP_CARD_STATUS_NOT_ACC = 0x02, - SAP_CARD_STATUS_REMOVED = 0x03, - SAP_CARD_STATUS_INSERTED = 0x04, - SAP_CARD_STATUS_RECOVERED = 0x05, -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -enum sap_conn_status_type { - SAP_CONN_STATUS_OK_READY = 0x00, - SAP_CONN_STATUS_ERROR_CONN = 0x01, - SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, - SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, - SAP_CONN_STATUS_OK_CALL = 0x04, -}; - -struct sap_param { - uint8_t id; - uint16_t len; - uint8_t *value; -}; - -struct sap_msg { - uint8_t id; - uint8_t num_params; - struct sap_param *params; -}; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_proto.h b/src/host/layer23/include/osmocom/bb/common/sap_proto.h new file mode 100644 index 0000000..49b30fc --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/sap_proto.h @@ -0,0 +1,94 @@ +#pragma once + +#include + +#include + +/* Table 5.1: Message Overview */ +enum sap_msg_type { + SAP_CONNECT_REQ = 0x00, + SAP_CONNECT_RESP = 0x01, + SAP_DISCONNECT_REQ = 0x02, + SAP_DISCONNECT_RESP = 0x03, + SAP_DISCONNECT_IND = 0x04, + SAP_TRANSFER_APDU_REQ = 0x05, + SAP_TRANSFER_APDU_RESP = 0x06, + SAP_TRANSFER_ATR_REQ = 0x07, + SAP_TRANSFER_ATR_RESP = 0x08, + SAP_POWER_SIM_OFF_REQ = 0x09, + SAP_POWER_SIM_OFF_RESP = 0x0A, + SAP_POWER_SIM_ON_REQ = 0x0B, + SAP_POWER_SIM_ON_RESP = 0x0C, + SAP_RESET_SIM_REQ = 0x0D, + SAP_RESET_SIM_RESP = 0x0E, + SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, + SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, + SAP_STATUS_IND = 0x11, + SAP_ERROR_RESP = 0x12, + SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, + SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 +}; + +/* Table 5.15: List of Parameter IDs */ +enum sap_param_type { + SAP_MAX_MSG_SIZE = 0x00, + SAP_CONNECTION_STATUS = 0x01, + SAP_RESULT_CODE = 0x02, + SAP_DISCONNECTION_TYPE = 0x03, + SAP_COMMAND_APDU = 0x04, + SAP_COMMAND_APDU_7816 = 0x10, + SAP_RESPONSE_APDU = 0x05, + SAP_ATR = 0x06, + SAP_CARD_READER_STATUS = 0x07, + SAP_STATUS_CHANGE = 0x08, + SAP_TRANSPORT_PROTOCOL = 0x09 +}; + +/* Table 5.18: Possible values for ResultCode */ +enum sap_result_type { + SAP_RESULT_OK_REQ_PROC_CORR = 0x00, + SAP_RESULT_ERROR_NO_REASON = 0x01, + SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, + SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, + SAP_RESULT_ERROR_CARD_REMOVED = 0x04, + SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, + SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, + SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, +}; + +/* Table 5.19: Possible values for StatusChange */ +enum sap_card_status_type { + SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, + SAP_CARD_STATUS_RESET = 0x01, + SAP_CARD_STATUS_NOT_ACC = 0x02, + SAP_CARD_STATUS_REMOVED = 0x03, + SAP_CARD_STATUS_INSERTED = 0x04, + SAP_CARD_STATUS_RECOVERED = 0x05, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +enum sap_conn_status_type { + SAP_CONN_STATUS_OK_READY = 0x00, + SAP_CONN_STATUS_ERROR_CONN = 0x01, + SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, + SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, + SAP_CONN_STATUS_OK_CALL = 0x04, +}; + +extern const struct value_string sap_msg_names[]; +extern const struct value_string sap_param_names[]; +extern const struct value_string sap_result_names[]; +extern const struct value_string sap_card_status_names[]; +extern const struct value_string sap_conn_status_names[]; + +struct sap_param { + uint8_t id; + uint16_t len; + uint8_t *value; +}; + +struct sap_msg { + uint8_t id; + uint8_t num_params; + struct sap_param *params; +}; diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index b76094c..9eed961 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -2,5 +2,5 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) noinst_LIBRARIES = liblayer23.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ +liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_proto.c sap_interface.c \ logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index a152c18..7b8717d 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -47,77 +48,6 @@ static void sap_connect(struct osmocom_ms *ms); -/* Table 5.15: List of Parameter IDs */ -static const struct value_string sap_param_names[] = { - { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, - { SAP_CONNECTION_STATUS, "ConnectionStatus" }, - { SAP_RESULT_CODE, "ResultCode" }, - { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, - { SAP_COMMAND_APDU, "CommandAPDU" }, - { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, - { SAP_RESPONSE_APDU, "ResponseAPDU" }, - { SAP_ATR, "ATR" }, - { SAP_CARD_READER_STATUS, "CardReaderStatus" }, - { SAP_STATUS_CHANGE, "StatusChange" }, - { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, -}; - -/* Table 5.1: Message Overview */ -static const struct value_string sap_msg_names[] = { - { SAP_CONNECT_REQ, "CONNECT_REQ" }, - { SAP_CONNECT_RESP, "CONNECT_RESP" }, - { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, - { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, - { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, - { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, - { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, - { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, - { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, - { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, - { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, - { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, - { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, - { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, - { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, - { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, - { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, - { SAP_STATUS_IND, "STATUS_IND" }, - { SAP_ERROR_RESP, "ERROR_RESP" }, - { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, - { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, -}; - -/* Table 5.18: Possible values for ResultCode */ -static const struct value_string sap_result_names[] = { - { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, - { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, - { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, - { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, - { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, - { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, - { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, - { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "} -}; - -/* Table 5.19: Possible values for StatusChange */ -static const struct value_string sap_card_status_names[] = { - { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, - { SAP_CARD_STATUS_RESET, "Card reset" }, - { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" }, - { SAP_CARD_STATUS_REMOVED, "Card removed" }, - { SAP_CARD_STATUS_INSERTED, "Card inserted" }, - { SAP_CARD_STATUS_RECOVERED, "Card recovered" }, -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -static const struct value_string sap_conn_status_names[] = { - { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, - { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, - { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, - { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, - { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, -}; - static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) { struct msgb *msg; @@ -181,9 +111,13 @@ get_value_string(sap_result_names, param->value[0])); } +#if 0 + /* FIXME: ARRAY_SIZE() is not applicable to + * extern const struct value_string[] */ if(param->value[0] > ARRAY_SIZE(sap_result_names)){ return -1; } +#endif return 0; } diff --git a/src/host/layer23/src/common/sap_proto.c b/src/host/layer23/src/common/sap_proto.c new file mode 100644 index 0000000..c84a357 --- /dev/null +++ b/src/host/layer23/src/common/sap_proto.c @@ -0,0 +1,99 @@ +/* + * SAP (SIM Access Profile) protocol definition + * based on Bluetooth SAP specification + * + * (C) 2011 by Nico Golde + * (C) 2018 by Vadim Yanitskiy + * + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include + +#include + +/* Table 5.1: Message Overview */ +const struct value_string sap_msg_names[] = { + { SAP_CONNECT_REQ, "CONNECT_REQ" }, + { SAP_CONNECT_RESP, "CONNECT_RESP" }, + { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, + { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, + { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, + { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, + { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, + { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, + { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, + { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, + { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, + { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, + { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, + { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, + { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, + { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, + { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, + { SAP_STATUS_IND, "STATUS_IND" }, + { SAP_ERROR_RESP, "ERROR_RESP" }, + { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, + { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, +}; + +/* Table 5.15: List of Parameter IDs */ +const struct value_string sap_param_names[] = { + { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, + { SAP_CONNECTION_STATUS, "ConnectionStatus" }, + { SAP_RESULT_CODE, "ResultCode" }, + { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, + { SAP_COMMAND_APDU, "CommandAPDU" }, + { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, + { SAP_RESPONSE_APDU, "ResponseAPDU" }, + { SAP_ATR, "ATR" }, + { SAP_CARD_READER_STATUS, "CardReaderStatus" }, + { SAP_STATUS_CHANGE, "StatusChange" }, + { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, +}; + +/* Table 5.18: Possible values for ResultCode */ +const struct value_string sap_result_names[] = { + { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, + { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, + { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, + { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, + { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, + { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, + { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, + { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "} +}; + +/* Table 5.19: Possible values for StatusChange */ +const struct value_string sap_card_status_names[] = { + { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, + { SAP_CARD_STATUS_RESET, "Card reset" }, + { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" }, + { SAP_CARD_STATUS_REMOVED, "Card removed" }, + { SAP_CARD_STATUS_INSERTED, "Card inserted" }, + { SAP_CARD_STATUS_RECOVERED, "Card recovered" }, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +const struct value_string sap_conn_status_names[] = { + { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, + { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, + { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, + { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, + { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, +}; -- To view, visit https://gerrit.osmocom.org/12467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 Gerrit-Change-Number: 12467 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 23:47:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 23:47:41 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12468 Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... add osmo_mi_name(), for MI-to-string like "IMSI-123456" We have gsm48_mi_to_string() and osmo_bcd2str(), but still lack a function that conveniently prints both MI type and value in one function call. Related: http://people.osmocom.org/neels/mi_mi_mi.jpg Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 5 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12468/1 diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index 2b14e6c..0acd506 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -53,6 +53,7 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len); const char *gsm48_mi_type_name(uint8_t mi); +const char *osmo_mi_name(const uint8_t mi[], uint8_t mi_len); /* Parse Routeing Area Identifier */ void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf); diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 190622f..daf04f8 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -433,6 +433,42 @@ return get_value_string(mi_type_names, mi); } +/*! Return a human readable representation of a Mobile Identity in static buffer. + * \param[in] mi Mobile Identity buffer containing 3GPP TS 04.08 style MI type and data. + * \param[in] mi_len Length of mi. + * \return A string like "IMSI-1234567", "TMSI-0x1234ABCD" or "unknown", "TMSI-invalid"... + */ +const char *osmo_mi_name(const uint8_t mi[], uint8_t mi_len) +{ + static char mi_name[10 + GSM48_MI_SIZE + 1]; + uint8_t mi_type; + uint32_t tmsi; + char mi_string[GSM48_MI_SIZE]; + + mi_type = (mi && mi_len) ? (mi[0] & GSM_MI_TYPE_MASK) : GSM_MI_TYPE_NONE; + + switch (mi_type) { + default: + return "unknown"; + + case GSM_MI_TYPE_TMSI: + /* Table 10.5.4.3, reverse generate_mid_from_tmsi */ + if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) { + tmsi = osmo_load32be(&mi[1]); + snprintf(mi_name, sizeof(mi_name), "TMSI-0x%08X", tmsi); + return mi_name; + } + return "TMSI-invalid"; + + case GSM_MI_TYPE_IMSI: + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMEISV: + osmo_bcd2str(mi_string, sizeof(mi_string), mi, 1, (mi_len * 2) - (mi[0] & GSM_MI_ODD ? 0 : 1), true); + snprintf(mi_name, sizeof(mi_name), "%s-%s", gsm48_mi_type_name(mi_type), mi_string); + return mi_name; + } +} + /*! Checks is particular message is cipherable in A/Gb mode according to * 3GPP TS 24.008 ? 4.7.1.2 * \param[in] hdr Message header diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bb97878..8b7a164 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -325,6 +325,7 @@ gsm48_set_dtx; gsm48_dtx_mode; gsm48_mi_type_name; +osmo_mi_name; gsm48_mcc_mnc_to_bcd; gsm48_mcc_mnc_from_bcd; gsm48_generate_lai2; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 9bb320d..37ef3f1 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -355,6 +355,7 @@ struct test_mid_encode_decode_test { uint8_t mi_type; const char *mi_str; + const char *mi_name; size_t str_size; const char *expect_mi_tlv_hex; const char *expect_str; @@ -365,31 +366,37 @@ { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "123456789012345", + .mi_name = "IMSI-123456789012345", .expect_mi_tlv_hex = "17081932547698103254", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "12345678901234", + .mi_name = "IMSI-12345678901234", .expect_mi_tlv_hex = "170811325476981032f4", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "423423", + .mi_name = "IMSI-423423", .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, .mi_str = "423423", + .mi_name = "IMSI-423423", .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "4234235", + .mi_name = "IMSI-4234235", .expect_mi_tlv_hex = "170449322453", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "4234235", + .mi_name = "IMSI-4234235", .expect_mi_tlv_hex = "170449322453", .str_size = 4, .expect_str = "423", @@ -397,26 +404,31 @@ { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "123456789012345", + .mi_name = "IMEI-123456789012345", .expect_mi_tlv_hex = "17081a32547698103254", }, { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "98765432109876", + .mi_name = "IMEI-98765432109876", .expect_mi_tlv_hex = "170892785634129078f6", }, { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "987654321098765", + .mi_name = "IMEI-987654321098765", .expect_mi_tlv_hex = "17089a78563412907856", }, { .mi_type = GSM_MI_TYPE_IMEISV, .mi_str = "987654321098765432", + .mi_name = "IMEI-SV-987654321098765432", .expect_mi_tlv_hex = "170a937856341290785634f2", }, { .mi_type = GSM_MI_TYPE_IMEISV, .mi_str = "987654321098765432", + .mi_name = "IMEI-SV-987654321098765432", .expect_mi_tlv_hex = "170a937856341290785634f2", .str_size = 16, .expect_str = "987654321098765", @@ -425,18 +437,21 @@ /* gsm48 treats TMSI as decimal string */ .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "305419896", /* 0x12345678 as decimal */ + .mi_name = "TMSI-0x12345678", .expect_mi_tlv_hex = "1705f412345678", .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "12648430", /* 0xc0ffee as decimal */ + .mi_name = "TMSI-0x00C0FFEE", .expect_mi_tlv_hex = "1705f400c0ffee", .expect_rc = 8, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "0", + .mi_name = "TMSI-0x00000000", .expect_mi_tlv_hex = "1705f400000000", .expect_rc = 1, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, @@ -444,6 +459,7 @@ /* gsm48 treats TMSI as decimal string */ .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "305419896", /* 0x12345678 as decimal */ + .mi_name = "TMSI-0x12345678", .expect_mi_tlv_hex = "1705f412345678", .str_size = 5, .expect_str = "3054", @@ -452,18 +468,21 @@ { .mi_type = GSM_MI_TYPE_NONE, .mi_str = "123", + .mi_name = "unknown", .expect_mi_tlv_hex = "17021832", /* encoding invalid MI type */ .expect_str = "", }, { .mi_type = GSM_MI_TYPE_NONE, .mi_str = "1234", + .mi_name = "unknown", .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ .expect_str = "", }, { .mi_type = GSM_MI_ODD, .mi_str = "1234", + .mi_name = "unknown", .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ .expect_str = "", }, @@ -512,6 +531,13 @@ if (rc != expect_rc) printf(" ERROR: expected rc=%d\n", expect_rc); + if (t->mi_name) { + const char *mi_name = osmo_mi_name(mi_buf, mi_len); + printf(" -> MI-name=%s\n", osmo_quote_str(mi_name, -1)); + if (strcmp(mi_name, t->mi_name)) + printf(" ERROR: expected MI-name=%s\n", osmo_quote_str(t->mi_name, -1)); + } + /* Now make sure the resulting string is always '\0' terminated. * The above started out with a zeroed buffer, now repeat with a tainted one. */ str_len = strlen(str); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index d6579e5..0c13555 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -7,57 +7,75 @@ - IMSI 123456789012345 -> MI-TLV-hex='17081932547698103254' -> MI-str="123456789012345" rc=16 + -> MI-name="IMSI-123456789012345" - IMSI 12345678901234 -> MI-TLV-hex='170811325476981032f4' -> MI-str="12345678901234" rc=15 + -> MI-name="IMSI-12345678901234" - IMSI 423423 -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 + -> MI-name="IMSI-423423" - unknown 0x9 423423 -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 + -> MI-name="IMSI-423423" - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="4234235" rc=8 + -> MI-name="IMSI-4234235" - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="423" rc=4 + -> MI-name="IMSI-4234235" - IMEI 123456789012345 -> MI-TLV-hex='17081a32547698103254' -> MI-str="123456789012345" rc=16 + -> MI-name="IMEI-123456789012345" - IMEI 98765432109876 -> MI-TLV-hex='170892785634129078f6' -> MI-str="98765432109876" rc=15 + -> MI-name="IMEI-98765432109876" - IMEI 987654321098765 -> MI-TLV-hex='17089a78563412907856' -> MI-str="987654321098765" rc=16 + -> MI-name="IMEI-987654321098765" - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' -> MI-str="987654321098765432" rc=19 + -> MI-name="IMEI-SV-987654321098765432" - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' -> MI-str="987654321098765" rc=16 + -> MI-name="IMEI-SV-987654321098765432" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 + -> MI-name="TMSI-0x12345678" - TMSI 12648430 -> MI-TLV-hex='1705f400c0ffee' -> MI-str="12648430" rc=8 + -> MI-name="TMSI-0x00C0FFEE" - TMSI 0 -> MI-TLV-hex='1705f400000000' -> MI-str="0" rc=1 + -> MI-name="TMSI-0x00000000" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="3054" rc=9 + -> MI-name="TMSI-0x12345678" - NONE 123 -> MI-TLV-hex='17021832' -> MI-str="" rc=1 + -> MI-name="unknown" - NONE 1234 -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 + -> MI-name="unknown" - unknown 0x8 1234 -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 + -> MI-name="unknown" Decoding zero length Mobile Identities - MI type: IMSI -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 4 23:47:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 Jan 2019 23:47:41 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12469 Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... add osmo_lu_type_names[], osmo_lu_type_name() Move lupd_names[] from osmo-msc to libosmo-gsm. Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/12469/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index a97225c..791fbd4 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1652,6 +1652,10 @@ #define GSM48_LUPD_IMSI_ATT 0x2 #define GSM48_LUPD_RESERVED 0x3 +extern const struct value_string osmo_lu_type_names[]; +static inline const char *osmo_lu_type_name(uint8_t lu_type) +{ return get_value_string(osmo_lu_type_names, lu_type); } + /* Table 10.5.4 */ #define GSM_MI_TYPE_MASK 0x07 #define GSM_MI_TYPE_NONE 0x00 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index daf04f8..f2a9ded 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1137,4 +1137,11 @@ return gh; } +const struct value_string osmo_lu_type_names[] = { + { GSM48_LUPD_NORMAL, "NORMAL" }, + { GSM48_LUPD_PERIODIC, "PERIODIC" }, + { GSM48_LUPD_IMSI_ATT, "IMSI-ATTACH" }, + {} +}; + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8b7a164..cdcbcc9 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -555,6 +555,7 @@ sgsap_ie_tlvdef; osmo_rat_type_names; +osmo_lu_type_names; local: *; }; -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 4 23:57:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 4 Jan 2019 23:57:59 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-libosmocore_=C2=BB_a2=3Dde?= =?UTF-8?Q?fault,a3=3Ddefault,a4=3Ddefault,am?= =?UTF-8?Q?d64,osmocom-master-debian9_#682?= In-Reply-To: <501555917.418.1546619163599.JavaMail.jenkins@jenkins.osmocom.org> References: <501555917.418.1546619163599.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <564928552.419.1546646279653.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:15:19 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:15:19 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#6). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 19 files changed, 11,769 insertions(+), 11,423 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/6 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:15:21 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:15:21 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12470 Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... add LOG_RAN_CONN() to use the conn->fi->id for context For each conn, set a default logging category, to distinguish categories for BSSMAP and RANAP based conns. LOG_RAN_CONN(): log with the conn's default category, LOG_RAN_CONN_CAT(): log with a manually set category (mostly for keeping previous DMM logging on the same category). In some places, replace LOGP() using manual context with LOG_RAN_CONN(), and remove the manual context info, now provided by the conn->fi->id. This is loosely related to inter-BSC and inter-MSC handover: to speed up refactoring, I want to avoid the need for manual logging context and just use this LOG_RAN_CONN(). Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 19 files changed, 291 insertions(+), 257 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12470/1 diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index b1b6c1c..2d11cca 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -25,14 +25,6 @@ #include #include -#define LOGPCONN(conn, level, fmt, args...) \ - LOGP(DBSSAP, level, "(subscr %s, conn_id %d) " fmt, \ - vlr_subscr_name(conn ? conn->vsub : NULL), conn ? conn->a.conn_id : -1, \ - ## args) - -#define LOGPBSCCONN(conn, level, fmt, args...) \ - LOGP(DBSSAP, level, "(conn_id %u) " fmt, conn ? conn->conn_id : (uint32_t)(-1), ## args) - /* A struct to keep a context information about the BSCs we are associated with */ struct bsc_context { struct llist_head list; diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index 4aa771e..becf507 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -8,6 +8,14 @@ #include #include +#define LOG_RAN_CONN(conn, level, fmt, args ...) \ + LOG_RAN_CONN_CAT(conn, (conn) ? (conn)->log_subsys : DMSC, level, fmt, ## args) + +#define LOG_RAN_CONN_CAT(conn, subsys, level, fmt, args ...) \ + LOGP(subsys, level, "%s " fmt, \ + (conn) && (conn)->fi ? osmo_fsm_inst_name((conn)->fi) : "(?)", \ + ## args) + enum ran_conn_fsm_event { /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ RAN_CONN_E_COMPLETE_LAYER_3, @@ -107,6 +115,8 @@ /* connected via 2G or 3G? */ enum osmo_rat_type via_ran; + /* whether to log on DBSSAP, DIUCS, ... */ + int log_subsys; uint16_t lac; struct geran_encr geran_encr; diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index ee938aa..0811734 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -40,9 +40,12 @@ #include #include #include +#include #include +#define LOGPCONN LOG_RAN_CONN + /* A pointer to the GSM network we work with. By the current paradigm, * there can only be one gsm_network per MSC. The pointer is set once * when calling a_init() */ @@ -86,7 +89,7 @@ llist_for_each_entry_safe(conn, conn_temp, &active_connections, list) { if (conn->conn_id == conn_id) { - LOGPBSCCONN(conn, LOGL_DEBUG, "Removing A-interface conn\n"); + LOGP(DBSSAP, LOGL_DEBUG, "(conn%u) Removing A-interface conn\n", conn->conn_id); llist_del(&conn->list); talloc_free(conn); } diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 491f8d0..41af93c 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -35,11 +35,14 @@ #include #include #include +#include #include #define IP_V4_ADDR_LEN 4 +#define LOGPCONN LOG_RAN_CONN + /* * Helper functions to lookup and allocate subscribers */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7ff8681..e66e9ea 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -339,7 +339,7 @@ gsm48_mi_to_string(mi_string, sizeof(mi_string), lu->mi, lu->mi_len); if (ran_conn_is_establishing_auth_ciph(conn)) { - LOGP(DMM, LOGL_ERROR, + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, "Cannot accept another LU, conn already busy establishing authenticity;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); @@ -347,7 +347,7 @@ } if (ran_conn_is_accepted(conn)) { - LOGP(DMM, LOGL_ERROR, + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, "Cannot accept another LU, conn already established;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); @@ -356,9 +356,8 @@ ran_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); - DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, - get_value_string(lupd_names, lu->type)); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", + gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len); @@ -392,7 +391,7 @@ imsi = NULL; break; default: - DEBUGPC(DMM, "unknown mobile identity type\n"); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, "unknown mobile identity type\n"); tmsi = GSM_RESERVED_TMSI; imsi = NULL; break; @@ -401,7 +400,7 @@ gsm48_decode_lai2(&lu->lai, &old_lai); new_lai.plmn = conn->network->plmn; new_lai.lac = conn->lac; - DEBUGP(DMM, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac); is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU); lu_fsm = vlr_loc_update(conn->fi, @@ -414,7 +413,7 @@ is_utran, net->vlr->cfg.assign_tmsi); if (!lu_fsm) { - DEBUGP(DRR, "%s: Can't start LU FSM\n", mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "Can't start LU FSM\n"); return 0; } @@ -423,9 +422,7 @@ * already have been called and completed. Has an error occured? */ if (!conn->vsub || conn->vsub->lu_fsm != lu_fsm) { - LOGP(DRR, LOGL_ERROR, - "%s: internal error during Location Updating attempt\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "internal error during Location Updating attempt\n"); return -EIO; } @@ -596,7 +593,7 @@ ptr8[2] = dst; } - DEBUGP(DMM, "-> MM INFO\n"); + LOG_RAN_CONN(conn, LOGL_DEBUG, "Tx MM INFO\n"); return gsm48_conn_sendmsg(msg, conn, NULL); } @@ -616,7 +613,7 @@ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_auth_req *ar = (struct gsm48_auth_req *) msgb_put(msg, sizeof(*ar)); - DEBUGP(DMM, "-> AUTH REQ (rand = %s)\n", osmo_hexdump_nospc(rand, 16)); + DEBUGP(DMM, "Tx AUTH REQ (rand = %s)\n", osmo_hexdump_nospc(rand, 16)); if (autn) DEBUGP(DMM, " AUTH REQ (autn = %s)\n", osmo_hexdump_nospc(autn, 16)); @@ -725,21 +722,23 @@ lai.lac = conn->lac; if (msg->data_len < sizeof(struct gsm48_service_request*)) { - LOGP(DMM, LOGL_ERROR, "<- CM SERVICE REQUEST wrong sized message\n"); + LOG_RAN_CONN(conn, LOGL_ERROR, "Rx CM SERVICE REQUEST: wrong message size (%u < %zu)\n", + msg->data_len, sizeof(struct gsm48_service_request*)); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } if (msg->data_len < req->mi_len + 6) { - LOGP(DMM, LOGL_ERROR, "<- CM SERVICE REQUEST does not fit in packet\n"); + LOG_RAN_CONN(conn, LOGL_ERROR, "Rx CM SERVICE REQUEST: message does not fit in packet\n"); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } gsm48_mi_to_string(mi_string, sizeof(mi_string), mi, mi_len); + mi_type = mi[0] & GSM_MI_TYPE_MASK; - DEBUGP(DMM, "<- CM SERVICE REQUEST serv_type=0x%02x MI(%s)=%s\n", - req->cm_service_type, gsm48_mi_type_name(mi_type), mi_string); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "Rx CM SERVICE REQUEST cm_service_type=0x%02x MI(%s)=%s\n", + req->cm_service_type, gsm48_mi_type_name(mi_type), mi_string); switch (mi_type) { case GSM_MI_TYPE_IMSI: @@ -749,12 +748,12 @@ case GSM_MI_TYPE_IMEI: if (req->cm_service_type == GSM48_CMSERV_EMERGENCY) { /* We don't do emergency calls by IMEI */ - LOGP(DMM, LOGL_NOTICE, "<- CM SERVICE REQUEST(IMEI=%s) rejected\n", mi_string); + LOG_RAN_CONN(conn, LOGL_NOTICE, "Tx CM SERVICE REQUEST REJECT\n"); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_IMEI_NOT_ACCEPTED); } /* fall-through for non-emergency setup */ default: - DEBUGPC(DMM, "mi_type is not expected: %d\n", mi_type); + LOG_RAN_CONN(conn, LOGL_ERROR, "mi_type is not expected: %d\n", mi_type); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } @@ -798,8 +797,7 @@ /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ if (!conn->vsub) { - LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a CM Service Request\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "subscriber not allowed to do a CM Service Request\n"); return -EIO; } @@ -1181,9 +1179,8 @@ return 0; } - DEBUGP(DRR, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); - ran_conn_update_id(conn, COMPLETE_LAYER3_PAGING_RESP, mi_string); + LOG_RAN_CONN_CAT(conn, DRR, LOGL_DEBUG, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU); vlr_proc_acc_req(conn->fi, @@ -1198,8 +1195,7 @@ /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ if (!conn->vsub) { - LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a Paging Response\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); return -EIO; } @@ -1771,11 +1767,11 @@ OSMO_ASSERT(vsub); if (conn->vsub) { if (conn->vsub == vsub) - LOGPCONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", - vlr_subscr_name(vsub)); + LOG_RAN_CONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", + vlr_subscr_name(vsub)); else { - LOGPCONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," - " cannot associate with %s\n", vlr_subscr_name(vsub)); + LOG_RAN_CONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," + " cannot associate with %s\n", vlr_subscr_name(vsub)); return -EINVAL; } } diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index d6349eb..714907f 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -651,6 +651,18 @@ .fi = fi, }; + switch (via_ran) { + case OSMO_RAT_GERAN_A: + conn->log_subsys = DBSSAP; + break; + case OSMO_RAT_UTRAN_IU: + conn->log_subsys = DRANAP; + break; + default: + conn->log_subsys = DMSC; + break; + } + fi->priv = conn; llist_add_tail(&conn->entry, &network->ran_conns); return conn; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 059b4a8..91d74a9 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -187,7 +187,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -281,7 +281,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -420,8 +420,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -610,7 +610,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -717,7 +717,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -869,8 +869,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1047,7 +1047,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1141,7 +1141,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1235,7 +1235,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1360,8 +1360,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1550,7 +1550,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1657,7 +1657,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1764,7 +1764,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1902,8 +1902,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -2080,7 +2080,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -2219,8 +2219,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -2409,7 +2409,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 8a75e6a..07744b7 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -184,7 +184,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -390,8 +390,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -576,8 +576,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -769,8 +769,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -955,8 +955,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -1114,8 +1114,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1288,7 +1288,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1456,8 +1456,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1630,7 +1630,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index e834e91..855f2e6 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -170,7 +170,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -287,8 +287,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -452,8 +452,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -649,7 +649,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -766,8 +766,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976) PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -897,8 +897,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:50462976) LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM RAN_conn(LU:50462976) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1096,8 +1096,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1325,8 +1325,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1586,8 +1586,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1728,7 +1728,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1845,8 +1845,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -2011,8 +2011,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 69ad9a2..6b3cbfc 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -174,7 +174,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -315,8 +315,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -504,8 +504,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -706,7 +706,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -847,8 +847,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976) PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -1036,8 +1036,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1269,8 +1269,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1491,8 +1491,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1756,8 +1756,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth+Ciph @@ -1910,7 +1910,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -2041,8 +2041,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth+Ciph @@ -2220,8 +2220,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -2279,6 +2279,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620) Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH @@ -2288,6 +2289,9 @@ lu_result_sent == 0 - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(LU:901700000004620) Found A subscriber for conn_id 0 +DBSSAP RAN_conn(LU:901700000004620) Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(LU:901700000004620) Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 @@ -2382,7 +2386,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -2523,8 +2527,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -2712,8 +2716,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -2771,6 +2775,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620) Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH @@ -2780,6 +2785,9 @@ lu_result_sent == 0 - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(LU:901700000004620) Found A subscriber for conn_id 0 +DBSSAP RAN_conn(LU:901700000004620) Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(LU:901700000004620) Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 @@ -2874,7 +2882,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -3015,8 +3023,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -3063,6 +3071,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM MSISDN:42342: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(PAGING_RESP:901700000004620) Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH @@ -3071,6 +3080,9 @@ DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(PAGING_RESP:901700000004620) Found A subscriber for conn_id 0 +DBSSAP RAN_conn(PAGING_RESP:901700000004620) Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(PAGING_RESP:901700000004620) Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND MSISDN:42342 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 1a3d67c..e32d85d 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -89,8 +89,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -171,8 +171,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -320,8 +320,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -468,8 +468,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -617,8 +617,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -697,8 +697,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -847,8 +847,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -925,8 +925,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1004,8 +1004,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1086,8 +1086,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 7e49d01..d5de6ee 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -98,8 +98,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 8e99883..0fb3e65 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -118,8 +118,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -260,7 +260,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -356,8 +356,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -556,8 +556,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -615,6 +615,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620) Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f865d87..91fb154 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -122,7 +122,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -199,8 +199,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -324,8 +324,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -473,7 +473,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -550,8 +550,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976) PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -641,8 +641,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:50462976) LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM RAN_conn(LU:50462976) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -823,8 +823,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1004,8 +1004,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1211,8 +1211,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1378,8 +1378,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1577,8 +1577,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1739,8 +1739,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1939,8 +1939,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -2167,8 +2167,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 76431fb..f2d5256 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -45,8 +45,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -60,7 +60,7 @@ DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --GERAN-A--> MS DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 -DRR 901700000004620: internal error during Location Updating attempt +DBSSAP RAN_conn(LU:901700000004620) internal error during Location Updating attempt DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 lu_result_sent == 2 @@ -160,8 +160,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -194,7 +194,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED @@ -282,8 +282,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -316,7 +316,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(LU:901700000004620) Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM Cannot accept CM Service Request, conn already busy establishing authenticity DMM -> CM SERVICE Reject cause: 22 DMSC msc_tx 3 bytes to IMSI:901700000004620 via GERAN-A @@ -411,8 +411,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -535,8 +535,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -637,7 +637,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -669,7 +669,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(CM_SERVICE_REQ:901700000004620) Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x8: cm_service) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -724,8 +724,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -826,7 +826,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -858,7 +858,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(CM_SERVICE_REQ:901700000004620) Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM MSISDN:46071: re-using already accepted connection DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_ACCEPTED}: Updated ID - sending CM Service Accept for MSISDN:46071 @@ -916,8 +916,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1018,7 +1018,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -1096,8 +1096,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1212,8 +1212,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -1252,7 +1252,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(PAGING_RESP:901700000004620) Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x20: trans_sms) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -1315,8 +1315,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1431,8 +1431,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -1471,7 +1471,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(PAGING_RESP:901700000004620) Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM MSISDN:46071: re-using already accepted connection DREF MSISDN:46071: MSC conn use + cm_service == 3 (0x2a: dtap,cm_service,trans_sms) DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_ACCEPTED}: Updated ID @@ -1554,8 +1554,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1670,8 +1670,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 1b33b2d..772231c 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -57,7 +57,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -71,7 +71,7 @@ DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --GERAN-A--> MS -DRR 901700000004620: subscriber not allowed to do a CM Service Request +DBSSAP RAN_conn(CM_SERVICE_REQ:901700000004620) subscriber not allowed to do a CM Service Request DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 - conn was released @@ -101,8 +101,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -216,8 +216,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -362,8 +362,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:591536962) LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI ATTACH +DMM RAN_conn(LU:591536962) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:591536962) DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 5dcdbbe..7e640fc 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -115,7 +115,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -205,8 +205,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM RAN_conn(LU:901700000004620) LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -336,8 +336,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620) PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 3f781d7..db7085e 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -182,7 +182,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -300,8 +300,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth (no Ciph) @@ -466,8 +466,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -651,7 +651,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -782,8 +782,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650) PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -961,8 +961,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1172,8 +1172,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1395,8 +1395,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1493,8 +1493,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1591,8 +1591,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1689,8 +1689,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1787,8 +1787,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1885,8 +1885,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650) LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL +DMM RAN_conn(LU:901700000010650) LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index d3e338a..39d7e42 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -511,6 +511,11 @@ .description = "MNCC API for Call Control application", .enabled = 1, .loglevel = LOGL_DEBUG, }, + [DBSSAP] = { + .name = "DBSSAP", + .description = "BSSAP Protocol (A Interface)", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, }; static struct log_info info = { -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:15:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:15:22 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12471 Change subject: rx CM Service Req: reject double use sooner ...................................................................... rx CM Service Req: reject double use sooner When a CM Service Req is being rejected, we should do so before changing the state of the current conn. Concerning multiple CM Service Requests: in fact we should store multiple requests, but first fix the status quo of rejecting multiple requests. Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/12471/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index e66e9ea..d807a83 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -734,6 +734,14 @@ GSM48_REJECT_INCORRECT_MESSAGE); } + if (ran_conn_is_establishing_auth_ciph(conn)) { + LOG_RAN_CONN(conn, LOGL_ERROR, + "Cannot accept CM Service Request, conn already busy establishing authenticity\n"); + msc_vlr_tx_cm_serv_rej(conn, GSM48_REJECT_CONGESTION); + return -EINVAL; + /* or should we accept and note down the service request anyway? */ + } + gsm48_mi_to_string(mi_string, sizeof(mi_string), mi, mi_len); mi_type = mi[0] & GSM_MI_TYPE_MASK; @@ -772,13 +780,6 @@ if (ran_conn_is_accepted(conn)) return cm_serv_reuse_conn(conn, mi_p); - if (ran_conn_is_establishing_auth_ciph(conn)) { - LOGP(DMM, LOGL_ERROR, - "Cannot accept CM Service Request, conn already busy establishing authenticity\n"); - msc_vlr_tx_cm_serv_rej(conn, GSM48_REJECT_CONGESTION); - return -EINVAL; - /* or should we accept and note down the service request anyway? */ - } ran_conn_update_id(conn, COMPLETE_LAYER3_CM_SERVICE_REQ, mi_string); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index f2d5256..73e6738 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -316,8 +316,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM RAN_conn(LU:901700000004620) Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 -DMM Cannot accept CM Service Request, conn already busy establishing authenticity +DBSSAP RAN_conn(LU:901700000004620) Cannot accept CM Service Request, conn already busy establishing authenticity DMM -> CM SERVICE Reject cause: 22 DMSC msc_tx 3 bytes to IMSI:901700000004620 via GERAN-A - DTAP --GERAN-A--> MS: GSM48_MT_MM_CM_SERV_REJ: 052216 -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:17:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:17:34 +0000 Subject: Change in osmo-msc[master]: refactor ran_conn_get_conn_id() In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/12453 ) Change subject: refactor ran_conn_get_conn_id() ...................................................................... Abandoned squashed into https://gerrit.osmocom.org/c/osmo-msc/+/12402 I66a68ce2eb8957a35855a3743d91a86299900834 -- To view, visit https://gerrit.osmocom.org/12453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I82c022a995c11478201e0faeaf748e74dc38e05f Gerrit-Change-Number: 12453 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:21:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:21:50 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#7). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 19 files changed, 11,769 insertions(+), 11,423 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/7 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:21:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:21:50 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12403 to look at the new patch set (#7). Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... tweak fsm_msc_mgcp FSM and FI name Instead of MGW(MGW_99) use a name of msc-mgcp(MSISDN:2331_GERAN_A:00000017_trans99) 1. The FSM is communication towards an MGW, not the MGW itself. When reading combined logging (gsmtap_log), it is confusing to read 'MGW' in a log coming from the MSC. The API is also called msc_mgcp_*. 2. Calling the FSM instance 'MGW_' again doesn't make sense. 3. Indicate 'trans' before the trans_id (trans_id was already shown, but not indicated what it was). 4. Also indicate the actual subscriber's identification. 5. Also indicate the RAN connection and conn_id. This comes up while trying to understand a call coming in on an already established call: parsing the log with a human brain is near torture without this info, taking extremely long to get grips on. Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 --- M src/libmsc/msc_mgcp.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/03/12403/7 -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:21:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:21:50 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12404 to look at the new patch set (#7). Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... err log: fully log MS supported A5 algos on mismatch Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 --- M src/libmsc/gsm_04_08.c 1 file changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/04/12404/7 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:21:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:21:50 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12405 to look at the new patch set (#7). Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... msc_vlr_tests: tweak logging in verbose mode Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/05/12405/7 -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:21:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:21:50 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc.c: drop non-sensible error message In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12456 to look at the new patch set (#4). Change subject: gsm_04_08_cc.c: drop non-sensible error message ...................................................................... gsm_04_08_cc.c: drop non-sensible error message Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/12456/4 -- To view, visit https://gerrit.osmocom.org/12456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe Gerrit-Change-Number: 12456 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:23:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:23:34 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12402/7/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12402/7/src/libmsc/gsm_04_08.c at a317 PS7, Line 317: moving this to libosmocore is kind of an unrelated change that slipped into this patch. Separating them means I need to edit apart the logging like below in line 333. Choosing to be lazy now, let me know if I should spend effort and separate instead. -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 05 Jan 2019 03:23:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:25:56 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:25:56 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12468 to look at the new patch set (#2). Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... add osmo_mi_name(), for MI-to-string like "IMSI-123456" We have gsm48_mi_to_string() and osmo_bcd2str(), but still lack a function that conveniently prints both MI type and value in one function call. Related: http://people.osmocom.org/neels/mi_mi_mi.jpg Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 5 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12468/2 -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:35:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:35:26 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12361 to look at the new patch set (#2). Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 --- M src/libmsc/msc_mgcp.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/12361/2 -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:38:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:38:13 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12361 to look at the new patch set (#3). Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 --- M src/libmsc/msc_mgcp.c 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/12361/3 -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:56:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:56:14 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: I'd say, ok, fine, and since we're in the sgsn in a sub-area called gtphub, I don't even see how an ABI change is a problem. But I am puzzled why the gtphub code is coming up at this point in time. How are we currently interested in that, how did you even end up spotting the gsn_addr? -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 05 Jan 2019 03:56:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 03:59:12 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 03:59:12 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12352/2/src/gprs/gtphub.c File src/gprs/gtphub.c: https://gerrit.osmocom.org/#/c/12352/2/src/gprs/gtphub.c at 196 PS2, Line 196: gsna->length = 4; if using the new struct, should also populate the type member throughout the code. Alternatively spread API doc everywhere that the field is ignored, but that's ugly IMHO. That kind of makes it not worthwhile bothering, I guess. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 05 Jan 2019 03:59:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 04:01:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 04:01:15 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12382 ) Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 05 Jan 2019 04:01:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 04:28:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 Jan 2019 04:28:14 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 11: Code-Review-1 (8 comments) (in general, I think you can still drop a lot of comments ... if you can be bothered) https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_08.c at 1802 PS11, Line 1802: /* GSM 04.11 code implementing MT SMS */ (a comment is always about "code implementing") https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 162 PS11, Line 162: if (sms != NULL) { /* gsm411_send_rp_data() doesn't set trans->sms.sms */ put the "doesn't set" above the 'if', and the 'Notify...' inside the 'if {' body https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1147 PS11, Line 1147: hmm, I sort of expected a TLV structure, but there are no Ts... too late for that I guess. https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1148 PS11, Line 1148: /* Encode RP-DA length */ OA? https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1154 PS11, Line 1154: memcpy(ptr, sm_rp_oa, sm_rp_oa_len); Rather use msgb_lv_put()? https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1158 PS11, Line 1158: ptr[0] = 0x00; msgb_put_u8()? msgb_v_put()? https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1166 PS11, Line 1166: memcpy(ptr, sm_rp_ud, sm_rp_ud_len); msgb_lv_put()? https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1170 PS11, Line 1170: return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, API wise it would be better to have separate functions that encode and send. I often faced inflexibility with code that cannot encode without also sending, for example during unit testing. -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 05 Jan 2019 04:28:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 10:15:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 10:15:47 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12382 ) Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... tests/gsup_test.c: drop session IEs from MO-ForwardSM Error Both session state and session ID IEs were left from the initial version of Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71. There is no need to use them (as we use SM-RP-MR), so let's clean up. Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 --- M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err 2 files changed, 4 insertions(+), 10 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index f194573..4ad7431 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -256,12 +256,6 @@ 0x25, /* OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR */ TEST_IMSI_IE, - /* Session related IEs */ - 0x30, 0x04, /* Session ID */ - 0xde, 0xad, 0xbe, 0xef, - 0x31, 0x01, /* Session state (END) */ - 0x03, - /* SM related IEs */ 0x40, 0x01, /* SM-RP-MR (Message Reference) */ 0xfa, diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 73b35fc..225735e 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -58,8 +58,8 @@ generated message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef original message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef IMSI: 123456789012345 - generated message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af - original message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af + generated message: 25 01 08 21 43 65 87 09 21 43 f5 40 01 fa 44 01 af + original message: 25 01 08 21 43 65 87 09 21 43 f5 40 01 fa 44 01 af IMSI: 123456789012345 generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 @@ -93,7 +93,7 @@ message 17: tested 33 truncations, 29 parse failures message 18: tested 44 truncations, 39 parse failures message 19: tested 20 truncations, 18 parse failures - message 20: tested 26 truncations, 22 parse failures + message 20: tested 17 truncations, 15 parse failures message 21: tested 14 truncations, 13 parse failures message 22: tested 22 truncations, 21 parse failures message 23: tested 14 truncations, 13 parse failures @@ -119,7 +119,7 @@ message 17: tested 8448 modifications, 2053 parse failures message 18: tested 11264 modifications, 2307 parse failures message 19: tested 5120 modifications, 1031 parse failures - message 20: tested 6656 modifications, 1546 parse failures + message 20: tested 4352 modifications, 1030 parse failures message 21: tested 3584 modifications, 771 parse failures message 22: tested 5632 modifications, 771 parse failures message 23: tested 3584 modifications, 770 parse failures -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 11:24:26 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 5 Jan 2019 11:24:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12058 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 05 Jan 2019 11:24:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 11:30:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 11:30:44 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Fine with me, just a few cosmetic issues. https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c at 441 PS2, Line 441: mi[] I know that an array in C is basically a pointer to its first element. So, both 'uint8_t mi[]' and 'uint8_t *mi' are equal. But in most cases we are using 'type *foo', while 'type arr[]' is more suitable for complex arrays, e.g. arrays of structs. In this case we are dealing with a buffer, so let's use 'uint8_t *mi'. https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c at 451 PS2, Line 451: default We usually put the 'default' statement below all 'case' statements. Why this 'switch' is doing vice-versa? Any advantages of that? -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 05 Jan 2019 11:30:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 11:44:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 11:44:55 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c at 1141 PS2, Line 1141: GSM48_LUPD_NORMAL BTW: what about GSM48_LUPD_RESERVED? https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c at 1144 PS2, Line 1144: {} cosmetic: in other 'value_string' statements of this file '{ 0, NULL }' is used. -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 05 Jan 2019 11:44:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 13:14:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 13:14:34 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12439 to look at the new patch set (#4). Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... layer23/sap_interface.c: define missing enums and use them Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 55 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/12439/4 -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 13:14:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 13:14:34 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: separate protocol definition In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12467 to look at the new patch set (#2). Change subject: layer23/sap_interface.c: separate protocol definition ...................................................................... layer23/sap_interface.c: separate protocol definition Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/sap_interface.h A src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/common/sap_interface.c A src/host/layer23/src/common/sap_proto.c 6 files changed, 205 insertions(+), 161 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/12467/2 -- To view, visit https://gerrit.osmocom.org/12467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 Gerrit-Change-Number: 12467 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 13:14:36 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 13:14:36 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: terminate value_string definitions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12472 Change subject: layer23/sap_interface.c: terminate value_string definitions ...................................................................... layer23/sap_interface.c: terminate value_string definitions Change-Id: I0776bc43360dfa2229243fb022cd318242ca6400 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/12472/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 6a85bf2..3faa949 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -60,6 +60,7 @@ { SAP_CARD_READER_STATUS, "CardReaderStatus" }, { SAP_STATUS_CHANGE, "StatusChange" }, { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, + { 0, NULL } }; /* Table 5.1: Message Overview */ @@ -85,6 +86,7 @@ { SAP_ERROR_RESP, "ERROR_RESP" }, { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, + { 0, NULL } }; /* Table 5.18: Possible values for ResultCode */ @@ -97,6 +99,7 @@ { 5, "Error, card already powered on" }, { 6, "Error, data not available" }, { 7, "Error, not supported "}, + { 0, NULL } }; /* Table 5.19: Possible values for StatusChange */ @@ -107,6 +110,7 @@ { 3, "Card removed" }, { 4, "Card inserted" }, { 5, "Card recovered" }, + { 0, NULL } }; /* Table 5.16: Possible values for ConnectionStatus */ @@ -116,6 +120,7 @@ { 2, "Error, Server does not support maximum message size" }, { 3, "Error, maximum message size by Client is too small" }, { 4, "OK, ongoing call" }, + { 0, NULL } }; static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) -- To view, visit https://gerrit.osmocom.org/12472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0776bc43360dfa2229243fb022cd318242ca6400 Gerrit-Change-Number: 12472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 13:46:59 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 13:46:59 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 11: (7 comments) https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 162 PS11, Line 162: if (sms != NULL) { /* gsm411_send_rp_data() doesn't set trans->sms.sms */ > put the "doesn't set" above the 'if', and the 'Notify... [?] Done https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1147 PS11, Line 1147: > hmm, I sort of expected a TLV structure, but there are no Ts... too late for that I guess. Please see GSM TS 04.11, Table 7.4/3GPP TS 04.11: RP-DATA message content. https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1148 PS11, Line 1148: /* Encode RP-DA length */ > OA? Sure, thanks! https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1154 PS11, Line 1154: memcpy(ptr, sm_rp_oa, sm_rp_oa_len); > Rather use msgb_lv_put()? Done https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1158 PS11, Line 1158: ptr[0] = 0x00; > msgb_put_u8()? msgb_v_put()? Done https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1166 PS11, Line 1166: memcpy(ptr, sm_rp_ud, sm_rp_ud_len); > msgb_lv_put()? Done https://gerrit.osmocom.org/#/c/11920/11/src/libmsc/gsm_04_11.c at 1170 PS11, Line 1170: return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, > API wise it would be better to have separate functions that encode and send. [?] I think we can split it later. At the moment I don't see any use cases for a separate encoding function... -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 05 Jan 2019 13:46:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 5 13:47:03 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 5 Jan 2019 13:47:03 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11920 to look at the new patch set (#12). Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: accept MT SMS messages over GSUP Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c 5 files changed, 164 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/11920/12 -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 6 21:53:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 Jan 2019 21:53:52 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c at 441 PS2, Line 441: mi[] > I know that an array in C is basically a pointer to its first [?] '*' is fine with me. Argument wise, to me any array would make more sense to be indicated by [], be it of uint8_t or complex structs. A pointer * would be more suitable for a pointer to a single element. At osmocom however we tend to only do * and never [], except for 'extern const struct value_string foo_names[];' I've had the same code review argument recently, I don't think it's worth arguing against foo[] if it is an array of any kind, but if you guys are so fixed on plain pointers, fine with me. https://gerrit.osmocom.org/#/c/12468/2/src/gsm/gsm48.c at 451 PS2, Line 451: default > We usually put the 'default' statement below all 'case' statements. [?] no reason nor preference on my side -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 06 Jan 2019 21:53:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 6 21:58:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 Jan 2019 21:58:13 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12468 to look at the new patch set (#3). Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... add osmo_mi_name(), for MI-to-string like "IMSI-123456" We have gsm48_mi_to_string() and osmo_bcd2str(), but still lack a function that conveniently prints both MI type and value in one function call. Related: http://people.osmocom.org/neels/mi_mi_mi.jpg Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 5 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12468/3 -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 6 21:58:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 Jan 2019 21:58:13 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12469 to look at the new patch set (#3). Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... add osmo_lu_type_names[], osmo_lu_type_name() Move lupd_names[] from osmo-msc to libosmo-gsm. Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/12469/3 -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 6 22:01:29 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 Jan 2019 22:01:29 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c at 1141 PS2, Line 1141: GSM48_LUPD_NORMAL > BTW: what about GSM48_LUPD_RESERVED? what do you mean? I am basically moving https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c at 1144 PS2, Line 1144: { > cosmetic: in other 'value_string' statements of this file '{ 0, NULL }' is used. yes, and there is no reason to name the elements if it's all to be default-initialized... verify_value_string_arrays_are_terminated.py in osmo-ci does accept both. There has been a lengthy discussion about {} vs {0} elsewhere, I don't think we agreed on anything. I'm a '{}' advocate. -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 06 Jan 2019 22:01:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 02:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 7 Jan 2019 02:01:35 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 02:01:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 02:02:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 7 Jan 2019 02:02:24 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 02:02:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 09:42:25 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 09:42:25 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: explain msg format columns In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12413 ) Change subject: chapters/gsup.adoc: explain msg format columns ...................................................................... chapters/gsup.adoc: explain msg format columns Explain the M, O, C and V, TLV letters in the presence and format columns. Change-Id: Idf8614d4d0f462174426fd3afdb34bedfb859951 --- M common/chapters/gsup.adoc 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index c48209d..7773d09 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -219,6 +219,10 @@ receiver shall be able to received them in any order. Unknown IE shall be ignored. +Besides a numeric range, the 'presence' column may have 'M' (Mandatory), 'O' +(Optional) or 'C' (Conditional). The 'format' column holds either 'V' (Value) +or 'TLV' (Tag Length Value). + ==== Send Authentication Info Request Direction: SGSN / VLR => HLR -- To view, visit https://gerrit.osmocom.org/12413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idf8614d4d0f462174426fd3afdb34bedfb859951 Gerrit-Change-Number: 12413 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 09:42:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 09:42:53 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document CHECK-IMEI In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12414 ) Change subject: chapters/gsup.adoc: document CHECK-IMEI ...................................................................... chapters/gsup.adoc: document CHECK-IMEI Related Change-Id: (core) I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Related: OS#3733 Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 --- M common/chapters/gsup.adoc 1 file changed, 79 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 7773d09..673ed59 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -200,6 +200,25 @@ } ---- +==== Check IMEI + +The VLR asks the EIR to check if a new ME's IMEI is acceptable or not. The EIR +may implement a blacklist or whitelist and reject the IMEI based on that. +Against the original purpose of the Check IMEI Procedure, this could also be +used to save the IMEI in the HLR DB. + +.Check IMEI (Normal Case) +["mscgen"] +---- +msc { + hscale="1.5"; + VLR [label="VLR"], EIR [label="EIR (via HLR)"]; + + VLR => EIR [label="CHECK IMEI REQUEST (IMEI)"]; + EIR => VLR [label="CHECK IMEI RESULT (ACK)"]; +} +---- + === Message Format ==== General @@ -667,6 +686,42 @@ MO SMMA (Memory Available) indication. The corresponding MAP service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. +==== CHECK-IMEI Request + +Direction: VLR => EIR (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|50|IMEI|<>|M|TLV|11 +|=== + +==== CHECK-IMEI Error + +Direction: EIR (via HLR) => VLR + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|02|Cause|<>|M|TLV|3 +|=== + +==== CHECK-IMEI Result + +Direction: EIR (via HLR) => VLR + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|51|IMEI Check Result|<>|M|TLV|3 +|=== + === Information Elements [[gsup-ie-msgtype]] @@ -706,6 +761,9 @@ |0x2c|READY-FOR-SM Request |0x2d|READY-FOR-SM Error |0x2e|READY-FOR-SM Result +|0x30|CHECK-IMEI Request +|0x31|CHECK-IMEI Error +|0x32|CHECK-IMEI Result |=== [[gsup-ie-ipaddr]] @@ -939,6 +997,8 @@ |0x44|SM-RP-Cause (RP Cause value)|<> |0x45|SM-RP-MMS (More Messages to Send)|<> |0x46|SM Alert Reason|<> +|0x50|IMEI|<> +|0x51|IMEI Check Result|<> |=== [[gsup-ie-empty]] @@ -1242,3 +1302,22 @@ |0x01|MS present |0x02|Memory Available |=== + +[[gsup-ie-imei]] +==== IMEI + +The IMEI encoded as Called Party BCD Number in 3GPP TS 04.08. + +[[gsup-ie-imei-result]] +==== IMEI Check Result + +Result of the Check IMEI request. A NACK could be sent in theory, if the ME is +not permitted on the network (e.g. because it is on a blacklist). + +.IMEI Check Result +[options="header",cols="10%,90%"] +|=== +|Type|Description +|0x01|ACK +|0x02|NACK +|=== -- To view, visit https://gerrit.osmocom.org/12414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 Gerrit-Change-Number: 12414 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 09:43:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 09:43:37 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12411 ) Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Reply to CHECK-IMEI GSUP messages Decode the IMEI from incoming CHECK-IMEI messages, print the IMEI to the log and always send ACK back to the VLR/MSC. In the future, we will not only log the IMEI, but store it in the HLR (OS#2541). This is not the original intention of CHECK-IMEI from the 3GPP spec, but an useful side effect. Depends: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 (libosmocore) Related: OS#3733 Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 --- M src/hlr.c 1 file changed, 36 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr.c b/src/hlr.c index 4873a66..ce5618a 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "db.h" #include "hlr.h" @@ -399,6 +400,38 @@ return osmo_gsup_conn_send(conn, msg_out); } +static int rx_check_imei_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup) +{ + struct osmo_gsup_message gsup_reply = {0}; + struct msgb *msg_out; + char imei[GSM23003_IMEI_NUM_DIGITS+1] = {0}; + + /* Encoded IMEI length check */ + if (!gsup->imei_enc || gsup->imei_enc_len < 1 || gsup->imei_enc[0] >= sizeof(imei)) { + LOGP(DMAIN, LOGL_ERROR, "%s: wrong encoded IMEI length\n", gsup->imsi); + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + + /* Decode IMEI */ + if (gsm48_decode_bcd_number(imei, sizeof(imei), gsup->imei_enc, 0) < 0) { + LOGP(DMAIN, LOGL_ERROR, "%s: failed to decode IMEI\n", gsup->imsi); + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + + /* Only print the IMEI for now, it's planned to store it here (OS#2541) */ + LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s\n", gsup->imsi, imei); + + /* Accept all IMEIs */ + gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK; + gsup_reply.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT; + msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response"); + memcpy(gsup_reply.imsi, gsup->imsi, sizeof(gsup_reply.imsi)); + osmo_gsup_encode(msg_out, &gsup_reply); + return osmo_gsup_conn_send(conn, msg_out); +} + static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg) { static struct osmo_gsup_message gsup; @@ -459,6 +492,9 @@ lu_op_rx_gsup(luop, &gsup); } break; + case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: + rx_check_imei_req(conn, &gsup); + break; default: LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n", osmo_gsup_message_type_name(gsup.message_type)); -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 10:36:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 10:36:13 +0000 Subject: Change in docker-playground[master]: regen_docs: Add a script that extracts counter and vty info In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10273 ) Change subject: regen_docs: Add a script that extracts counter and vty info ...................................................................... Patch Set 1: Code-Review-2 Max asked me to review this patch, and indeed it won't work anymore since the manuals have been moved to the project repositories. I think the best way forward would be calling the osmo-* binaries during the build process of the manuals, so we don't need to store a manually maintained list of counters or vty info anywhere. Neels suggested this here: https://osmocom.org/issues/3695 -- To view, visit https://gerrit.osmocom.org/10273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e57a64caccfbc982199f8f25bbb14c2d96e11a6 Gerrit-Change-Number: 10273 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 07 Jan 2019 10:36:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 12:01:20 2019 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 Jan 2019 12:01:20 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h File include/osmocom/gsm/gsm48_arfcn_range_encode.h: https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h at 22 PS8, Line 22: int osmo_gsm48_range_enc_range128(uint8_t *chan_list, int f0, int *w); > I think single "range" in function name is enough - it's already pretty long. Fixed in next patch set. https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c at 54 PS8, Line 54: */ > Can we use this as static function? In OsmoBSC it's called only once from _range_enc_arfcns() No this function cannot be static because it is also being called from gsm0408_test.c, which can only link to exported symbols. https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c at 302 PS8, Line 302: { > This helper is used only in range_encode() in OsmoBSC which is static in this patch. [?] This is being called by test code as well. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 07 Jan 2019 12:01:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 12:01:58 2019 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 Jan 2019 12:01:58 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#9). Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 760 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/9 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 12:17:39 2019 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 Jan 2019 12:17:39 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h File include/osmocom/gprs/protocol/gsm_04_60.h: https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h at 338 PS6, Line 338: uint8_t use_egprs_p_ch_req; > Extra tabs looks off. Indeed, thanks. Fixed in next patch set. https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c File src/gsm/gsm48_rest_octets.c: https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c at 64 PS6, Line 64: #define SI2Q_MIN_LEN 18 > Those are used in 3 different files in OsmoBSC - any reason for not making this part of public heade [?] Sure, I will move these to the public header in the next patch set. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 07 Jan 2019 12:17:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 12:18:44 2019 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 Jan 2019 12:18:44 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10189 to look at the new patch set (#7). Change subject: port rest octets encoding code from osmo-bsc ...................................................................... port rest octets encoding code from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports osmo-bsc code for encoding SI rest octets. The conversion was a bit tricky in some places because some functions receive a 'struct gsm_bts' parameter in osmo-bsc. In this libosmocore version, such functions expect parameters which correspond to the individual fields of 'struct gsm_bts' which are used by these functions. Several structs from osmo-bsc's system_information.h are now also declared in libosmocore headers, with an added osmo_ prefix to avoid collisions with existing definitions in osmo-bsc. Some helpers were ported from osmo-bsc's system_information.c to libosmocore's gsm48_rest_octets.c. Contrary to osmo-bsc's implementation they are now only visible within this file. Unfortunately, this code ported from osmo-bsc lacks unit tests. Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Related: OS#3075 --- M include/Makefile.am M include/osmocom/gprs/protocol/gsm_04_60.h A include/osmocom/gsm/gsm48_rest_octets.h A src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 5 files changed, 1,084 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10189/7 -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 14:40:11 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 7 Jan 2019 14:40:11 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12416 to look at the new patch set (#2). Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Fully internal generation of reference data that doesn't depend on glibc or even on any floating point math - Golden results are included in a .h Due to varying precision of different implementation or architecture, any kind of textual compare is impossible, so we include golden values and compare results of both the 'base' implementation the potentially 'optimized' one again this set of values with a small error tolerance Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok A tests/Transceiver52M/convolve_test_golden.h 3 files changed, 918 insertions(+), 167 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/12416/2 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:00:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:00:02 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 2: Code-Review+2 I think the _golden.h needs to be added to the list of files distributed (Makefile.am). Otherwise fine. -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:00:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:00:27 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 7 Jan 2019 15:00:27 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12416 to look at the new patch set (#3). Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Fully internal generation of reference data that doesn't depend on glibc or even on any floating point math - Golden results are included in a .h Due to varying precision of different implementation or architecture, any kind of textual compare is impossible, so we include golden values and compare results of both the 'base' implementation the potentially 'optimized' one again this set of values with a small error tolerance Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok A tests/Transceiver52M/convolve_test_golden.h 3 files changed, 918 insertions(+), 167 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/12416/3 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 3 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:05:35 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 15:05:35 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update shared helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12473 Change subject: ctrl2cgi: update shared helper ...................................................................... ctrl2cgi: update shared helper * split hash generation into simpler functions * move them into helper file * split log init into separate function This facilitates code sharing with new version of ctrl2cgi proxy in folow-up patches. Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Related: SYS#4399 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py 2 files changed, 32 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/73/12473/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 3e80c6d..d942cd2 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -22,7 +22,7 @@ */ """ -import sys, os, datetime, signal, logging, logging.handlers +import hashlib, sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.osmo_ipa import Ctrl @@ -95,16 +95,39 @@ sys.argv.remove(dbg2) os.execl(path, script, *sys.argv[1:]) +def add_keys(inp, params, l): + """ + Add given list of keys to input string. + """ + for key in l: + inp += str(params.get(key)) + return inp + +def gen_hash(params, skey): + """ + Make mandatory parameter for HTTP request. + """ + inp = add_keys('', params, ['time_stamp', 'position_validity', 'admin_status', 'policy_status']) + inp += skey + inp = add_keys(inp, params, ['bsc_id', 'lat', 'lon', 'position_validity']) + m = hashlib.md5() + m.update(inp.encode('utf-8')) + return m.hexdigest() + +def log_init(name, is_debug): + """ + Initialize stdout logging. + """ + log = logging.getLogger(name) + log.setLevel(logging.DEBUG if is_debug else logging.INFO) + log.addHandler(logging.StreamHandler(sys.stdout)) + return log + def debug_init(name, is_debug): """ Initialize signal handlers and logging """ - log = logging.getLogger(name) - if is_debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.StreamHandler(sys.stdout)) + log = log_init(name, is_debug) reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() signal.signal(signal.SIGHUP, reboot) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index bb5c93e..95ff788 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.1.0" # bump this on every non-trivial change +__version__ = "0.1.1" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -32,7 +32,7 @@ from distutils.version import StrictVersion as V from twisted.internet import defer, reactor from treq import post, collect -from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, gen_hash, make_params, comm_proc from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl @@ -57,21 +57,6 @@ log_duration(log, bid, ts, ts_http) comm_proc(decoded.get('commands'), bid, f, log) -def gen_hash(params, skey): - """ - Make mandatory parameter for http request - """ - inp = '' - for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: - inp += str(params.get(key)) - inp += skey - for key in ['bsc_id', 'lat', 'lon', 'position_validity']: - inp += str(params.get(key)) - m = hashlib.md5() - m.update(inp.encode('utf-8')) - res = m.hexdigest() - return res - def make_async_req(ts, dst, par, f_write, f_log, tout): """ Assemble deferred request parameters and partially instantiate response handler -- To view, visit https://gerrit.osmocom.org/12473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Gerrit-Change-Number: 12473 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:05:35 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 15:05:35 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update default parameters in config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12474 Change subject: ctrl2cgi: update default parameters in config ...................................................................... ctrl2cgi: update default parameters in config Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191 --- M doc/examples/ctrl2cgi.ini 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/74/12474/1 diff --git a/doc/examples/ctrl2cgi.ini b/doc/examples/ctrl2cgi.ini index e1feebc..058944b 100644 --- a/doc/examples/ctrl2cgi.ini +++ b/doc/examples/ctrl2cgi.ini @@ -3,3 +3,5 @@ location = http://172.16.1.13:8080/dummy_position_handler.cgi secret_key = MegaSecretl000000l num_max_conn = 4 +timeout = 4 +port_ctrl = 4249 -- To view, visit https://gerrit.osmocom.org/12474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191 Gerrit-Change-Number: 12474 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:05:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 15:05:36 +0000 Subject: Change in python/osmo-python-tests[master]: Mark soap.py as deprecated Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12475 Change subject: Mark soap.py as deprecated ...................................................................... Mark soap.py as deprecated It might be removed in one of the future releases as we move away from Twisted. Let's mark it as deprecated to make sure it won't be a surprise. Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6 --- M README 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/75/12475/1 diff --git a/README b/README index 76defb6..e90e214 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ Use There are currently following scripts in this package: osmotestconfig.py - test that apps start/write with example configs -soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted +soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted osmo_rate_ctr2csv.py - rate counter dumper on top of osmo_ipa osmo_interact_vty.py - pipe stdin/stdout to a VTY session -- To view, visit https://gerrit.osmocom.org/12475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6 Gerrit-Change-Number: 12475 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:05:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 15:05:36 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12476 Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Add initial version of asyncio trap2cgi script It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399 --- M README A contrib/systemd/osmo-trap2cgi.service A scripts/osmo_trap2cgi.py M setup.py 4 files changed, 242 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/76/12476/1 diff --git a/README b/README index e90e214..69eb764 100644 --- a/README +++ b/README @@ -9,7 +9,8 @@ There are currently following scripts in this package: osmotestconfig.py - test that apps start/write with example configs soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) -ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted +ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) +osmo_trap2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of asyncio and aiohttp osmo_rate_ctr2csv.py - rate counter dumper on top of osmo_ipa osmo_interact_vty.py - pipe stdin/stdout to a VTY session osmo_interact_ctrl.py - pipe stdin/stdout to a CTRL port diff --git a/contrib/systemd/osmo-trap2cgi.service b/contrib/systemd/osmo-trap2cgi.service new file mode 100644 index 0000000..a53dca1 --- /dev/null +++ b/contrib/systemd/osmo-trap2cgi.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy between given GCI service and Osmocom CTRL protocol + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo_trap2cgi.py -d -c /etc/osmocom/ctrl2cgi.ini +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/scripts/osmo_trap2cgi.py b/scripts/osmo_trap2cgi.py new file mode 100755 index 0000000..3bf9fd4 --- /dev/null +++ b/scripts/osmo_trap2cgi.py @@ -0,0 +1,228 @@ +#!/usr/bin/python3 +# -*- mode: python-mode; py-indent-tabs-mode: nil -*- +""" +/* + * Copyright (C) 2019 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 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +""" + +__version__ = "0.0.1" # bump this on every non-trivial change + +from functools import partial +import configparser, argparse, time, os, asyncio, aiohttp +from osmopy.trap_helper import make_params, gen_hash, log_init, comm_proc +from osmopy.osmo_ipa import Ctrl + + +def log_bsc_time(l, rq, task, ts, bsc, msg, *args, **kwargs): + """ + Logging contextual wrapper. + FIXME: remove task parameter once we bump requirements to Python 3.7+ + """ + # FIXME: following function is deprecated and will be removed in Python 3.9 + # Use the asyncio.all_tasks() function instead when available (Python 3.7+). + num_tasks = len(task.all_tasks()) + num_req = len(rq) + delta = time.perf_counter() - ts + if delta < 1: + l('[%d/%d] BSC %s: ' + msg, num_req, num_tasks, bsc, *args, **kwargs) + else: + l('[%d/%d] BSC %s, %.2f sec: ' + msg, num_req, num_tasks, bsc, time.perf_counter() - ts, *args, **kwargs) + +def check_h_val(ctrl, h, v, t, exp): + """ + Check for header inconsistencies. + """ + if v != exp: + ctrl.log.error('Unexpected %s value %x (instead of %x) in |%s| header', t, v, exp, h.hex()) + +def get_ctrl_len(ctrl, header): + """ + Obtain expected message length. + """ + (dlen, p, e, _) = ctrl.del_header(header) + check_h_val(ctrl, header, p, "protocol", ctrl.PROTO['OSMO']) + check_h_val(ctrl, header, e, "extension", ctrl.EXT['CTRL']) + return dlen - 1 + + +class Proxy(Ctrl): + """ + Wrapper class to implement per-type message dispatch and keep BSC <-> http Task mapping. + N. B: keep async/await semantics out of it. + """ + def __init__(self, log): + super().__init__() + self.req = {} + self.log = log + self.conf = configparser.ConfigParser(interpolation = None) + self.conf.read(self.config_file) + self.timeout = self.conf['main'].getint('timeout', 30) + self.location = self.conf['main'].get('location') + self.ctrl_addr = self.conf['main'].get('addr_ctrl', 'localhost') + self.ctrl_port = self.conf['main'].getint('port_ctrl', 4250) + self.concurrency = self.conf['main'].getint('num_max_conn', 5) + # FIXME: use timeout parameter when available (aiohttp version 3.3) as follows + #self.http_client = aiohttp.ClientSession(connector = aiohttp.TCPConnector(limit = self.concurrency), timeout = self.timeout) + self.http_client = aiohttp.ClientSession(connector = aiohttp.TCPConnector(limit = self.concurrency)) + + def dispatch(self, w, data): + """ + Basic dispatcher: the expected entry point for CTRL messages. + """ + (cmd, _, v) = data.decode('utf-8').split(' ', 2) + method = getattr(self, cmd, lambda *_: self.log.info('CTRL %s is unhandled by dispatch: ignored.', cmd)) + method(w, v.split()) + + def ERROR(self, _, k): + """ + Handle CTRL ERROR messages. + """ + self.log_ignore('ERROR', k) + + def SET_REPLY(self, _, k): + """ + Handle CTRL SET_REPLY messages. + """ + self.log_ignore('SET_REPLY', k) + + def TRAP(self, w, k): + """ + Handle incoming TRAPs. + """ + p = k[0].split('.') + if p[-1] == 'location-state': + self.handle_locationstate(w, p[1], p[3], p[5], k[1]) + else: + self.log_ignore('TRAP', k[0]) + + def handle_locationstate(self, w, net, bsc, bts, data): + """ + Handle location-state TRAP: parse trap content, build HTTP request and setup async handlers. + """ + ts = time.perf_counter() + self.cleanup_task(bsc) + params = make_params(bsc, data) + params['h'] = gen_hash(params, self.conf['main'].get('secret_key')) + t = asyncio.ensure_future(self.http_client.post(self.location, data = params)) + log_bsc_time(self.log.info, self.req, t, ts, bsc, 'location-state@%s => %s', params['time_stamp'], data) + t.add_done_callback(partial(self.reply_callback, w, bsc, ts)) + self.req[bsc] = (t, ts) + log_bsc_time(self.log.info, self.req, t, ts, bsc, 'request added (net %s, BTS %s)', net, bts) + + def cleanup_task(self, bsc): + """ + It's ok to cancel() task which is done() + but if either of the checks above fires it means that Proxy() is in inconsistent state + which should never happen as long as we keep async/await semantics out of it. + """ + if bsc in self.req: + (task, ts) = self.req[bsc] + if task.done(): + log_bsc_time(self.log.error, self.req, task, ts, bsc, 'task is done but not removed') + if task.cancelled(): + log_bsc_time(self.log.error, self.req, task, ts, bsc, 'task is cancelled without update') + task.cancel() + + def log_ignore(self, kind, m): + """ + Log ignored CTRL message. + """ + self.log.error('Ignoring CTRL %s: %s', kind, ' '.join(m) if type(m) is list else m) + + def reply_callback(self, w, bsc, ts, task): + """ + Process per-BSC response status and prepare async handler if necessary. + We don't have to delete cancel()ed task from self.req explicitly because it will be replaced by new one in handle_locationstate() + """ + if task.cancelled(): + log_bsc_time(self.log.info, self.req, task, ts, bsc, 'request cancelled') + else: + exp = task.exception() + if exp: + log_bsc_time(self.log.info, self.req, task, ts, bsc, 'exception %s triggered', repr(exp)) + else: + resp = task.result() + if resp.status != 200: + log_bsc_time(self.log.info, self.req, task, ts, bsc, 'unexpected HTTP response %d', resp.status) + else: + log_bsc_time(self.log.info, self.req, task, ts, bsc, 'request completed') + asyncio.ensure_future(recv_response(self.log, w, bsc, resp.json())) + del self.req[bsc] + + +async def recv_response(log, w, bsc, resp): + """ + Process json response asynchronously. + """ + js = await resp + if js.get('error'): + log.info('BSC %s response error: %s', bsc, repr(js.get('error'))) + else: + comm_proc(js.get('commands'), bsc, w.write, log) + await w.drain() # Trigger Writer's flow control + +async def recon_reader(proxy, reader, num_bytes): + """ + Read requested amount of bytes, reconnect if necessary. + """ + try: + return await reader.readexactly(num_bytes) + except asyncio.IncompleteReadError: + proxy.log.info('Failed to read %d bytes reconnecting to %s:%d...', num_bytes, proxy.ctrl_addr, proxy.ctrl_port) + await conn_client(proxy) + +async def ctrl_client(proxy, rd, wr): + """ + Recursively read CTRL stream and handle selected messages. + """ + header = await recon_reader(proxy, rd, 4) + data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header)) + proxy.dispatch(wr, data) + await ctrl_client(proxy, rd, wr) + +async def conn_client(proxy): + """ + (Re)establish connection with CTRL server and pass Reader/Writer to CTRL handler. + """ + try: + reader, writer = await asyncio.open_connection(proxy.ctrl_addr, proxy.ctrl_port) + proxy.log.info('Connected to %s:%d', proxy.ctrl_addr, proxy.ctrl_port) + await ctrl_client(proxy, reader, writer) + except OSError as e: + proxy.log.info('%s: %d seconds delayed retrying...', e, proxy.timeout) + await asyncio.sleep(proxy.timeout) + await conn_client(proxy) + + +if __name__ == '__main__': + a = argparse.ArgumentParser(description = 'Proxy between given GCI service and Osmocom CTRL protocol.') + a.add_argument('-v', '--version', action = 'version', version = ("%(prog)s v" + __version__)) + a.add_argument('-d', '--debug', action = 'store_true', help = "Enable debug log") # keep in sync with debug_init call below + a.add_argument('-c', '--config-file', required = True, help = "Path to mandatory config file (in INI format).") + + P = Proxy(log_init('TRAP2CGI', a.parse_args(namespace=Proxy).debug)) + + P.log.info('CGI proxy v%s starting with PID %d:', __version__, os.getpid()) + P.log.info('Destination %s (concurrency %d)', P.location, P.concurrency) + P.log.info('Connecting to TRAP source %s:%d...', P.ctrl_addr, P.ctrl_port) + + loop = asyncio.get_event_loop() + loop.run_until_complete(conn_client(P)) + # FIXME: use loop.run() function instead when available (Python 3.7+). diff --git a/setup.py b/setup.py index 061e5df..69e18b0 100755 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ "scripts/osmo_rate_ctr2csv.py", "scripts/soap.py", "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", "scripts/osmo_interact_vty.py", "scripts/osmo_interact_ctrl.py", "scripts/osmo_verify_transcript_vty.py", -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:06:45 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 7 Jan 2019 15:06:45 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12416 to look at the new patch set (#4). Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Fully internal generation of reference data that doesn't depend on glibc or even on any floating point math - Golden results are included in a .h Due to varying precision of different implementation or architecture, any kind of textual compare is impossible, so we include golden values and compare results of both the 'base' implementation the potentially 'optimized' one again this set of values with a small error tolerance Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/Makefile.am M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok A tests/Transceiver52M/convolve_test_golden.h 4 files changed, 919 insertions(+), 168 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/12416/4 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:09:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:09:12 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 07 Jan 2019 15:09:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:09:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:09:53 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 07 Jan 2019 15:09:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:10:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:10:09 +0000 Subject: Change in python/osmo-python-tests[master]: Mark soap.py as deprecated In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12475 ) Change subject: Mark soap.py as deprecated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6 Gerrit-Change-Number: 12475 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:10:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:10:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:10:35 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update shared helper In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12473 ) Change subject: ctrl2cgi: update shared helper ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Gerrit-Change-Number: 12473 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:10:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:10:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:10:40 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update default parameters in config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12474 ) Change subject: ctrl2cgi: update default parameters in config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191 Gerrit-Change-Number: 12474 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:10:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:11:08 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:11:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:12:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 07 Jan 2019 15:12:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:14:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:14:46 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12469/2/src/gsm/gsm48.c at 1144 PS2, Line 1144: {} > yes, and there is no reason to name the elements if it's all to be default-initialized... [?] I don't think we have any value_string arrays that are terminated this way. I would really argue in favor of consistency than whatever other arguments. -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 07 Jan 2019 15:14:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:14:50 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 15:14:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:15:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:15:25 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 15:15:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:16:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:16:32 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:16:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:20:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:20:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12058 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:20:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:21:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:21:12 +0000 Subject: Change in osmo-bsc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12358 ) Change subject: use mgcp-client configured endpoint domain name ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 Gerrit-Change-Number: 12358 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:21:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:21:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:21:28 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12361 ) Change subject: use mgcp-client configured endpoint domain name ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 15:21:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:24:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:24:02 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 1: Code-Review+1 Doesn't every RAN connection have a fsm instance? why not simply log through that FSM and use that FSMs log level / subsystem? -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:24:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:24:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:24:32 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12471 ) Change subject: rx CM Service Req: reject double use sooner ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:24:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:30:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:30:46 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc.c: drop non-sensible error message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12456 ) Change subject: gsm_04_08_cc.c: drop non-sensible error message ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe Gerrit-Change-Number: 12456 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 15:30:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:31:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:31:16 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:31:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:35:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:35:14 +0000 Subject: Change in osmo-bsc[master]: fix call-during-call: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix call-during-call: switch off re-using lchan during assignment ...................................................................... Patch Set 2: I'm not really buying the argument about a "rare" case. Loaded netwokrs are a very common case, and in such situations we do hand out TCH/F even for singalling requests... -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 07 Jan 2019 15:35:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:37:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:37:12 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: fix: properly call sap_msg_free() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12437 ) Change subject: layer23/sap_interface.c: fix: properly call sap_msg_free() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:37:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:37:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:37:31 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: terminate value_string definitions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12472 ) Change subject: layer23/sap_interface.c: terminate value_string definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0776bc43360dfa2229243fb022cd318242ca6400 Gerrit-Change-Number: 12472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:37:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:37:48 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:37:48 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12439 ) Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:37:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:05 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: avoid using 'osmo' prefix In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12465 ) Change subject: layer23/sap_interface.c: avoid using 'osmo' prefix ...................................................................... Patch Set 2: Code-Review+2 just sap_ as a prefix is also an equally bad naming, as a service access point (SAP) is used at any boundary between two layers of ITU telecom protocols. But well, the BT people have apparently never read any of them when naming something "SIM Access Profile". -- To view, visit https://gerrit.osmocom.org/12465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 Gerrit-Change-Number: 12465 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:39:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:11 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:11 +0000 Subject: Change in osmocom-bb[master]: layer23/include/Makefile.am: add missing header In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12466 ) Change subject: layer23/include/Makefile.am: add missing header ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a379718eeb7db63696cabd5689e0625fb85d85e Gerrit-Change-Number: 12466 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:39:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:45 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: separate protocol definition In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12467 ) Change subject: layer23/sap_interface.c: separate protocol definition ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 Gerrit-Change-Number: 12467 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 07 Jan 2019 15:39:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:52 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: fix: properly call sap_msg_free() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12437 ) Change subject: layer23/sap_interface.c: fix: properly call sap_msg_free() ...................................................................... layer23/sap_interface.c: fix: properly call sap_msg_free() Passing NULL to sap_msg_free() is not only meaningless, but also would result in NULL pointer dereference. We should call it in successful case only, so let's fix this. Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index dd7737a..b39a57f 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -296,15 +296,15 @@ static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) { - struct sap_msg *msg = NULL; + struct sap_msg *msg; if(len > ms->sap_entity.max_msg_size){ LOGP(DSAP, LOGL_ERROR, "Read more data than allowed by max_msg_size, ignoring.\n"); return; } msg = sap_parse_msg(data); - if(!msg){ - sap_msg_free(msg); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); return; } @@ -335,7 +335,7 @@ case SAP_TRANSFER_ATR_RESP: if(ms->sap_entity.sap_state != SAP_PROCESSING_ATR_REQUEST){ LOGP(DSAP, LOGL_ERROR, "got ATR resp in state: %u\n", ms->sap_entity.sap_state); - return; + break; } if(msg->num_params >= 2){ LOGP(DSAP, LOGL_INFO, "ATR: %s\n", osmo_hexdump(msg->params[1].value, msg->params[1].len)); @@ -345,11 +345,11 @@ case SAP_TRANSFER_APDU_RESP: if(ms->sap_entity.sap_state != SAP_PROCESSING_APDU_REQUEST){ LOGP(DSAP, LOGL_ERROR, "got APDU resp in state: %u\n", ms->sap_entity.sap_state); - return; + break; } if(msg->num_params != 2){ LOGP(DSAP, LOGL_ERROR, "wrong number of parameters %u in APDU response\n", msg->num_params); - return; + break; } ms->sap_entity.sap_state = SAP_IDLE; if(sap_parse_result(&msg->params[0]) == 0){ @@ -369,6 +369,8 @@ LOGP(DSAP, LOGL_ERROR, "got unknown or not implemented SAP msgid: %u\n", msg->id); break; } + + sap_msg_free(msg); } static int sap_read(struct osmo_fd *fd) -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:52 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: prettify value_string definitions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12438 ) Change subject: layer23/sap_interface.c: prettify value_string definitions ...................................................................... layer23/sap_interface.c: prettify value_string definitions Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 58 insertions(+), 54 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e78320e..b8a3420 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -17,7 +17,7 @@ SAP_PROCESSING_APDU_REQUEST }; -/* BTSAP 1.13 */ +/* Table 5.1: Message Overview */ enum osmosap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, @@ -42,7 +42,7 @@ SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 }; -/* BTSAP 5.2 */ +/* Table 5.15: List of Parameter IDs */ enum osmosap_param_type { SAP_MAX_MSG_SIZE = 0x00, SAP_CONNECTION_STATUS = 0x01, diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index b39a57f..6a85bf2 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -47,71 +47,75 @@ static void sap_connect(struct osmocom_ms *ms); +/* Table 5.15: List of Parameter IDs */ static const struct value_string sap_param_names[] = { - {SAP_MAX_MSG_SIZE, "MaxMsgSize"}, - {SAP_CONNECTION_STATUS, "ConnectionStatus"}, - {SAP_RESULT_CODE, "ResultCode"}, - {SAP_DISCONNECTION_TYPE, "DisconnectionType"}, - {SAP_COMMAND_APDU, "CommandAPDU"}, - {SAP_COMMAND_APDU_7816, "CommandAPDU7816"}, - {SAP_RESPONSE_APDU, "ResponseAPDU"}, - {SAP_ATR, "ATR"}, - {SAP_CARD_READER_STATUS, "CardReaderStatus"}, - {SAP_STATUS_CHANGE, "StatusChange"}, - {SAP_TRANSPORT_PROTOCOL, "TransportProtocol"} + { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, + { SAP_CONNECTION_STATUS, "ConnectionStatus" }, + { SAP_RESULT_CODE, "ResultCode" }, + { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, + { SAP_COMMAND_APDU, "CommandAPDU" }, + { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, + { SAP_RESPONSE_APDU, "ResponseAPDU" }, + { SAP_ATR, "ATR" }, + { SAP_CARD_READER_STATUS, "CardReaderStatus" }, + { SAP_STATUS_CHANGE, "StatusChange" }, + { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, }; +/* Table 5.1: Message Overview */ static const struct value_string sap_msg_names[] = { - {SAP_CONNECT_REQ, "CONNECT_REQ"}, - {SAP_CONNECT_RESP, "CONNECT_RESP"}, - {SAP_DISCONNECT_REQ, "DISCONNECT_REQ"}, - {SAP_DISCONNECT_RESP, "DISCONNECT_RESP"}, - {SAP_DISCONNECT_IND, "DISCONNECT_IND"}, - {SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ"}, - {SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP"}, - {SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ"}, - {SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP"}, - {SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ"}, - {SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP"}, - {SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ"}, - {SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP"}, - {SAP_RESET_SIM_REQ, "RESET_SIM_REQ"}, - {SAP_RESET_SIM_RESP, "RESET_SIM_RESP"}, - {SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ"}, - {SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP"}, - {SAP_STATUS_IND, "STATUS_IND"}, - {SAP_ERROR_RESP, "ERROR_RESP"}, - {SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ"}, - {SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP"} + { SAP_CONNECT_REQ, "CONNECT_REQ" }, + { SAP_CONNECT_RESP, "CONNECT_RESP" }, + { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, + { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, + { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, + { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, + { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, + { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, + { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, + { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, + { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, + { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, + { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, + { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, + { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, + { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, + { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, + { SAP_STATUS_IND, "STATUS_IND" }, + { SAP_ERROR_RESP, "ERROR_RESP" }, + { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, + { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, }; -/* BTSAP table 5.18 */ +/* Table 5.18: Possible values for ResultCode */ static const struct value_string sap_result_names[] = { - {0, "OK, request processed correctly"}, - {1, "Error, no reason defined"}, - {2, "Error, card not accessible"}, - {3, "Error, card (already) powered off"}, - {4, "Error, card removed"}, - {5, "Error, card already powered on"}, - {6, "Error, data not available"}, - {7, "Error, not supported"} + { 0, "OK, request processed correctly" }, + { 1, "Error, no reason defined" }, + { 2, "Error, card not accessible" }, + { 3, "Error, card (already) powered off" }, + { 4, "Error, card removed" }, + { 5, "Error, card already powered on" }, + { 6, "Error, data not available" }, + { 7, "Error, not supported "}, }; +/* Table 5.19: Possible values for StatusChange */ static const struct value_string sap_status_change_names[] = { - {0, "Unknown Error"}, - {1, "Card reset"}, - {2, "Card not accessible"}, - {3, "Card removed"}, - {4, "Card inserted"}, - {5, "Card recovered"}, + { 0, "Unknown Error" }, + { 1, "Card reset" }, + { 2, "Card not accessible" }, + { 3, "Card removed" }, + { 4, "Card inserted" }, + { 5, "Card recovered" }, }; +/* Table 5.16: Possible values for ConnectionStatus */ static const struct value_string sap_status_names[] = { - {0, "OK, Server can fulfill requirements"}, - {1, "Error, Server unable to establish connection"}, - {2, "Error, Server does not support maximum message size"}, - {3, "Error, maximum message size by Client is too small"}, - {4, "OK, ongoing call"} + { 0, "OK, Server can fulfill requirements" }, + { 1, "Error, Server unable to establish connection" }, + { 2, "Error, Server does not support maximum message size" }, + { 3, "Error, maximum message size by Client is too small" }, + { 4, "OK, ongoing call" }, }; static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) -- To view, visit https://gerrit.osmocom.org/12438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 Gerrit-Change-Number: 12438 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:53 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: terminate value_string definitions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12472 ) Change subject: layer23/sap_interface.c: terminate value_string definitions ...................................................................... layer23/sap_interface.c: terminate value_string definitions Change-Id: I0776bc43360dfa2229243fb022cd318242ca6400 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 6a85bf2..3faa949 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -60,6 +60,7 @@ { SAP_CARD_READER_STATUS, "CardReaderStatus" }, { SAP_STATUS_CHANGE, "StatusChange" }, { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, + { 0, NULL } }; /* Table 5.1: Message Overview */ @@ -85,6 +86,7 @@ { SAP_ERROR_RESP, "ERROR_RESP" }, { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, + { 0, NULL } }; /* Table 5.18: Possible values for ResultCode */ @@ -97,6 +99,7 @@ { 5, "Error, card already powered on" }, { 6, "Error, data not available" }, { 7, "Error, not supported "}, + { 0, NULL } }; /* Table 5.19: Possible values for StatusChange */ @@ -107,6 +110,7 @@ { 3, "Card removed" }, { 4, "Card inserted" }, { 5, "Card recovered" }, + { 0, NULL } }; /* Table 5.16: Possible values for ConnectionStatus */ @@ -116,6 +120,7 @@ { 2, "Error, Server does not support maximum message size" }, { 3, "Error, maximum message size by Client is too small" }, { 4, "OK, ongoing call" }, + { 0, NULL } }; static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) -- To view, visit https://gerrit.osmocom.org/12472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0776bc43360dfa2229243fb022cd318242ca6400 Gerrit-Change-Number: 12472 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:53 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12439 ) Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... layer23/sap_interface.c: define missing enums and use them Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 55 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index b8a3420..270c565 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -57,6 +57,37 @@ SAP_TRANSPORT_PROTOCOL = 0x09 }; +/* Table 5.18: Possible values for ResultCode */ +enum sap_result_type { + SAP_RESULT_OK_REQ_PROC_CORR = 0x00, + SAP_RESULT_ERROR_NO_REASON = 0x01, + SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, + SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, + SAP_RESULT_ERROR_CARD_REMOVED = 0x04, + SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, + SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, + SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, +}; + +/* Table 5.19: Possible values for StatusChange */ +enum sap_card_status_type { + SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, + SAP_CARD_STATUS_RESET = 0x01, + SAP_CARD_STATUS_NOT_ACC = 0x02, + SAP_CARD_STATUS_REMOVED = 0x03, + SAP_CARD_STATUS_INSERTED = 0x04, + SAP_CARD_STATUS_RECOVERED = 0x05, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +enum sap_conn_status_type { + SAP_CONN_STATUS_OK_READY = 0x00, + SAP_CONN_STATUS_ERROR_CONN = 0x01, + SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, + SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, + SAP_CONN_STATUS_OK_CALL = 0x04, +}; + struct sap_param { uint8_t id; uint16_t len; diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 3faa949..ab683f9 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -91,35 +91,35 @@ /* Table 5.18: Possible values for ResultCode */ static const struct value_string sap_result_names[] = { - { 0, "OK, request processed correctly" }, - { 1, "Error, no reason defined" }, - { 2, "Error, card not accessible" }, - { 3, "Error, card (already) powered off" }, - { 4, "Error, card removed" }, - { 5, "Error, card already powered on" }, - { 6, "Error, data not available" }, - { 7, "Error, not supported "}, + { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, + { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, + { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, + { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, + { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, + { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, + { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, + { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "}, { 0, NULL } }; /* Table 5.19: Possible values for StatusChange */ -static const struct value_string sap_status_change_names[] = { - { 0, "Unknown Error" }, - { 1, "Card reset" }, - { 2, "Card not accessible" }, - { 3, "Card removed" }, - { 4, "Card inserted" }, - { 5, "Card recovered" }, +static const struct value_string sap_card_status_names[] = { + { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, + { SAP_CARD_STATUS_RESET, "Card reset" }, + { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" }, + { SAP_CARD_STATUS_REMOVED, "Card removed" }, + { SAP_CARD_STATUS_INSERTED, "Card inserted" }, + { SAP_CARD_STATUS_RECOVERED, "Card recovered" }, { 0, NULL } }; /* Table 5.16: Possible values for ConnectionStatus */ -static const struct value_string sap_status_names[] = { - { 0, "OK, Server can fulfill requirements" }, - { 1, "Error, Server unable to establish connection" }, - { 2, "Error, Server does not support maximum message size" }, - { 3, "Error, maximum message size by Client is too small" }, - { 4, "OK, ongoing call" }, +static const struct value_string sap_conn_status_names[] = { + { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, + { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, + { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, + { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, + { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, { 0, NULL } }; @@ -319,7 +319,7 @@ switch(msg->id){ case SAP_CONNECT_RESP: - LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_status_names, msg->params[0].value[0])); + LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_conn_status_names, msg->params[0].value[0])); if(msg->params[0].value[0] == 0){ ms->sap_entity.sap_state = SAP_IDLE; } @@ -335,9 +335,9 @@ ms->sap_entity.sap_state = SAP_NOT_CONNECTED; break; case SAP_STATUS_IND: - LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_status_change_names, + LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_card_status_names, msg->params[0].value[0])); - if(msg->params[0].value[0] != 1){ + if(msg->params[0].value[0] != SAP_CARD_STATUS_RESET){ /* TODO: handle case in which the card is not ready yet */ } break; -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:53 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: avoid using 'osmo' prefix In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12465 ) Change subject: layer23/sap_interface.c: avoid using 'osmo' prefix ...................................................................... layer23/sap_interface.c: avoid using 'osmo' prefix The 'osmo' prefix is usually used by libosmo-* symbols. Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 --- M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/common/sim.c M src/host/layer23/src/mobile/app_mobile.c 5 files changed, 18 insertions(+), 18 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 486c36d..a3ecc92 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,7 +23,7 @@ #include struct osmosap_entity { - osmosap_cb_t msg_handler; + sap_cb_t msg_handler; uint8_t sap_state; uint16_t max_msg_size; }; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 270c565..5332982 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,14 +1,14 @@ #pragma once -typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); +typedef int (*sap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); -int osmosap_init(struct osmocom_ms *ms); +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); +int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb); +int sap_init(struct osmocom_ms *ms); -enum osmosap_state { +enum sap_state { SAP_SOCKET_ERROR, SAP_NOT_CONNECTED, SAP_IDLE, @@ -18,7 +18,7 @@ }; /* Table 5.1: Message Overview */ -enum osmosap_msg_type { +enum sap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, SAP_DISCONNECT_REQ = 0x02, @@ -43,7 +43,7 @@ }; /* Table 5.15: List of Parameter IDs */ -enum osmosap_param_type { +enum sap_param_type { SAP_MAX_MSG_SIZE = 0x00, SAP_CONNECTION_STATUS = 0x01, SAP_RESULT_CODE = 0x02, diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index ab683f9..e3be3fb 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -159,7 +159,7 @@ return msg; } -static int osmosap_send(struct osmocom_ms *ms, struct msgb *msg) +static int sap_send(struct osmocom_ms *ms, struct msgb *msg) { if(ms->sap_entity.sap_state == SAP_NOT_CONNECTED) sap_connect(ms); @@ -299,7 +299,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_PROCESSING_ATR_REQUEST; } @@ -463,7 +463,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_CONNECTION_UNDER_NEGOTIATION; } @@ -480,7 +480,7 @@ if(!msg) return; - osmosap_send(ms, msg); + sap_send(ms, msg); ms->sap_entity.sap_state = SAP_NOT_CONNECTED; } @@ -504,7 +504,7 @@ if(!msg) return -ENOMEM; - rc = osmosap_send(ms, msg); + rc = sap_send(ms, msg); if (rc) return rc; @@ -551,7 +551,7 @@ } /* same signature as in L1CTL, so it can be called from sim.c */ -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) { //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , // osmo_hexdump(data, length)); @@ -559,7 +559,7 @@ } /* register message handler for messages that are sent from L2->L3 */ -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb) +int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb) { ms->sap_entity.msg_handler = cb; @@ -567,7 +567,7 @@ } /* init */ -int osmosap_init(struct osmocom_ms *ms) +int sap_init(struct osmocom_ms *ms) { struct osmosap_entity *sap = &ms->sap_entity; diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 9d14cd3..a63ae2a 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -205,7 +205,7 @@ * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { LOGP(DSIM, LOGL_INFO, "Using SAP backend\n"); - rc = osmosap_send_apdu(ms, data, length); + rc = sap_send_apdu(ms, data, length); } else { LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n"); rc = l1ctl_tx_sim_req(ms, data, length); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a2c02c0..27e1d9b 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -200,7 +200,7 @@ lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); /* init SAP client before SIM card starts up */ - osmosap_init(ms); + sap_init(ms); gsm_sim_init(ms); gsm48_cc_init(ms); -- To view, visit https://gerrit.osmocom.org/12465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 Gerrit-Change-Number: 12465 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:53 +0000 Subject: Change in osmocom-bb[master]: layer23/include/Makefile.am: add missing header In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12466 ) Change subject: layer23/include/Makefile.am: add missing header ...................................................................... layer23/include/Makefile.am: add missing header Change-Id: I0a379718eeb7db63696cabd5689e0625fb85d85e --- M src/host/layer23/include/osmocom/bb/common/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index cd3437e..e1ea7eb 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,2 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ - networks.h gps.h sysinfo.h osmocom_data.h utils.h + networks.h gps.h sysinfo.h osmocom_data.h utils.h \ + sap_interface.h -- To view, visit https://gerrit.osmocom.org/12466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a379718eeb7db63696cabd5689e0625fb85d85e Gerrit-Change-Number: 12466 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:39:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:39:54 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: separate protocol definition In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12467 ) Change subject: layer23/sap_interface.c: separate protocol definition ...................................................................... layer23/sap_interface.c: separate protocol definition Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/sap_interface.h A src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/common/sap_interface.c A src/host/layer23/src/common/sap_proto.c 6 files changed, 205 insertions(+), 161 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index e1ea7eb..eb1dfb7 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ networks.h gps.h sysinfo.h osmocom_data.h utils.h \ - sap_interface.h + sap_proto.h sap_interface.h diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 5332982..96d056b 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -16,86 +16,3 @@ SAP_PROCESSING_ATR_REQUEST, SAP_PROCESSING_APDU_REQUEST }; - -/* Table 5.1: Message Overview */ -enum sap_msg_type { - SAP_CONNECT_REQ = 0x00, - SAP_CONNECT_RESP = 0x01, - SAP_DISCONNECT_REQ = 0x02, - SAP_DISCONNECT_RESP = 0x03, - SAP_DISCONNECT_IND = 0x04, - SAP_TRANSFER_APDU_REQ = 0x05, - SAP_TRANSFER_APDU_RESP = 0x06, - SAP_TRANSFER_ATR_REQ = 0x07, - SAP_TRANSFER_ATR_RESP = 0x08, - SAP_POWER_SIM_OFF_REQ = 0x09, - SAP_POWER_SIM_OFF_RESP = 0x0A, - SAP_POWER_SIM_ON_REQ = 0x0B, - SAP_POWER_SIM_ON_RESP = 0x0C, - SAP_RESET_SIM_REQ = 0x0D, - SAP_RESET_SIM_RESP = 0x0E, - SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, - SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, - SAP_STATUS_IND = 0x11, - SAP_ERROR_RESP = 0x12, - SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, - SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 -}; - -/* Table 5.15: List of Parameter IDs */ -enum sap_param_type { - SAP_MAX_MSG_SIZE = 0x00, - SAP_CONNECTION_STATUS = 0x01, - SAP_RESULT_CODE = 0x02, - SAP_DISCONNECTION_TYPE = 0x03, - SAP_COMMAND_APDU = 0x04, - SAP_COMMAND_APDU_7816 = 0x10, - SAP_RESPONSE_APDU = 0x05, - SAP_ATR = 0x06, - SAP_CARD_READER_STATUS = 0x07, - SAP_STATUS_CHANGE = 0x08, - SAP_TRANSPORT_PROTOCOL = 0x09 -}; - -/* Table 5.18: Possible values for ResultCode */ -enum sap_result_type { - SAP_RESULT_OK_REQ_PROC_CORR = 0x00, - SAP_RESULT_ERROR_NO_REASON = 0x01, - SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, - SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, - SAP_RESULT_ERROR_CARD_REMOVED = 0x04, - SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, - SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, - SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, -}; - -/* Table 5.19: Possible values for StatusChange */ -enum sap_card_status_type { - SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, - SAP_CARD_STATUS_RESET = 0x01, - SAP_CARD_STATUS_NOT_ACC = 0x02, - SAP_CARD_STATUS_REMOVED = 0x03, - SAP_CARD_STATUS_INSERTED = 0x04, - SAP_CARD_STATUS_RECOVERED = 0x05, -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -enum sap_conn_status_type { - SAP_CONN_STATUS_OK_READY = 0x00, - SAP_CONN_STATUS_ERROR_CONN = 0x01, - SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, - SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, - SAP_CONN_STATUS_OK_CALL = 0x04, -}; - -struct sap_param { - uint8_t id; - uint16_t len; - uint8_t *value; -}; - -struct sap_msg { - uint8_t id; - uint8_t num_params; - struct sap_param *params; -}; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_proto.h b/src/host/layer23/include/osmocom/bb/common/sap_proto.h new file mode 100644 index 0000000..49b30fc --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/sap_proto.h @@ -0,0 +1,94 @@ +#pragma once + +#include + +#include + +/* Table 5.1: Message Overview */ +enum sap_msg_type { + SAP_CONNECT_REQ = 0x00, + SAP_CONNECT_RESP = 0x01, + SAP_DISCONNECT_REQ = 0x02, + SAP_DISCONNECT_RESP = 0x03, + SAP_DISCONNECT_IND = 0x04, + SAP_TRANSFER_APDU_REQ = 0x05, + SAP_TRANSFER_APDU_RESP = 0x06, + SAP_TRANSFER_ATR_REQ = 0x07, + SAP_TRANSFER_ATR_RESP = 0x08, + SAP_POWER_SIM_OFF_REQ = 0x09, + SAP_POWER_SIM_OFF_RESP = 0x0A, + SAP_POWER_SIM_ON_REQ = 0x0B, + SAP_POWER_SIM_ON_RESP = 0x0C, + SAP_RESET_SIM_REQ = 0x0D, + SAP_RESET_SIM_RESP = 0x0E, + SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, + SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, + SAP_STATUS_IND = 0x11, + SAP_ERROR_RESP = 0x12, + SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, + SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 +}; + +/* Table 5.15: List of Parameter IDs */ +enum sap_param_type { + SAP_MAX_MSG_SIZE = 0x00, + SAP_CONNECTION_STATUS = 0x01, + SAP_RESULT_CODE = 0x02, + SAP_DISCONNECTION_TYPE = 0x03, + SAP_COMMAND_APDU = 0x04, + SAP_COMMAND_APDU_7816 = 0x10, + SAP_RESPONSE_APDU = 0x05, + SAP_ATR = 0x06, + SAP_CARD_READER_STATUS = 0x07, + SAP_STATUS_CHANGE = 0x08, + SAP_TRANSPORT_PROTOCOL = 0x09 +}; + +/* Table 5.18: Possible values for ResultCode */ +enum sap_result_type { + SAP_RESULT_OK_REQ_PROC_CORR = 0x00, + SAP_RESULT_ERROR_NO_REASON = 0x01, + SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, + SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, + SAP_RESULT_ERROR_CARD_REMOVED = 0x04, + SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, + SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, + SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, +}; + +/* Table 5.19: Possible values for StatusChange */ +enum sap_card_status_type { + SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, + SAP_CARD_STATUS_RESET = 0x01, + SAP_CARD_STATUS_NOT_ACC = 0x02, + SAP_CARD_STATUS_REMOVED = 0x03, + SAP_CARD_STATUS_INSERTED = 0x04, + SAP_CARD_STATUS_RECOVERED = 0x05, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +enum sap_conn_status_type { + SAP_CONN_STATUS_OK_READY = 0x00, + SAP_CONN_STATUS_ERROR_CONN = 0x01, + SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, + SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, + SAP_CONN_STATUS_OK_CALL = 0x04, +}; + +extern const struct value_string sap_msg_names[]; +extern const struct value_string sap_param_names[]; +extern const struct value_string sap_result_names[]; +extern const struct value_string sap_card_status_names[]; +extern const struct value_string sap_conn_status_names[]; + +struct sap_param { + uint8_t id; + uint16_t len; + uint8_t *value; +}; + +struct sap_msg { + uint8_t id; + uint8_t num_params; + struct sap_param *params; +}; diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index b76094c..9eed961 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -2,5 +2,5 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) noinst_LIBRARIES = liblayer23.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ +liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_proto.c sap_interface.c \ logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index e3be3fb..7b8717d 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -47,82 +48,6 @@ static void sap_connect(struct osmocom_ms *ms); -/* Table 5.15: List of Parameter IDs */ -static const struct value_string sap_param_names[] = { - { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, - { SAP_CONNECTION_STATUS, "ConnectionStatus" }, - { SAP_RESULT_CODE, "ResultCode" }, - { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, - { SAP_COMMAND_APDU, "CommandAPDU" }, - { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, - { SAP_RESPONSE_APDU, "ResponseAPDU" }, - { SAP_ATR, "ATR" }, - { SAP_CARD_READER_STATUS, "CardReaderStatus" }, - { SAP_STATUS_CHANGE, "StatusChange" }, - { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, - { 0, NULL } -}; - -/* Table 5.1: Message Overview */ -static const struct value_string sap_msg_names[] = { - { SAP_CONNECT_REQ, "CONNECT_REQ" }, - { SAP_CONNECT_RESP, "CONNECT_RESP" }, - { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, - { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, - { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, - { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, - { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, - { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, - { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, - { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, - { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, - { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, - { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, - { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, - { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, - { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, - { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, - { SAP_STATUS_IND, "STATUS_IND" }, - { SAP_ERROR_RESP, "ERROR_RESP" }, - { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, - { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, - { 0, NULL } -}; - -/* Table 5.18: Possible values for ResultCode */ -static const struct value_string sap_result_names[] = { - { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, - { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, - { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, - { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, - { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, - { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, - { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, - { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "}, - { 0, NULL } -}; - -/* Table 5.19: Possible values for StatusChange */ -static const struct value_string sap_card_status_names[] = { - { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, - { SAP_CARD_STATUS_RESET, "Card reset" }, - { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" }, - { SAP_CARD_STATUS_REMOVED, "Card removed" }, - { SAP_CARD_STATUS_INSERTED, "Card inserted" }, - { SAP_CARD_STATUS_RECOVERED, "Card recovered" }, - { 0, NULL } -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -static const struct value_string sap_conn_status_names[] = { - { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, - { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, - { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, - { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, - { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, - { 0, NULL } -}; - static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) { struct msgb *msg; @@ -186,9 +111,13 @@ get_value_string(sap_result_names, param->value[0])); } +#if 0 + /* FIXME: ARRAY_SIZE() is not applicable to + * extern const struct value_string[] */ if(param->value[0] > ARRAY_SIZE(sap_result_names)){ return -1; } +#endif return 0; } diff --git a/src/host/layer23/src/common/sap_proto.c b/src/host/layer23/src/common/sap_proto.c new file mode 100644 index 0000000..ef4cb35 --- /dev/null +++ b/src/host/layer23/src/common/sap_proto.c @@ -0,0 +1,104 @@ +/* + * SAP (SIM Access Profile) protocol definition + * based on Bluetooth SAP specification + * + * (C) 2011 by Nico Golde + * (C) 2018 by Vadim Yanitskiy + * + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include + +#include + +/* Table 5.1: Message Overview */ +const struct value_string sap_msg_names[] = { + { SAP_CONNECT_REQ, "CONNECT_REQ" }, + { SAP_CONNECT_RESP, "CONNECT_RESP" }, + { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, + { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, + { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, + { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, + { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, + { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, + { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, + { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, + { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, + { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, + { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, + { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, + { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, + { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, + { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, + { SAP_STATUS_IND, "STATUS_IND" }, + { SAP_ERROR_RESP, "ERROR_RESP" }, + { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, + { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, + { 0, NULL } +}; + +/* Table 5.15: List of Parameter IDs */ +const struct value_string sap_param_names[] = { + { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, + { SAP_CONNECTION_STATUS, "ConnectionStatus" }, + { SAP_RESULT_CODE, "ResultCode" }, + { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, + { SAP_COMMAND_APDU, "CommandAPDU" }, + { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, + { SAP_RESPONSE_APDU, "ResponseAPDU" }, + { SAP_ATR, "ATR" }, + { SAP_CARD_READER_STATUS, "CardReaderStatus" }, + { SAP_STATUS_CHANGE, "StatusChange" }, + { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, + { 0, NULL } +}; + +/* Table 5.18: Possible values for ResultCode */ +const struct value_string sap_result_names[] = { + { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, + { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, + { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, + { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, + { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, + { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, + { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, + { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "}, + { 0, NULL } +}; + +/* Table 5.19: Possible values for StatusChange */ +const struct value_string sap_card_status_names[] = { + { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, + { SAP_CARD_STATUS_RESET, "Card reset" }, + { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" }, + { SAP_CARD_STATUS_REMOVED, "Card removed" }, + { SAP_CARD_STATUS_INSERTED, "Card inserted" }, + { SAP_CARD_STATUS_RECOVERED, "Card recovered" }, + { 0, NULL } +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +const struct value_string sap_conn_status_names[] = { + { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, + { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, + { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, + { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, + { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/12467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iad9b3d88b02cc7ec4cf64483bbc85e3a61c9ad10 Gerrit-Change-Number: 12467 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:42:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:42:19 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 5: agreeing with neels and pau on the coding style aspect -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:42:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:44:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:44:36 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11720 ) Change subject: Automatically disable GnuTLS fallback ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:44:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:44:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:44:58 +0000 Subject: Change in libosmocore[master]: Streamline glibc version check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:44:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:45:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:45:00 +0000 Subject: Change in libosmocore[master]: Streamline glibc version check In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check ...................................................................... Streamline glibc version check * use macro for version check * report glibc version upon random.h detection * comment where various #endif belongs to * explicitly check for embedded build (our target toolchain don't use libc so there's no point in checking its version) Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 --- M src/gsm/gsm_utils.c 1 file changed, 11 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 9eb41fb..14331e5 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -98,15 +98,18 @@ #include "../../config.h" +#if (!EMBEDDED) /* FIXME: this can be removed once we bump glibc requirements to 2.25: */ -#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25) +#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25) +#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected") #include #elif HAVE_DECL_SYS_GETRANDOM #include #ifndef GRND_NONBLOCK #define GRND_NONBLOCK 0x0001 -#endif -#endif +#endif /* ifndef GRND_NONBLOCK */ +#endif /* if __GLIBC_PREREQ */ +#endif /* !EMBEDDED */ #if (USE_GNUTLS) #pragma message ("including GnuTLS for getrandom fallback.") @@ -131,7 +134,8 @@ if (!gnutls_check_version("3.3.0")) gnutls_global_deinit(); } -#endif + +#endif /* if (USE_GNUTLS) */ /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet * Greek symbols at hex positions 0x10 and 0x12-0x1a @@ -441,19 +445,19 @@ /* this function is intended for generating short identifiers only, not arbitrary-length random data */ if (len > OSMO_MAX_RAND_ID_LEN) return -E2BIG; - -#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25) +#if (!EMBEDDED) +#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25) rc = getrandom(out, len, GRND_NONBLOCK); #elif HAVE_DECL_SYS_GETRANDOM #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") /* FIXME: this can be removed once we bump glibc requirements to 2.25: */ rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK); #endif +#endif /* !EMBEDDED */ /* getrandom() failed entirely: */ if (rc < 0) { #if (USE_GNUTLS) -#pragma message ("Secure random failed: using GnuTLS fallback.") return gnutls_rnd(GNUTLS_RND_RANDOM, out, len); #endif return -errno; -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:45:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:45:02 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11720 ) Change subject: Automatically disable GnuTLS fallback ...................................................................... Automatically disable GnuTLS fallback Disable GnuTLS fallback if sufficient glibc version detected. Previously GnuTLS fallback was used regardless of getrandom() availability in glibc. Fix this by automatically disabling it when not needed. This does not affect the ability to manually disable it unconditionally. Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe --- M src/gsm/gsm_utils.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Max: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 14331e5..02cb3d5 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -103,6 +103,7 @@ #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25) #pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected") #include +#undef USE_GNUTLS #elif HAVE_DECL_SYS_GETRANDOM #include #ifndef GRND_NONBLOCK -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:47:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:47:35 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: Code-Review-1 I'm also surprised that there is work on gtphub, as I don't recall any related issue being relevant at this point. Let's please abandon it. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:47:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:48:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:48:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... Patch Set 19: nobody providing review for two weeks, I'm merging it despite no +3 vote so far. -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 19 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 07 Jan 2019 15:48:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:48:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:48:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_paging_and_lu: check paging followed by an LU - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_bssap_lu_sgsap_lu_and_mt_call: LU on 2G, LU on SGs and CSFB call - TC_sgsap_lu_and_mt_call: LU on SGs, and CSFB call Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Depends: osmo-msc I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 1,116 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index 968bcdd..442cc7c 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -32,6 +32,7 @@ import from Osmocom_Types all; import from IPL4asp_Types all; import from DNS_Helpers all; +import from MobileL3_Types all; type component SGsAP_ConnHdlr { port SGsAP_Conn_PT SGsAP; @@ -41,7 +42,7 @@ /* port between individual per-connection components and this dispatcher */ type port SGsAP_Conn_PT message { - inout PDU_SGsAP; + inout PDU_SGsAP, PDU_ML3_MS_NW, PDU_ML3_NW_MS; } with { extension "internal" }; /* represents a single SGsAP Association */ @@ -292,6 +293,8 @@ while (true) { var SGsAP_ConnHdlr vc_conn; + var PDU_ML3_MS_NW l3_mo; + var PDU_ML3_NW_MS l3_mt; var template IMSI imsi_t; var hexstring imsi; var SGsAP_RecvFrom mrf; @@ -305,6 +308,38 @@ /* TODO: check which ConnectionID client has allocated + store in table? */ SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, msg)); } + /* DTAP/MobileL3 from client (emulated MS): wrap in SGsAP-UL-UD and send */ + [] SGsAP_CLIENT.receive(PDU_ML3_MS_NW:?) -> value l3_mo sender vc_conn { + var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_mo); + imsi := f_imsi_by_comp(vc_conn); + msg := valueof(ts_SGsAP_UL_UD(imsi, l3_enc)); + SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, msg)); + } + [] SGsAP_CLIENT.receive(PDU_ML3_NW_MS:?) -> value l3_mt sender vc_conn { + var octetstring l3_enc := enc_PDU_ML3_NW_MS(l3_mt); + imsi := f_imsi_by_comp(vc_conn); + msg := valueof(ts_SGsAP_DL_UD(imsi, l3_enc)); + SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, msg)); + } + + /* DTAP/MobileL3 from MSC/VLR to MS wrapped in SGsAP-DL-UD: Extract, decode, forward */ + [] SGsAP.receive(tr_SGsAP_RecvFrom_R(tr_SGsAP_DL_UD(?,?))) -> value mrf { + var octetstring l3_enc := mrf.msg.sGsAP_DOWNLINK_UNITDATA.nAS_MessageContainer.nAS_MessageContainer; + imsi := mrf.msg.sGsAP_DOWNLINK_UNITDATA.iMSI.iMSI.digits; + vc_conn := f_comp_by_imsi(imsi); + l3_mt := dec_PDU_ML3_NW_MS(l3_enc); + SGsAP_CLIENT.send(l3_mt) to vc_conn; + } + [] SGsAP.receive(tr_SGsAP_RecvFrom_R(tr_SGsAP_UL_UD(?,?))) -> value mrf { + var octetstring l3_enc := mrf.msg.sGsAP_UPLINK_UNITDATA.nAS_MessageContainer.nAS_MessageContainer; + imsi := mrf.msg.sGsAP_UPLINK_UNITDATA.iMSI.iMSI.digits; + l3_mo := dec_PDU_ML3_MS_NW(l3_enc); + vc_conn := f_comp_by_imsi(imsi); + SGsAP_CLIENT.send(l3_mo) to vc_conn; + } + + + /* any other SGsAP from MSC/VLR */ [] SGsAP.receive(tr_SGsAP_RecvFrom_R(?)) -> value mrf { imsi_t := f_SGsAP_get_imsi(mrf.msg); if (isvalue(imsi_t)) { diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn index 9526080..457481e 100644 --- a/library/SGsAP_Templates.ttcn +++ b/library/SGsAP_Templates.ttcn @@ -69,7 +69,10 @@ return omit; } else if (istemplatekind(digits, "*")) { return *; + } else if (istemplatekind(digits, "?")) { + return ?; } + log("tr_SGsAP_IMSI: ", digits); var template IMSI imsi := { iEI := '00000001'B, lengthIndicator := lengthof(digits)/2 + 1, diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 43a1190..735cd21 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -39,8 +39,10 @@ import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; +import from SGsAP_Emulation all; + /* this component represents a single subscriber connection */ -type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT { +type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr { var BSC_ConnHdlrPars g_pars; timer g_Tguard := 60.0; port TELNETasp_PT MSCVTY; @@ -135,6 +137,8 @@ activate(as_Tguard()); /* Route all SMPP messages for our MSISDN to us */ f_create_smpp_expect(hex2str(pars.msisdn)); + /* Route all SGs message for our IMSI to us */ + f_create_sgsap_expect(pars.imsi); if (g_pars.ipa_ctrl_enable == true) { f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); @@ -452,21 +456,22 @@ mgcp_connection_id_mss := '0'H // }; -function f_mt_call_establish(inout CallParameters cpars) +/* Allocate a call reference and send SETUP via MNCC to MSC */ +function f_mt_call_initate(inout CallParameters cpars) runs on BSC_ConnHdlr { + cpars.mncc_callref := f_rnd_int(2147483648); + MNCC.send(ts_MNCC_SETUP_req(cpars.mncc_callref, hex2str(g_pars.msisdn), + hex2str(cpars.called_party), hex2str(g_pars.imsi))); +} +/* Complete call, begin with a paging response message via BSSAP */ +function f_mt_call_complete(inout CallParameters cpars) +runs on BSC_ConnHdlr { var MNCC_PDU mncc; var MgcpCommand mgcp_cmd; f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); - /* Allocate a call reference and send SETUP via MNCC to MSC */ - cpars.mncc_callref := f_rnd_int(2147483648); - MNCC.send(ts_MNCC_SETUP_req(cpars.mncc_callref, hex2str(g_pars.msisdn), - hex2str(cpars.called_party), hex2str(g_pars.imsi))); - /* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */ - BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); - f_establish_fully(EST_TYPE_PAG_RESP); /* MS <- MSC: Expect CC SETUP */ @@ -476,7 +481,6 @@ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_ALERTING(cpars.transaction_id))); MNCC.receive(tr_MNCC_ALERT_ind(cpars.mncc_callref)); - /* Create MGCP expect */ f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); /* Ask MSC via MNCC to create the RTP socket on the MSC/MGW side */ @@ -531,6 +535,20 @@ /* MS -> MSC: ALERTING */ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CONNECT(cpars.transaction_id))); MNCC.receive(tr_MNCC_SETUP_cnf(cpars.mncc_callref)); +} + +function f_mt_call_establish(inout CallParameters cpars) +runs on BSC_ConnHdlr { + + /* Initiate the call via MNCC */ + f_mt_call_initate(cpars); + + /* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */ + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + + /* Complete the call via BSSAP */ + f_mt_call_complete(cpars); setverdict(pass); } @@ -1008,7 +1026,6 @@ } - } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index ef626bf..bf703e6 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -42,6 +42,10 @@ import from BSSMAP_Emulation all; import from BSC_ConnectionHandler all; +import from SGsAP_Templates all; +import from SGsAP_Types all; +import from SGsAP_Emulation all; + import from MobileL3_Types all; import from MobileL3_CommonIE_Types all; import from MobileL3_SMS_Types all; @@ -57,10 +61,14 @@ import from SS_Types all; import from SS_Templates all; import from USSD_Helpers all; +import from DNS_Helpers all; const integer NUM_BSC := 2; type record of BSSAP_Configuration BSSAP_Configurations; +/* Needed for SGsAP SMS */ +import from MobileL3_SMS_Types all; + type component MTC_CT extends CTRL_Adapter_CT { var boolean g_initialized := false; @@ -72,6 +80,7 @@ var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; var SMPP_Emulation_CT vc_SMPP; + var SGsAP_Emulation_CT vc_SGsAP; /* only to get events from IPA underneath GSUP */ port IPA_CTRL_PT GSUP_IPA_EVENT; @@ -107,6 +116,8 @@ integer mp_msc_smpp_port := 2775; charstring mp_smpp_system_id := "msc_tester"; charstring mp_smpp_password := "osmocom1"; + charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; + charstring mp_vlr_name := "vlr.example.net"; BSSAP_Configurations mp_bssap_cfg := { { @@ -193,6 +204,25 @@ vc_MGCP.start(MGCP_Emulation.main(ops, pars, id)); } +function f_init_sgsap(charstring id) runs on MTC_CT { + id := id & "-SGsAP"; + var SGsAPOps ops := { + create_cb := refers(SGsAP_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(SGsAP_Emulation.DummyUnitdataCallback) + } + var SGsAP_conn_parameters pars := { + remote_ip := mp_msc_ip, + remote_sctp_port := 29118, + local_ip := "", + local_sctp_port := -1 + } + + vc_SGsAP := SGsAP_Emulation_CT.create(id); + map(vc_SGsAP:SGsAP, system:SGsAP_CODEC_PT); + vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); +} + + function f_init_gsup(charstring id) runs on MTC_CT { id := id & "-GSUP"; var GsupOps ops := { @@ -247,6 +277,7 @@ f_init_mgcp("MSC_Test"); f_init_gsup("MSC_Test"); f_init_smpp("MSC_Test"); + f_init_sgsap("MSC_Test"); map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -485,6 +516,9 @@ /* SMPP part */ connect(vc_conn:SMPP, vc_SMPP:SMPP_CLIENT); connect(vc_conn:SMPP_PROC, vc_SMPP:SMPP_PROC); + /* SGs part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -2985,6 +3019,980 @@ * too long / short TLV values */ +/* Perform a location updatye at the A-Interface and run some checks to confirm + * that everything is back to normal. */ +private function f_sgsap_bssmap_screening() runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + /* Perform a location update, the SGs association is expected to fall + * back to NULL */ + f_perform_lu(); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + /* Trigger a paging request and expect the paging on BSSMAP, this is + * to make sure that pagings are sent throught the A-Interface again + * and not throught the SGs interface.*/ + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Send an SMS to make sure that also payload messages are routed + * throught the A-Interface again */ + f_establish_fully(EST_TYPE_MO_SMS); + f_mo_sms(spars); + f_expect_clear(); +} + +private function f_tc_sgsap_reset(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + var charstring vlr_name; + f_init_handler(pars); + + vlr_name := f_sgsap_reset_mme(mp_mme_name); + log("VLR name: ", vlr_name); + setverdict(pass); +} + +testcase TC_sgsap_reset() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_reset), 10); + vc_conn.done; +} + +/* like f_mm_auth() but for SGs */ +function f_mm_auth_sgs() runs on BSC_ConnHdlr { + if (g_pars.net.expect_auth) { + g_pars.vec := f_gen_auth_vec_3g(); + var GSUP_IE auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + SGsAP.receive(tr_ML3_MT_MM_AUTH_REQ_3G(g_pars.vec.rand, g_pars.vec.autn)); + SGsAP.send(ts_ML3_MT_MM_AUTH_RESP_3G(g_pars.vec.sres, g_pars.vec.res)); + } +} + +/* like f_perform_lu(), but on SGs rather than BSSAP */ +function f_sgs_perform_lu() runs on BSC_ConnHdlr { + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + var PDU_SGsAP lur; + var PDU_SGsAP lua; + var PDU_SGsAP mm_info; + var octetstring mm_info_dtap; + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + lur := valueof(ts_SGsAP_LU_REQ(g_pars.imsi, mme_name, IMSI_attach, + ts_SGsAP_LAI('901'H, '70'H, 2342))); + /* Old LAI, if MS sends it */ + /* TMSI status, if MS has no valid TMSI */ + /* IMEISV, if it supports "automatic device detection" */ + /* TAI, if available in MME */ + /* E-CGI, if available in MME */ + SGsAP.send(lur); + + /* FIXME: is this really done over SGs? The Ue is already authenticated + * via the MME ... */ + f_mm_auth_sgs(); + + /* Expect MSC to perform LU with HLR */ + GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); + GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + alt { + [] SGsAP.receive(tr_SGsAP_LU_ACCEPT(g_pars.imsi, ?)) -> value lua { + if (isvalue(lua.sGsAP_LOCATION_UPDATE_ACCEPT.newTMSIorIMSI.iD.iD.tmsi_ptmsi.octets)) { + g_pars.tmsi :=lua.sGsAP_LOCATION_UPDATE_ACCEPT.newTMSIorIMSI.iD.iD.tmsi_ptmsi.octets + SGsAP.send(ts_SGsAP_TMSI_REALL_CMPL(g_pars.imsi)); + } + setverdict(pass); + } + [] SGsAP.receive(tr_SGsAP_LU_REJECT(g_pars.imsi, ?, ?)) { + setverdict(fail, "Received LU-REJECT instead of ACCEPT"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Check MM information */ + if (mp_mm_info == true) { + SGsAP.receive(tr_SGsAP_MM_INFO_REQ(g_pars.imsi, ?)) -> value mm_info; + mm_info_dtap := '0532'O & mm_info.sGsAP_MM_INFORMATION_REQUEST.mM_Information.information; + if (not match(dec_PDU_ML3_NW_MS(mm_info_dtap), tr_ML3_MT_MM_Info)) { + setverdict(fail, "Unexpected MM Information"); + } + } + + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); +} + +private function f_tc_sgsap_lu(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_lu() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_lu), 10); + vc_conn.done; +} + +/* Do LU by IMSI, refuse it on GSUP and expect LU REJ back to MS */ +private function f_tc_sgsap_lu_imsi_reject(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var PDU_SGsAP lur; + + f_create_gsup_expect(hex2str(g_pars.imsi)); + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + lur := valueof(ts_SGsAP_LU_REQ(g_pars.imsi, mme_name, IMSI_attach, + ts_SGsAP_LAI('901'H, '70'H, 2342))); + SGsAP.send(lur); + + GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 23)); + alt { + [] SGsAP.receive(tr_SGsAP_LU_REJECT(g_pars.imsi, ?, ?)) { + setverdict(pass); + } + [] SGsAP.receive(tr_SGsAP_LU_ACCEPT(g_pars.imsi, ?)) { + setverdict(fail, "Expecting LU REJ, but got ACCEPT"); + mtc.stop; + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_lu_imsi_reject() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_sgsap_lu_imsi_reject), 3); + vc_conn.done; +} + +/* Do LU by IMSI, but then remain silent so that Ts6-1 times out */ +private function f_tc_sgsap_lu_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + var PDU_SGsAP lur; + + f_init_handler(pars); + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + lur := valueof(ts_SGsAP_LU_REQ(g_pars.imsi, mme_name, IMSI_attach, + ts_SGsAP_LAI('901'H, '70'H, 2342))); + /* Old LAI, if MS sends it */ + /* TMSI status, if MS has no valid TMSI */ + /* IMEISV, if it supports "automatic device detection" */ + /* TAI, if available in MME */ + /* E-CGI, if available in MME */ + SGsAP.send(lur); + + /* FIXME: is this really done over SGs? The Ue is already authenticated + * via the MME ... */ + f_mm_auth_sgs(); + + /* Expect MSC to perform LU with HLR */ + GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); + GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + alt { + [] SGsAP.receive(tr_SGsAP_LU_ACCEPT(g_pars.imsi, ?)) { + setverdict(pass); + } + [] SGsAP.receive(tr_SGsAP_LU_REJECT(g_pars.imsi, ?, ?)) { + setverdict(fail, "Received LU-REJECT instead of ACCEPT"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + /* Wait until the VLR has abort the TMSI reallocation procedure */ + f_sleep(45.0); + + /* The outcome does not change the SGs state, see also 5.2.3.4 */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_lu_and_nothing() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_sgsap_lu_and_nothing), 3); + vc_conn.done; +} + +private function f_tc_sgsap_expl_imsi_det_eps(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(3.0); + + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + SGsAP.send(ts_SGsAP_EPS_DETACH_IND(g_pars.imsi, mme_name, UE_initiated)); + SGsAP.receive(tr_SGsAP_EPS_DETACH_ACK(g_pars.imsi)); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_expl_imsi_det_eps() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_expl_imsi_det_eps), 10); + vc_conn.done; +} + +private function f_tc_sgsap_expl_imsi_det_noneps(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(3.0); + + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + SGsAP.send(ts_SGsAP_IMSI_DETACH_IND(g_pars.imsi, mme_name, combined_UE_initiated)); + SGsAP.receive(tr_SGsAP_IMSI_DETACH_ACK(g_pars.imsi)); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + /* FIXME: How to verify that VLR has removed MM context? */ + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_expl_imsi_det_noneps() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_expl_imsi_det_noneps), 1081); + vc_conn.done; +} + +/* Trigger a paging request via VTY and send a paging reject in response */ +private function f_tc_sgsap_paging_rej(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_resp := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, CS_call_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_resp.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Initiate paging via VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(exp_resp) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Now reject the paging */ + SGsAP.send(ts_SGsAP_PAGING_REJ(g_pars.imsi, IMSI_unknown)); + + /* Wait for the states inside the MSC to settle and check the state + * of the SGs Association */ + f_sleep(1.0); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + /* FIXME: At the moment we send an IMSI_unknown as cause code, which is fine, + * but we also need to cover tha case where the cause code indicates an + * "IMSI detached for EPS services". In those cases the VLR is expected to + * try paging on tha A/Iu interface. This will be another testcase similar to + * this one, but extended with checks for the presence of the A/Iu paging + * messages. */ + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_paging_rej() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging_rej), 1082); + vc_conn.done; +} + +/* Trigger a paging request via VTY and send a paging reject that indicates + * that the subscriber intentionally rejected the call. */ +private function f_tc_sgsap_paging_subscr_rej(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_resp := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, CS_call_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_resp.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Initiate paging via VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(exp_resp) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Now reject the paging */ + SGsAP.send(ts_SGsAP_PAGING_REJ(g_pars.imsi, user_rejected_mobile_terminating_CS_fallback_call)); + + /* Wait for the states inside the MSC to settle and check the state + * of the SGs Association */ + f_sleep(1.0); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + /* FIXME: The VLR is supposed to trigger an User Determined User Busy (UDUB) as specified + * in 3GPP TS 24.082, this is not yet implemented in the MSC or in this tests, we need + * to check back how this works and how it can be tested */ + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_paging_subscr_rej() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging_subscr_rej), 1083); + vc_conn.done; +} + +/* Trigger a paging request via VTY and send an UE unreacable messge in response */ +private function f_tc_sgsap_paging_ue_unr(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_resp := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, CS_call_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_resp.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Initiate paging via VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(exp_resp) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Now pretend that the UE is unreachable */ + SGsAP.send(ts_SGsAP_UE_UNREACHABLE(g_pars.imsi, UE_unreachable)); + + /* Wait for the states inside the MSC to settle and check the state + * of the SGs Association. */ + f_sleep(1.0); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_paging_ue_unr() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging_ue_unr), 10); + vc_conn.done; +} + +/* Trigger a paging request via VTY but don't respond to it */ +private function f_tc_sgsap_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_resp := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, CS_call_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_resp.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Initiate paging via VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(exp_resp) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Now do nothing, the MSC/VLR should fail silently to page after a + * few seconds, The SGs association must remain unchanged. */ + f_sleep(15.0); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_paging_and_nothing() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging_and_nothing), 92); + vc_conn.done; +} + +/* Trigger a paging request via VTY and slip in an LU */ +private function f_tc_sgsap_paging_and_lu(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + f_init_handler(pars); + + /* First we prepar the situation, where the SGs association is in state + * NULL and the confirmed by radio contact indicator is set to false + * as well. This can be archived by performing an SGs LU and then + * resetting the VLR */ + f_sgs_perform_lu(); + f_sgsap_reset_mme(mp_mme_name); + f_sleep(1.0); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + /* Perform a paging, expect the paging messages on the SGs interface */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, CS_call_indicator, omit)) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Perform the LU as normal */ + f_sgs_perform_lu(); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + /* Expect a new paging request right after the LU */ + alt { + [] SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, CS_call_indicator, omit)) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Test is done now, lets round everything up by rejecting the paging + * cleanly. */ + SGsAP.send(ts_SGsAP_PAGING_REJ(g_pars.imsi, user_rejected_mobile_terminating_CS_fallback_call)); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_paging_and_lu() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging_and_lu), 9792); + vc_conn.done; +} + +/* Send unexpected unit-data through the SGs interface */ +private function f_tc_sgsap_unexp_ud(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sleep(1.0); + + /* This simulates what happens when a subscriber without SGs + * association gets unitdata via the SGs interface. */ + + /* Make sure the subscriber exists and the SGs association + * is in NULL state */ + f_perform_lu(); + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + /* Send some random unit data, the MSC/VLR should send a release + * immediately. */ + SGsAP.send(ts_SGsAP_UL_UD(pars.imsi,'1234'O)); + SGsAP.receive(tr_SGsAP_RELEASE_REQ(pars.imsi, IMSI_detached_for_EPS_nonEPS_services)); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_unexp_ud() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_unexp_ud), 2145); + vc_conn.done; +} + +/* Send unsolicited unit-data through the SGs interface */ +private function f_tc_sgsap_unsol_ud(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sleep(1.0); + + /* This simulates what happens when the MME attempts to send unitdata + * to a subscriber that is completely unknown to the VLR */ + + /* Send some random unit data, the MSC/VLR should send a release + * immediately. */ + SGsAP.send(ts_SGsAP_UL_UD(pars.imsi,'1234'O)); + SGsAP.receive(tr_SGsAP_RELEASE_REQ(pars.imsi, IMSI_unknown)); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_unsol_ud() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_unsol_ud), 146); + vc_conn.done; +} + +private altstep as_other_sms_sgs() runs on BSC_ConnHdlr { + /* FIXME: Match an actual payload (second questionmark), the type is + * octetstring, how do we use a tr_PDU_DTAP_MT here? */ + [] SGsAP.receive(tr_SGsAP_DL_UD(?,?)) { + setverdict(fail, "Unexpected SMS related PDU from MSC"); + mtc.stop; + } +} + +/* receive a MT-SMS delivered from the MSC/SMSC over an already existing SGsAP connection */ +function f_mt_sms_sgs(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + + var template TPDU_RP_DATA_SGSN_MS tp_mt; + var template RPDU_SGSN_MS rp_mt; + var template PDU_ML3_NW_MS l3_mt; + + var PDU_ML3_NW_MS sgsap_l3_mt; + + var default d := activate(as_other_sms_sgs()); + + /* 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); + l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt)); + + SGsAP.receive(l3_mt) -> value sgsap_l3_mt; + + /* Extract relevant identifiers */ + spars.tid := bit2int(sgsap_l3_mt.tiOrSkip.transactionId.tio); + spars.rp.msg_ref := sgsap_l3_mt.msgs.sms.cP_DATA.cP_User_Data.cP_RPDU.rP_DATA_SGSN_MS.rP_MessageReference; + + /* send CP-ACK for CP-DATA just received */ + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_ACK_MO); + + SGsAP.send(l3_mo); + + /* send RP-ACK for RP-DATA */ + rp_mo := ts_RP_ACK_MO(spars.rp.msg_ref); + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo)); + + SGsAP.send(l3_mo); + + /* expect CP-ACK for CP-DATA(RP-ACK) just sent */ + l3_mt := tr_ML3_MT_SMS(spars.tid, c_TIF_ORIG, tr_CP_ACK_MT); + + SGsAP.receive(l3_mt); + + deactivate(d); + + setverdict(pass); +} + +/* submit a MO-SMS to MSC/SMSC over an already existing SGsAP connection */ +function f_mo_sms_sgs(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + + var template TPDU_RP_DATA_SGSN_MS tp_mt; + var template RPDU_SGSN_MS rp_mt; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms_sgs()); + + /* just in case this is routed to SMPP.. */ + f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue)); + + 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); + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); + + SGsAP.send(l3_mo); + + /* receive CP-ACK for CP-DATA above */ + SGsAP.receive(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT)); + + if (ispresent(spars.exp_rp_err)) { + /* expect an RP-ERROR message from MSC with given cause */ + rp_mt := tr_RP_ERROR_MT(spars.rp.msg_ref, spars.exp_rp_err); + l3_mt := tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_DATA_MT(rp_mt)); + SGsAP.receive(l3_mt); + /* send CP-ACK for CP-DATA just received */ + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_ACK_MO); + SGsAP.send(l3_mo); + } else { + /* expect RP-ACK for RP-DATA */ + rp_mt := tr_RP_ACK_MT(spars.rp.msg_ref); + l3_mt := tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_DATA_MT(rp_mt)); + SGsAP.receive(l3_mt); + /* send CP-ACO for CP-DATA just received */ + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_ACK_MO); + SGsAP.send(l3_mo); + } + + deactivate(d); + + setverdict(pass); +} + +private function f_vty_sms_send_conn_hdlr(charstring imsi, charstring msisdn, charstring text) +runs on BSC_ConnHdlr { + f_vty_transceive(MSCVTY, "subscriber imsi "&imsi&" sms sender msisdn "&msisdn&" send "&text); +} + +/* Send a MT SMS via SGs interface */ +private function f_tc_sgsap_mt_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + var SmsParameters spars := valueof(t_SmsPars); + spars.tp.ud := 'C8329BFD064D9B53'O; + + /* Trigger SMS via VTY */ + f_vty_sms_send_conn_hdlr(hex2str(pars.imsi), "2342", "Hello SMS"); + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + + /* Expect a paging request and respond accordingly with a service request */ + SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, SMS_indicator, omit)); + SGsAP.send(ts_SGsAP_SERVICE_REQ(pars.imsi, SMS_indicator, EMM_CONNECTED)); + + /* Connection is now live, receive the MT-SMS */ + f_mt_sms_sgs(spars); + + /* Expect a concluding release from the MSC */ + SGsAP.receive(tr_SGsAP_RELEASE_REQ(pars.imsi, omit)); + + /* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} +testcase TC_sgsap_mt_sms() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_mt_sms), 1145); + vc_conn.done; +} + +/* Send a MO SMS via SGs interface */ +private function f_tc_sgsap_mo_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + var SmsParameters spars := valueof(t_SmsPars); + spars.tp.ud := 'C8329BFD064D9B53'O; + + /* Send the MO-SMS */ + f_mo_sms_sgs(spars); + + /* Expect a concluding release from the MSC/VLR */ + SGsAP.receive(tr_SGsAP_RELEASE_REQ(pars.imsi, omit)); + + /* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + setverdict(pass); + + f_sgsap_bssmap_screening() +} +testcase TC_sgsap_mo_sms() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_mo_sms), 3145); + vc_conn.done; +} + +/* Trigger sending of an MT sms via VTY but never respond to anything */ +private function f_tc_sgsap_mt_sms_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars, 170.0); + f_sgs_perform_lu(); + f_sleep(1.0); + + var SmsParameters spars := valueof(t_SmsPars); + spars.tp.ud := 'C8329BFD064D9B53'O; + var integer page_count := 0; + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_pag_req := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, SMS_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_pag_req.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Trigger SMS via VTY */ + f_vty_sms_send_conn_hdlr(hex2str(pars.imsi), "2342", "Hello SMS"); + + /* Expect the MSC/VLR to page exactly 10 times before giving up */ + alt { + [] SGsAP.receive(exp_pag_req) + { + page_count := page_count + 1; + + if (page_count < 10) { + repeat; + } + } + [] SGsAP.receive { + setverdict(fail, "unexpected SGsAP message received"); + self.stop; + } + } + + /* Wait some time to make sure the MSC is not delivering any further + * paging messages or anything else that could be unexpected. */ + timer T := 20.0; + T.start + alt { + [] SGsAP.receive(exp_pag_req) + { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; + } + [] SGsAP.receive { + setverdict(fail, "unexpected SGsAP message received"); + self.stop; + } + [] T.timeout { + setverdict(pass); + } + } + + /* Even on a failed paging the SGs Association should stay intact */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + /* Note: We do not execute f_sgsap_bssmap_screening() here since the + * MSC/VLR would re-try to deliver the test SMS trigered above and + * so the screening would fail. */ + + /* Expire the subscriber now to avoid that the MSC will try the SMS + * delivery at some later point. */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " expire"); + + setverdict(pass); +} +testcase TC_sgsap_mt_sms_and_nothing() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_mt_sms_and_nothing), 4581); + vc_conn.done; +} + +/* Trigger sending of an MT sms via VTY but reject the paging immediately */ +private function f_tc_sgsap_mt_sms_and_reject(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars, 150.0); + f_sgs_perform_lu(); + f_sleep(1.0); + + var SmsParameters spars := valueof(t_SmsPars); + spars.tp.ud := 'C8329BFD064D9B53'O; + var integer page_count := 0; + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_pag_req := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, SMS_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_pag_req.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Trigger SMS via VTY */ + f_vty_sms_send_conn_hdlr(hex2str(pars.imsi), "2342", "Hello SMS"); + + /* Expect a paging request and reject it immediately */ + SGsAP.receive(exp_pag_req); + SGsAP.send(ts_SGsAP_PAGING_REJ(g_pars.imsi, IMSI_unknown)); + + /* The MSC/VLR should no longer try to page once the paging has been + * rejected. Wait some time and check if there are no unexpected + * messages on the SGs interface. */ + timer T := 20.0; + T.start + alt { + [] SGsAP.receive(exp_pag_req) + { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; + } + [] SGsAP.receive { + setverdict(fail, "unexpected SGsAP message received"); + self.stop; + } + [] T.timeout { + setverdict(pass); + } + } + + /* A rejected paging with IMSI_unknown (see above) should always send + * the SGs association to NULL. */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); + + f_sgsap_bssmap_screening(); + + /* Expire the subscriber now to avoid that the MSC will try the SMS + * delivery at some later point. */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " expire"); + + setverdict(pass); +} +testcase TC_sgsap_mt_sms_and_reject() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_mt_sms_and_reject), 4145); + vc_conn.done; +} + +/* Perform an MT CSDB call including LU */ +private function f_mt_lu_and_csfb_call(charstring id, BSC_ConnHdlrPars pars, boolean bssmap_lu) runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Be sure that the BSSMAP reset is done before we begin. */ + f_sleep(2.0); + + /* Testcase variation: See what happens when we do a regular BSSMAP + * LU first (this should not hurt in any way!) */ + if (bssmap_lu) { + f_perform_lu(); + } + + f_sgs_perform_lu(); + f_sleep(1.0); + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + cpars.bss_rtp_port := 1110; + cpars.mgcp_connection_id_bss := '10004'H; + cpars.mgcp_connection_id_mss := '10005'H; + + /* Note: This is an optional parameter. When the call-agent (MSC) does + * supply a full endpoint name this setting will be overwritten. */ + cpars.mgcp_ep := "rtpbridge/1 at mgw"; + + /* Initiate a call via MNCC interface */ + f_mt_call_initate(cpars); + + /* Expect a paging request and respond accordingly with a service request */ + SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, CS_call_indicator, omit)); + SGsAP.send(ts_SGsAP_SERVICE_REQ(pars.imsi, CS_call_indicator, EMM_CONNECTED)); + + /* Complete the call, hold it for some time and then tear it down */ + f_mt_call_complete(cpars); + f_sleep(3.0); + f_call_hangup(cpars, true); + + /* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */ + f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); + + /* Finally simulate the return of the UE to the 4G network */ + SGsAP.send(ts_SGsAP_MO_CSFB_IND(pars.imsi)); + + /* Test for successful return by triggering a paging, when the paging + * request is received via SGs, we can be sure that the MSC/VLR has + * recognized that the UE is now back on 4G */ + f_sleep(1.0); + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, CS_call_indicator, omit)) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + f_sgsap_bssmap_screening(); + + setverdict(pass); +} + +/* Perform a regular BSSAP LU first, do a SGSAP LU and then make a CSFB call */ +private function f_tc_bssap_lu_sgsap_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_mt_lu_and_csfb_call(id, pars, true); +} +testcase TC_bssap_lu_sgsap_lu_and_mt_call() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_bssap_lu_sgsap_lu_and_mt_call), 139); + vc_conn.done; +} + + +/* Perform a SGSAP LU and then make a CSFB call */ +private function f_tc_sgsap_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_mt_lu_and_csfb_call(id, pars, false); +} +testcase TC_sgsap_lu_and_mt_call() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_sgsap_lu_and_mt_call), 239); + vc_conn.done; +} + +/* SGs TODO: + * LU attempt for IMSI without NAM_PS in HLR + * LU attempt with AUTH FAIL due to invalid RES/SRES + * LU attempt with no response from HLR (VLR should timeout + LU REJ) + * LU attempt with new TMSI but without TMSI REALL CMPL baco to VLR + * implicit IMSI detach from EPS + * implicit IMSI detach from non-EPS + * MM INFO + * + */ control { execute( TC_cr_before_reset() ); @@ -3051,6 +4059,26 @@ execute( TC_cipher_complete_with_invalid_cipher() ); + execute( TC_sgsap_reset() ); + execute( TC_sgsap_lu() ); + execute( TC_sgsap_lu_imsi_reject() ); + execute( TC_sgsap_lu_and_nothing() ); + execute( TC_sgsap_expl_imsi_det_eps() ); + execute( TC_sgsap_expl_imsi_det_noneps() ); + execute( TC_sgsap_paging_rej() ); + execute( TC_sgsap_paging_subscr_rej() ); + execute( TC_sgsap_paging_ue_unr() ); + execute( TC_sgsap_paging_and_nothing() ); + execute( TC_sgsap_paging_and_lu() ); + execute( TC_sgsap_mt_sms() ); + execute( TC_sgsap_mo_sms() ); + execute( TC_sgsap_mt_sms_and_nothing() ); + execute( TC_sgsap_mt_sms_and_reject() ); + execute( TC_sgsap_unexp_ud() ); + execute( TC_sgsap_unsol_ud() ); + execute( TC_bssap_lu_sgsap_lu_and_mt_call() ); + execute( TC_sgsap_lu_and_mt_call() ); + /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_mo_cc_bssmap_clear() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index b9c60c0..8a5822d 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -74,4 +74,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 5d73fea..117564e 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -94,7 +94,7 @@ FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " -FILES+="SGsAP_Templates.ttcn " +FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 556d69e..5645fdd 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc *.c *.asn" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc SGsAP_CodecPort_CtrlFunctDef.cc *.c *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 20 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:49:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:49:34 +0000 Subject: Change in libosmocore[master]: LCLS: fix LCLS-CONNECT-CONTROL encoder In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12376 ) Change subject: LCLS: fix LCLS-CONNECT-CONTROL encoder ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f Gerrit-Change-Number: 12376 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:49:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:49:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:49:36 +0000 Subject: Change in libosmocore[master]: LCLS: fix LCLS-CONNECT-CONTROL encoder In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12376 ) Change subject: LCLS: fix LCLS-CONNECT-CONTROL encoder ...................................................................... LCLS: fix LCLS-CONNECT-CONTROL encoder Previously it could encode both incorrect values as well as incorrect message. Let's fix this by explicitly checking for invalid values and ensuring that at least one of the parameters is valid. This function have no external or internal users so it's better to fix type signature as well to match the rest of gsm0808_create_lcls_*(). Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 3 files changed, 16 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 16d96ec..8b5f841 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -19,3 +19,4 @@ libosmogsm osmo_gsup_message extended with SMS related fields libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers +libosmogsm gsm0808_create_lcls_conn_ctrl() API/ABI break: change parameters from pointers to plain values diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 79d89e5..ac88748 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -92,8 +92,8 @@ const struct gsm0808_cell_id_list *cil, const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); -struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, - enum gsm0808_lcls_control *control); +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config, + enum gsm0808_lcls_control control); struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status); struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 485e063..59b1657 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -312,19 +312,24 @@ * \param[in] config LCLS Configuration * \param[in] control LCLS Connection Status Control * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ -struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, - enum gsm0808_lcls_control *control) +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config, + enum gsm0808_lcls_control control) { - struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, - "bssmap: LCLS CONN CTRL"); + struct msgb *msg; + + /* According to NOTE 1 in ?3.2.1.91 at least one of the parameters is required */ + if (config == GSM0808_LCLS_CFG_NA && control == GSM0808_LCLS_CSC_NA) + return NULL; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: LCLS CONN CTRL"); if (!msg) return NULL; msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL); - if (config) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *config); - if (control) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *control); + if (config != GSM0808_LCLS_CFG_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, config); + if (control != GSM0808_LCLS_CSC_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, control); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; -- To view, visit https://gerrit.osmocom.org/12376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f Gerrit-Change-Number: 12376 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:49:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 15:49:59 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 07 Jan 2019 15:49:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 15:52:22 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 15:52:22 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 448 PS1, Line 448: "" > IIUC this patch doesn't require adding IMEISV config, so maybe we can push this off into the future [?] To get further with the IMEI -> HLR patches I'm working on, I'll do as you suggested and remove the IMEISV options from this patch. Thanks for the detailed explanations! -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 15:52:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:01:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 16:01:23 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 16:01:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:02:50 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 16:02:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 07 Jan 2019 16:02:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:04:24 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 16:04:24 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12476 to look at the new patch set (#2). Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Add initial version of asyncio trap2cgi script It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399 --- M README A contrib/systemd/osmo-trap2cgi.service A scripts/osmo_trap2cgi.py M setup.py 4 files changed, 242 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/76/12476/2 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:09:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 7 Jan 2019 16:09:04 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 437 PS1, Line 437: "Send each IMEI to the EIR to ask if it is permitted or not. The EIR is implemented as part of osmo-hlr, " > slightly out-of-scope, we don't know whether the user is using OsmoHLR or something else. True, but I think it would make it a lot easier to understand for the users, what this option is for. If they don't use OsmoHLR, then they can ignore that sentence. With that in mind, do you still prefer to have it removed? https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 440 PS1, Line 440: "1 = send each IMEI to the EIR\n") > (we normally don't name the values again, just write the string for that value. [?] Ack, and I'll submit a patch later to fix this in the description above. -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 07 Jan 2019 16:09:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:10:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 16:10:16 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update default parameters in config In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12474 ) Change subject: ctrl2cgi: update default parameters in config ...................................................................... ctrl2cgi: update default parameters in config Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191 --- M doc/examples/ctrl2cgi.ini 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/ctrl2cgi.ini b/doc/examples/ctrl2cgi.ini index e1feebc..058944b 100644 --- a/doc/examples/ctrl2cgi.ini +++ b/doc/examples/ctrl2cgi.ini @@ -3,3 +3,5 @@ location = http://172.16.1.13:8080/dummy_position_handler.cgi secret_key = MegaSecretl000000l num_max_conn = 4 +timeout = 4 +port_ctrl = 4249 -- To view, visit https://gerrit.osmocom.org/12474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191 Gerrit-Change-Number: 12474 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:10:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 16:10:17 +0000 Subject: Change in python/osmo-python-tests[master]: Mark soap.py as deprecated In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12475 ) Change subject: Mark soap.py as deprecated ...................................................................... Mark soap.py as deprecated It might be removed in one of the future releases as we move away from Twisted. Let's mark it as deprecated to make sure it won't be a surprise. Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6 --- M README 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/README b/README index 76defb6..e90e214 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ Use There are currently following scripts in this package: osmotestconfig.py - test that apps start/write with example configs -soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted +soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted osmo_rate_ctr2csv.py - rate counter dumper on top of osmo_ipa osmo_interact_vty.py - pipe stdin/stdout to a VTY session -- To view, visit https://gerrit.osmocom.org/12475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6 Gerrit-Change-Number: 12475 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 16:20:28 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 7 Jan 2019 16:20:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 17:38:32 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 Jan 2019 17:38:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: make sgsap interface optional Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12477 Change subject: MSC_Tests: make sgsap interface optional ...................................................................... MSC_Tests: make sgsap interface optional At the moment the sgsap always enabled in the testsuite. This means the testsuite will try to connect the SGs interface of osmo-msc on initalization. If the connection fails, the testcase will fail also. Unfortunately the related patches that add the SGs interface to osmo-msc are not yet merged to master. This causes almost all testcases to fail, so lets have the SGs interface as an option that we can switch on when the SGs interface patches are merged to master. Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 Related: OS#3645 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/12477/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 735cd21..7b88192 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -72,7 +72,8 @@ charstring ipa_ctrl_ip, integer ipa_ctrl_port, boolean ipa_ctrl_enable, - boolean mm_info + boolean mm_info, + boolean sgsap_enable }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -137,8 +138,11 @@ activate(as_Tguard()); /* Route all SMPP messages for our MSISDN to us */ f_create_smpp_expect(hex2str(pars.msisdn)); + /* Route all SGs message for our IMSI to us */ - f_create_sgsap_expect(pars.imsi); + if (g_pars.sgsap_enable == true) { + f_create_sgsap_expect(pars.imsi); + } if (g_pars.ipa_ctrl_enable == true) { f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index bf703e6..96ddc8d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -119,6 +119,8 @@ charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; charstring mp_vlr_name := "vlr.example.net"; + boolean mp_sgsap_enable := false; + BSSAP_Configurations mp_bssap_cfg := { { sccp_service_type := "mtp3_itu", @@ -277,7 +279,10 @@ f_init_mgcp("MSC_Test"); f_init_gsup("MSC_Test"); f_init_smpp("MSC_Test"); - f_init_sgsap("MSC_Test"); + + if (mp_sgsap_enable == true) { + f_init_sgsap("MSC_Test"); + } map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -491,7 +496,8 @@ ipa_ctrl_ip := mp_msc_ip, ipa_ctrl_port := mp_msc_ctrl_port, ipa_ctrl_enable := true, - mm_info := mp_mm_info + mm_info := mp_mm_info, + sgsap_enable := mp_sgsap_enable }; return pars; } @@ -517,8 +523,10 @@ connect(vc_conn:SMPP, vc_SMPP:SMPP_CLIENT); connect(vc_conn:SMPP_PROC, vc_SMPP:SMPP_PROC); /* SGs part */ - connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); - connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + if (mp_sgsap_enable == true) { + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ -- To view, visit https://gerrit.osmocom.org/12477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 Gerrit-Change-Number: 12477 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 19:56:09 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 7 Jan 2019 19:56:09 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12365/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12365/2/src/libmsc/gsm_04_08.c at 802 PS2, Line 802: gsm48_mi_type_name Let's wait for https://gerrit.osmocom.org/#/c/libosmocore/+/12468/ to be merged and use osmo_mi_name()? -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 19:56:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 23:04:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 23:04:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: make sgsap interface optional In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12477 ) Change subject: MSC_Tests: make sgsap interface optional ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 Gerrit-Change-Number: 12477 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Assignee: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 07 Jan 2019 23:04:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 7 23:04:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 Jan 2019 23:04:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: make sgsap interface optional In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12477 ) Change subject: MSC_Tests: make sgsap interface optional ...................................................................... MSC_Tests: make sgsap interface optional At the moment the sgsap always enabled in the testsuite. This means the testsuite will try to connect the SGs interface of osmo-msc on initalization. If the connection fails, the testcase will fail also. Unfortunately the related patches that add the SGs interface to osmo-msc are not yet merged to master. This causes almost all testcases to fail, so lets have the SGs interface as an option that we can switch on when the SGs interface patches are merged to master. Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 Related: OS#3645 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 18 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 735cd21..7b88192 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -72,7 +72,8 @@ charstring ipa_ctrl_ip, integer ipa_ctrl_port, boolean ipa_ctrl_enable, - boolean mm_info + boolean mm_info, + boolean sgsap_enable }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -137,8 +138,11 @@ activate(as_Tguard()); /* Route all SMPP messages for our MSISDN to us */ f_create_smpp_expect(hex2str(pars.msisdn)); + /* Route all SGs message for our IMSI to us */ - f_create_sgsap_expect(pars.imsi); + if (g_pars.sgsap_enable == true) { + f_create_sgsap_expect(pars.imsi); + } if (g_pars.ipa_ctrl_enable == true) { f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index bf703e6..96ddc8d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -119,6 +119,8 @@ charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; charstring mp_vlr_name := "vlr.example.net"; + boolean mp_sgsap_enable := false; + BSSAP_Configurations mp_bssap_cfg := { { sccp_service_type := "mtp3_itu", @@ -277,7 +279,10 @@ f_init_mgcp("MSC_Test"); f_init_gsup("MSC_Test"); f_init_smpp("MSC_Test"); - f_init_sgsap("MSC_Test"); + + if (mp_sgsap_enable == true) { + f_init_sgsap("MSC_Test"); + } map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -491,7 +496,8 @@ ipa_ctrl_ip := mp_msc_ip, ipa_ctrl_port := mp_msc_ctrl_port, ipa_ctrl_enable := true, - mm_info := mp_mm_info + mm_info := mp_mm_info, + sgsap_enable := mp_sgsap_enable }; return pars; } @@ -517,8 +523,10 @@ connect(vc_conn:SMPP, vc_SMPP:SMPP_CLIENT); connect(vc_conn:SMPP_PROC, vc_SMPP:SMPP_PROC); /* SGs part */ - connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); - connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + if (mp_sgsap_enable == true) { + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ -- To view, visit https://gerrit.osmocom.org/12477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 Gerrit-Change-Number: 12477 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Assignee: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 7 23:58:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 7 Jan 2019 23:58:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,sysmo,True_#1144?= Message-ID: <402080850.461.1546905538841.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 30.34 KB...] checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for library containing clock_gettime... none required checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.186-45f8 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc16gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm29205.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm29118.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/gsup_sms.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc64gen.c GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c make install-am make[3]: Entering directory ' CC timer_clockgettime.lo CC timer.lo CC timer_gettimeofday.lo CC select.lo CC signal.lo CC msgb.lo CC bitvec.lo CC bits.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo /bin/bash: line 2: 2168 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT macaddr.lo -MD -MP -MF $depbase.Tpo -c -o macaddr.lo macaddr.c Makefile:560: recipe for target 'macaddr.lo' failed make[3]: *** [macaddr.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:664: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 8 07:30:50 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 8 Jan 2019 07:30:50 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_?= =?UTF-8?Q?=C2=BB_master,0,osmocom-master-debian9,sysmo,True_#1145?= In-Reply-To: <402080850.461.1546905538841.JavaMail.jenkins@jenkins.osmocom.org> References: <402080850.461.1546905538841.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1996226570.475.1546932650837.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:05:52 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 8 Jan 2019 09:05:52 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update shared helper In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12473 ) Change subject: ctrl2cgi: update shared helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Gerrit-Change-Number: 12473 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 08 Jan 2019 09:05:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:26:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 09:26:45 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update shared helper In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12473 ) Change subject: ctrl2cgi: update shared helper ...................................................................... ctrl2cgi: update shared helper * split hash generation into simpler functions * move them into helper file * split log init into separate function This facilitates code sharing with new version of ctrl2cgi proxy in folow-up patches. Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Related: SYS#4399 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py 2 files changed, 32 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 3e80c6d..d942cd2 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -22,7 +22,7 @@ */ """ -import sys, os, datetime, signal, logging, logging.handlers +import hashlib, sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.osmo_ipa import Ctrl @@ -95,16 +95,39 @@ sys.argv.remove(dbg2) os.execl(path, script, *sys.argv[1:]) +def add_keys(inp, params, l): + """ + Add given list of keys to input string. + """ + for key in l: + inp += str(params.get(key)) + return inp + +def gen_hash(params, skey): + """ + Make mandatory parameter for HTTP request. + """ + inp = add_keys('', params, ['time_stamp', 'position_validity', 'admin_status', 'policy_status']) + inp += skey + inp = add_keys(inp, params, ['bsc_id', 'lat', 'lon', 'position_validity']) + m = hashlib.md5() + m.update(inp.encode('utf-8')) + return m.hexdigest() + +def log_init(name, is_debug): + """ + Initialize stdout logging. + """ + log = logging.getLogger(name) + log.setLevel(logging.DEBUG if is_debug else logging.INFO) + log.addHandler(logging.StreamHandler(sys.stdout)) + return log + def debug_init(name, is_debug): """ Initialize signal handlers and logging """ - log = logging.getLogger(name) - if is_debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.StreamHandler(sys.stdout)) + log = log_init(name, is_debug) reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() signal.signal(signal.SIGHUP, reboot) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index bb5c93e..95ff788 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.1.0" # bump this on every non-trivial change +__version__ = "0.1.1" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -32,7 +32,7 @@ from distutils.version import StrictVersion as V from twisted.internet import defer, reactor from treq import post, collect -from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, gen_hash, make_params, comm_proc from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl @@ -57,21 +57,6 @@ log_duration(log, bid, ts, ts_http) comm_proc(decoded.get('commands'), bid, f, log) -def gen_hash(params, skey): - """ - Make mandatory parameter for http request - """ - inp = '' - for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: - inp += str(params.get(key)) - inp += skey - for key in ['bsc_id', 'lat', 'lon', 'position_validity']: - inp += str(params.get(key)) - m = hashlib.md5() - m.update(inp.encode('utf-8')) - res = m.hexdigest() - return res - def make_async_req(ts, dst, par, f_write, f_log, tout): """ Assemble deferred request parameters and partially instantiate response handler -- To view, visit https://gerrit.osmocom.org/12473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Gerrit-Change-Number: 12473 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:46:13 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 09:46:13 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12468/3/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12468/3/src/gsm/gsm48.c at 468 PS3, Line 468: return "unknown"; I'd prefer this capitalized just to make it more visible in the logs. -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 09:46:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:51:09 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Jan 2019 09:51:09 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 09:51:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:55:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 09:55:45 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12302 to look at the new patch set (#2). Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... msc_vty.c: make check-imei-rqd configurable Related: OS#3189 Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 --- M src/libmsc/msc_vty.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12302/2 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:55:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 09:55:46 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12478 Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 245 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 029ef31..bf2f9fc 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -65,6 +65,8 @@ VLR_ULA_E_ID_IMSI, /* IMSI recieved from MS */ VLR_ULA_E_ID_IMEI, /* IMEI received from MS */ VLR_ULA_E_ID_IMEISV, /* IMEISV received from MS */ + VLR_ULA_E_HLR_IMEI_ACK, /* Check_IMEI_VLR result from HLR */ + VLR_ULA_E_HLR_IMEI_NACK,/* Check_IMEI_VLR result from HLR */ VLR_ULA_E_HLR_LU_RES, /* HLR UpdateLocation result */ VLR_ULA_E_UPD_HLR_COMPL,/* UpdatE_HLR_VLR result */ VLR_ULA_E_LU_COMPL_SUCCESS,/* Location_Update_Completion_VLR result */ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 7de78bf..ac340d1 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -642,6 +642,32 @@ return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } +/* Initiate Check_IMEI_VLR Procedure (23.018 Chapter 7.1.2.9). + * Send the IMEI and wait for ACK. Usually the EIR receives and answers this and checks the device + * against a white/grey/blacklist. As of writing, there is no EIR in the Osmocom stack, but HLR + * handles the request instead and always replies with ACK. It is theoretically able to save the + * IMEI to the HLR DB as side effect (OS#2541). */ +int vlr_subscr_tx_req_check_imei(const struct vlr_subscr *vsub) +{ + struct osmo_gsup_message gsup_msg = {0}; + uint8_t imei_enc[GSM23003_IMEI_NUM_DIGITS+2] = {0}; + int len; + + /* Encode IMEI */ + len = gsm48_encode_bcd_number(imei_enc, sizeof(imei_enc), 0, vsub->imei); + if (len < 1) { + LOGVSUBP(LOGL_ERROR, vsub, "Error: cannot encode IMEI '%s'\n", vsub->imei); + return -ENOSPC; + } + gsup_msg.imei_enc = imei_enc; + gsup_msg.imei_enc_len = len; + + /* Send CHECK_IMEI_REQUEST */ + gsup_msg.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST; + OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); + return vlr_tx_gsup_message(vsub->vlr, &gsup_msg); +} + /* Tell HLR that authentication failure occurred */ int vlr_subscr_tx_auth_fail_rep(const struct vlr_subscr *vsub) { @@ -976,6 +1002,39 @@ return rc; } +/* Handle Check_IMEI_VLR error from HLR */ +static int vlr_subscr_handle_check_imei_err(struct vlr_subscr *vsub, + const struct osmo_gsup_message *gsup) +{ + if (!vsub->lu_fsm) { + LOGVSUBP(LOGL_ERROR, vsub, "Rx GSUP Check_IMEI_VLR error without LU in progress\n"); + return -ENODEV; + } + + LOGVSUBP(LOGL_DEBUG, vsub, "Check_IMEI_VLR failed; gmm_cause: %s\n", + get_value_string(gsm48_gmm_cause_names, gsup->cause)); + + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_LU_COMPL_FAILURE, (void *)&gsup->cause); + return 0; +} + +/* Handle Check_IMEI_VLR result from HLR */ +static int vlr_subscr_handle_check_imei_res(struct vlr_subscr *vsub, + const struct osmo_gsup_message *gsup) +{ + if (!vsub->lu_fsm) { + LOGVSUBP(LOGL_ERROR, vsub, "Rx GSUP Check_IMEI_VLR result without LU in progress\n"); + return -ENODEV; + } + + if (gsup->imei_result == OSMO_GSUP_IMEI_RESULT_ACK) + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_ACK, (void *)&gsup->cause); + else + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_NACK, (void *)&gsup->cause); + + return 0; +} + /* Incoming handler for GSUP from HLR. * Keep this function non-static for direct invocation by unit tests. */ int vlr_gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg) @@ -1045,6 +1104,12 @@ gsup.message_type); rc = -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL; break; + case OSMO_GSUP_MSGT_CHECK_IMEI_ERROR: + rc = vlr_subscr_handle_check_imei_err(vsub, &gsup); + break; + case OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: + rc = vlr_subscr_handle_check_imei_res(vsub, &gsup); + break; default: /* Forward message towards MSC */ rc = vlr->ops.forward_gsup_msg(vsub, &gsup); diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index d336b1b..b28a40a 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -8,6 +8,7 @@ int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); +int vlr_subscr_tx_req_check_imei(const struct vlr_subscr *vsub); struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); void vlr_subscr_update_tuples(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index b00f8ce..6791f34 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -652,6 +652,8 @@ OSMO_VALUE_STRING(VLR_ULA_E_ID_IMSI), OSMO_VALUE_STRING(VLR_ULA_E_ID_IMEI), OSMO_VALUE_STRING(VLR_ULA_E_ID_IMEISV), + OSMO_VALUE_STRING(VLR_ULA_E_HLR_IMEI_ACK), + OSMO_VALUE_STRING(VLR_ULA_E_HLR_IMEI_NACK), OSMO_VALUE_STRING(VLR_ULA_E_HLR_LU_RES), OSMO_VALUE_STRING(VLR_ULA_E_UPD_HLR_COMPL), OSMO_VALUE_STRING(VLR_ULA_E_LU_COMPL_SUCCESS), @@ -1228,9 +1230,17 @@ LU_COMPL_VLR_E_NEW_TMSI_ACK, NULL); break; case VLR_ULA_E_ID_IMEI: + /* Got the IMEI from ME, now send it to HLR */ + vlr_subscr_tx_req_check_imei(lfp->vsub); + break; + case VLR_ULA_E_HLR_IMEI_ACK: osmo_fsm_inst_dispatch(lfp->lu_compl_vlr_fsm, LU_COMPL_VLR_E_IMEI_CHECK_ACK, NULL); break; + case VLR_ULA_E_HLR_IMEI_NACK: + osmo_fsm_inst_dispatch(lfp->lu_compl_vlr_fsm, + LU_COMPL_VLR_E_IMEI_CHECK_NACK, NULL); + break; case VLR_ULA_E_LU_COMPL_SUCCESS: lu_fsm_discard_lu_compl_fsm(fi); @@ -1361,7 +1371,9 @@ S(VLR_ULA_E_LU_COMPL_FAILURE) | S(VLR_ULA_E_NEW_TMSI_ACK) | S(VLR_ULA_E_ID_IMEI) | - S(VLR_ULA_E_ID_IMEISV), + S(VLR_ULA_E_ID_IMEISV) | + S(VLR_ULA_E_HLR_IMEI_ACK) | + S(VLR_ULA_E_HLR_IMEI_NACK), .out_state_mask = S(VLR_ULA_S_DONE), .name = OSMO_STRINGIFY(VLR_ULA_S_WAIT_LU_COMPL), .action = lu_fsm_wait_lu_compl, diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 46dd9a1..4174fe2 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -573,9 +573,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -676,9 +680,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index e834e91..f2462f1 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1234,16 +1234,26 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for MSISDN:46071 -DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1255,11 +1265,12 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF MSISDN:46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr MSISDN:46071 usage increases to: 3 -DREF VLR subscr MSISDN:46071 usage decreases to: 2 +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF MSISDN:46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1463,20 +1474,29 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for MSISDN:46071, with TMSI 0x03020100 -DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index a641ec2..b7543da 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -553,9 +553,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -758,9 +762,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 69ad9a2..70663bc 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1178,16 +1178,26 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for MSISDN:46071 -DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1199,11 +1209,12 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF MSISDN:46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr MSISDN:46071 usage increases to: 3 -DREF VLR subscr MSISDN:46071 usage decreases to: 2 +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF MSISDN:46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1633,20 +1644,29 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for MSISDN:46071, with TMSI 0x03020100 -DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 3162149..d52d3d6 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -428,11 +428,15 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); /* 3GPP TS 23.003: 6.2.1 Composition of IMEI: the IMEI ends with a * spare digit that shall be sent as zero by the MS. */ ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -499,9 +503,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); @@ -652,9 +660,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -874,9 +886,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f865d87..7d00eff 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -913,16 +913,26 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for MSISDN:46071 -DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -934,11 +944,12 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF MSISDN:46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr MSISDN:46071 usage increases to: 3 -DREF VLR subscr MSISDN:46071 usage decreases to: 2 +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF MSISDN:46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1094,20 +1105,29 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for MSISDN:46071, with TMSI 0x03020100 -DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 @@ -1486,16 +1506,26 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for MSISDN:46071 -DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1507,11 +1537,12 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF MSISDN:46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr MSISDN:46071 usage increases to: 3 -DREF VLR subscr MSISDN:46071 usage decreases to: 2 +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF MSISDN:46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -2047,20 +2078,29 @@ DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for MSISDN:46071, with TMSI 0x03020100 -DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:57:43 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 09:57:43 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 245 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/2 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:59:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 09:59:03 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12302 to look at the new patch set (#3). Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... msc_vty.c: make check-imei-rqd configurable Related: OS#3189 Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 --- M src/libmsc/msc_vty.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12302/3 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 09:59:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 09:59:03 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 245 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/3 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 10:05:29 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 10:05:29 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11746 to look at the new patch set (#4). Change subject: Store subscriber's cell identity ...................................................................... Store subscriber's cell identity It's defined similar to LAC and could be potentially useful for constructing GCR for LCLS. Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Related: OS#2487 --- M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_tests.c 6 files changed, 20 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/11746/4 -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 10:17:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 10:17:09 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#4). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/test_nodes.vty 11 files changed, 246 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/4 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 10:18:16 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 10:18:16 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12302 to look at the new patch set (#4). Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... msc_vty.c: make check-imei-rqd configurable Related: OS#3189 Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12302/4 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 10:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 10:35:04 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Patch Set 4: Code-Review-1 It's good that it's posted as a reference point for future libosmocore implementation but I don't see a pressing need to get this merge into master just to get it removed some time later. We might as well keep it WIP and wait for "some time later" to merge the proper version right away. -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 10:35:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:13:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 11:13:36 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#6). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 245 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/6 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:13:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 11:13:37 +0000 Subject: Change in osmo-msc[master]: vlr_core.h: remove duplicate declarations Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12479 Change subject: vlr_core.h: remove duplicate declarations ...................................................................... vlr_core.h: remove duplicate declarations Remove vlr_subscr_name() and vlr_subscr_alloc() declarations from vlr_core.h, as they are already defined in osmocom/msc/vlr.h and vlr.h gets included on top of vlr_core.h. Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 --- M src/libvlr/vlr_core.h 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/12479/1 diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index d336b1b..c249dff 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -4,10 +4,8 @@ struct osmo_gsup_message; -const char *vlr_subscr_name(struct vlr_subscr *vsub); int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); -struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); void vlr_subscr_update_tuples(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup); -- To view, visit https://gerrit.osmocom.org/12479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 Gerrit-Change-Number: 12479 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:13:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 11:13:37 +0000 Subject: Change in osmo-msc[master]: VLR: vlr_subscr_{, msisdn_or_}name: const vsub arg Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12480 Change subject: VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg ...................................................................... VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg Make the vsub argument of both vlr_subscr_msisdn_or_name() and vlr_subscr_name() a const. The LOGVSUBP() macro uses vlr_subscr_name() and will not generate a warning anymore when used with a const vsub. Change-Id: If609269191f4df6186d823a2eee14012846328e2 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/12480/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 029ef31..b328b70 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -330,8 +330,8 @@ uint32_t parent_event_failure); -const char *vlr_subscr_name(struct vlr_subscr *vsub); -const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub); +const char *vlr_subscr_name(const struct vlr_subscr *vsub); +const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub); #define vlr_subscr_find_by_imsi(vlr, imsi) \ _vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__) diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 7de78bf..b0e7f79 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -79,7 +79,7 @@ } /* return static buffer with printable name of VLR subscriber */ -const char *vlr_subscr_name(struct vlr_subscr *vsub) +const char *vlr_subscr_name(const struct vlr_subscr *vsub) { static char buf[32]; if (!vsub) @@ -98,7 +98,7 @@ return buf; } -const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub) +const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub) { if (!vsub || !vsub->msisdn[0]) return vlr_subscr_name(vsub); -- To view, visit https://gerrit.osmocom.org/12480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If609269191f4df6186d823a2eee14012846328e2 Gerrit-Change-Number: 12480 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:21:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 11:21:08 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12476 to look at the new patch set (#3). Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Add initial version of asyncio trap2cgi script It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399 --- M README A contrib/systemd/osmo-trap2cgi.service A scripts/osmo_trap2cgi.py M setup.py 4 files changed, 246 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/76/12476/3 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:32:38 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Jan 2019 11:32:38 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: Fix nullpointer deref Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12481 Change subject: gsm_04_08: Fix nullpointer deref ...................................................................... gsm_04_08: Fix nullpointer deref The pointers conn, conn->vsub and conn->vsub->last_tuple are checked, but before the check those pointers are already dereferenced during assignment. This defeats the purpose of the check. Lets dereference those pointers after the check. Fixes: CID#190404 Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e --- M src/libmsc/gsm_04_08.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12481/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7ff8681..d45de16 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1596,12 +1596,12 @@ int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { - struct gsm_network *net = conn->network; + struct gsm_network *net; struct gsm0808_encrypt_info ei; int i, j = 0; int request_classmark = 0; int request_classmark_for_a5_n = 0; - struct vlr_auth_tuple *tuple = conn->vsub->last_tuple; + struct vlr_auth_tuple *tuple; if (!conn || !conn->vsub || !conn->vsub->last_tuple) { /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() @@ -1610,6 +1610,9 @@ return -EINVAL; } + net = conn->network; + tuple = conn->vsub->last_tuple; + for (i = 0; i < 8; i++) { int supported; -- To view, visit https://gerrit.osmocom.org/12481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e Gerrit-Change-Number: 12481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:39:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 11:39:59 +0000 Subject: Change in osmo-msc[master]: VLR: vlr_subscr_{, msisdn_or_}name: const vsub arg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12480 ) Change subject: VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If609269191f4df6186d823a2eee14012846328e2 Gerrit-Change-Number: 12480 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 11:39:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:40:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 11:40:15 +0000 Subject: Change in osmo-msc[master]: vlr_core.h: remove duplicate declarations In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12479 ) Change subject: vlr_core.h: remove duplicate declarations ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 Gerrit-Change-Number: 12479 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 11:40:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 11:41:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 11:41:08 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: Fix nullpointer deref In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12481 ) Change subject: gsm_04_08: Fix nullpointer deref ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e Gerrit-Change-Number: 12481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 11:41:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:00:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 12:00:06 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 12: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11920/12/src/libmsc/gsm_04_11_gsup.c File src/libmsc/gsm_04_11_gsup.c: https://gerrit.osmocom.org/#/c/11920/12/src/libmsc/gsm_04_11_gsup.c at 205 PS12, Line 205: int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr) trans is not modified by this function so it should be const. https://gerrit.osmocom.org/#/c/11920/12/src/libmsc/gsm_04_11_gsup.c at 221 PS12, Line 221: int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, Here as well. -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 08 Jan 2019 12:00:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:12:47 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Jan 2019 12:12:47 +0000 Subject: Change in osmo-bsc[master]: paging: fix nullpointer deref Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12482 Change subject: paging: fix nullpointer deref ...................................................................... paging: fix nullpointer deref In theroy the finction T_def_get_entry() may return a nullpointer. In this case we would run straight into a nullpointer dereference problem. However, the requested timer is statically defined and should always be there. However Coverity still reports this as a problem. Lets put an OSMO_ASSERT to make clear that there is no problem here. Fixes: CID#190403 Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 --- M src/osmo-bsc/paging.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/12482/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 2c9d5cd..066db1c 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -296,6 +296,11 @@ unsigned int to_us, to; struct T_def *d = T_def_get_entry(bts->network->T_defs, 3113); + /* Note: d should always contain a valid pointer since all timers, + * including 3113 are statically pre-defined in + * struct T_def gsm_network_T_defs. */ + OSMO_ASSERT(d); + if (!bts->T3113_dynamic) return d->val; -- To view, visit https://gerrit.osmocom.org/12482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 Gerrit-Change-Number: 12482 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 8 Jan 2019 12:21:05 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 12: > Patch Set 12: Code-Review-1 Sorry, but I don't think that missing 'const' is critical here. Is there any rule in Osmocom that we have to use 'const' everywhere? -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 08 Jan 2019 12:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:24:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 12:24:59 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err File tests/msc_vlr/msc_vlr_test_hlr_reject.err: https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err at 12 PS1, Line 12: DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH Seems like we log duplicated information now. -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 12:24:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:26:29 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 12:26:29 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 12: > Is there any rule in Osmocom that we have to use 'const' everywhere? If there isn't than we should make one: I don't see any advantage in making code less readable by not using const for const pointers. -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 08 Jan 2019 12:26:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:51:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 12:51:15 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12375 ) Change subject: LCLS: don't encode incorrect values ...................................................................... Patch Set 2: (1 comment) Addressed in latest revision. https://gerrit.osmocom.org/#/c/12375/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12375/1/src/gsm/gsm0808.c at 340 PS1, Line 340: if (status >= GSM0808_LCLS_STS_NA) > I'm not sure this is worth it. [?] Done -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 08 Jan 2019 12:51:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:51:37 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 8 Jan 2019 12:51:37 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11746/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11746/4//COMMIT_MSG at 7 PS4, Line 7: Store Please clarify *where*, for example: libmsc/ran_conn.h: store subscriber's cell identity Store subscriber's cell identity in ran_conn Otherwise one can assume that it's stored in VLR. -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 12:51:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 12:54:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 8 Jan 2019 12:54:29 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11746/4/src/libmsc/iucs.c File src/libmsc/iucs.c: https://gerrit.osmocom.org/#/c/11746/4/src/libmsc/iucs.c at 59 PS4, Line 59: /* FIXME: is there equivalent for CI? */ https://en.wikipedia.org/wiki/Cell_ID -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 12:54:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 13:17:02 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 8 Jan 2019 13:17:02 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 29: (4 comments) https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h at 216 PS29, Line 216: RAN_CONN_USE_SGs_SERVICE Missing comma. https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h at 114 PS29, Line 114: struct vlr_subscr; Why do we need this? I don't see any references to this struct. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c at 455 PS29, Line 455: ws https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 119 PS29, Line 119: Note I think this note should precede the function definition. -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 13:17:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 13:52:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 13:52:17 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12483 Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... LCLS: add status parameter to Assignment Completed message * add gsm0808_create_ass_compl2() with additional gsm0808_lcls_status parameter and make gsm0808_create_ass_compl() into trivial wrapper around it * update tests accordingly Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 4 files changed, 42 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/12483/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index ac88748..3c6896e 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -76,6 +76,12 @@ const struct gsm0808_speech_codec *sc, const struct gsm0808_speech_codec_list *scl); +struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel, + uint8_t encr_alg_id, uint8_t speech_mode, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec *sc, + const struct gsm0808_speech_codec_list *scl, + enum gsm0808_lcls_status lcls_bss_status); struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 59b1657..ebb453a 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -519,7 +519,7 @@ return gsm0808_create_ass2(ct, cic, ss, scl, ci, NULL, NULL); } -/*! Create BSSMAP Assignment Completed message +/*! Create BSSMAP Assignment Completed message as per 3GPP TS 48.008 ?3.2.1.2 * \param[in] rr_cause GSM 04.08 RR Cause value * \param[in] chosen_channel Chosen Channel * \param[in] encr_alg_id Encryption Algorithm ID @@ -527,13 +527,14 @@ * \param[in] ss Socket Address of BSS-side RTP socket * \param[in] sc Speech Codec (current) * \param[in] scl Speech Codec List (permitted) + * \param[in] lcls_bss_status ?3.2.2.119 LCLS-BSS-Status, optional * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ -struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, +struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode, const struct sockaddr_storage *ss, const struct gsm0808_speech_codec *sc, - const struct gsm0808_speech_codec_list - *scl) + const struct gsm0808_speech_codec_list *scl, + enum gsm0808_lcls_status lcls_bss_status) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: ass compl"); @@ -570,7 +571,11 @@ if (scl) gsm0808_enc_speech_codec_list(msg, scl); - /* write LSA identifier 3.2.2.15 */ + /* FIXME: write LSA identifier 3.2.2.15 - see 3GPP TS 43.073 */ + + /* LCLS-BSS-Status 3.2.2.119 */ + if (lcls_bss_status < GSM0808_LCLS_STS_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, lcls_bss_status); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -582,14 +587,33 @@ * \param[in] chosen_channel Chosen Channel * \param[in] encr_alg_id Encryption Algorithm ID * \param[in] speech_mode Speech Mode + * \param[in] ss Socket Address of BSS-side RTP socket + * \param[in] sc Speech Codec (current) + * \param[in] scl Speech Codec List (permitted) + * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ +struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, + uint8_t encr_alg_id, uint8_t speech_mode, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec *sc, + const struct gsm0808_speech_codec_list *scl) +{ + return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id, speech_mode, + ss, sc, scl, GSM0808_LCLS_STS_NA); +} + +/*! Create BSSMAP Assignment Completed message + * \param[in] rr_cause GSM 04.08 RR Cause value + * \param[in] chosen_channel Chosen Channel + * \param[in] encr_alg_id Encryption Algorithm ID + * \param[in] speech_mode Speech Mode * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode) { - return gsm0808_create_ass_compl(rr_cause, chosen_channel, encr_alg_id, - speech_mode, NULL, NULL, NULL); + return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id, + speech_mode, NULL, NULL, NULL, GSM0808_LCLS_STS_NA); } /*! Create BSSMAP Assignment Failure message diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bb97878..bed66d9 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -153,6 +153,7 @@ gsm0808_create_ass2; gsm0808_create_assignment_completed; gsm0808_create_ass_compl; +gsm0808_create_ass_compl2; gsm0808_create_assignment_failure; gsm0808_create_ass_fail; gsm0808_create_cipher; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 40e2b87..79f7145 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -514,7 +514,8 @@ GSM0808_IE_AOIP_TRASP_ADDR, 0x06, 0xc0, 0xa8, 0x64, 0x17, 0x04, 0xd2, GSM0808_IE_SPEECH_CODEC, 0x01, GSM0808_SCT_HR1 | 0x90, GSM0808_IE_SPEECH_CODEC_LIST, 0x07, GSM0808_SCT_FR3 | 0x50, 0xef, - 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0 }; + 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0, + GSM0808_IE_LCLS_BSS_STATUS, GSM0808_LCLS_STS_LOCALLY_SWITCHED }; struct msgb *msg; memset(&sin, 0, sizeof(sin)); @@ -533,8 +534,8 @@ setup_codec_list(&sc_list); printf("Testing creating Assignment Complete (AoIP)\n"); - msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22, - &ss, &sc, &sc_list); + msg = gsm0808_create_ass_compl2(0x23, 0x42, 0x11, 0x22, + &ss, &sc, &sc_list, GSM0808_LCLS_STS_LOCALLY_SWITCHED); VERIFY(msg, res, ARRAY_SIZE(res)); msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 13:52:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 13:52:36 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12484 Change subject: msgb: fix debug print ...................................................................... msgb: fix debug print Since osmo_hexdump() use static buffers we can't re-use pointers to it after subsequent osmo_hexdump() calls. Let's print data used for comparison directly instead. Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 --- M src/msgb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/12484/1 diff --git a/src/msgb.c b/src/msgb.c index 9cd59c6..3902f6e 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -260,7 +260,7 @@ } else LOGPC(DLGLOBAL, LOGL_FATAL, ".. "); - LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", m_dump); + LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", osmo_hexdump(m_data, len)); return false; } -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:04:27 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:04:27 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12483 ) Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 14:04:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:07:08 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 14:07:08 +0000 Subject: Change in libosmocore[master]: add osmo_mi_name(), for MI-to-string like "IMSI-123456" In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12468 ) Change subject: add osmo_mi_name(), for MI-to-string like "IMSI-123456" ...................................................................... add osmo_mi_name(), for MI-to-string like "IMSI-123456" We have gsm48_mi_to_string() and osmo_bcd2str(), but still lack a function that conveniently prints both MI type and value in one function call. Related: http://people.osmocom.org/neels/mi_mi_mi.jpg Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 5 files changed, 82 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index 2b14e6c..0f5727a 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -53,6 +53,7 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len); const char *gsm48_mi_type_name(uint8_t mi); +const char *osmo_mi_name(const uint8_t *mi, uint8_t mi_len); /* Parse Routeing Area Identifier */ void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf); diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 190622f..853ea51 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -433,6 +433,42 @@ return get_value_string(mi_type_names, mi); } +/*! Return a human readable representation of a Mobile Identity in static buffer. + * \param[in] mi Mobile Identity buffer containing 3GPP TS 04.08 style MI type and data. + * \param[in] mi_len Length of mi. + * \return A string like "IMSI-1234567", "TMSI-0x1234ABCD" or "unknown", "TMSI-invalid"... + */ +const char *osmo_mi_name(const uint8_t *mi, uint8_t mi_len) +{ + static char mi_name[10 + GSM48_MI_SIZE + 1]; + uint8_t mi_type; + uint32_t tmsi; + char mi_string[GSM48_MI_SIZE]; + + mi_type = (mi && mi_len) ? (mi[0] & GSM_MI_TYPE_MASK) : GSM_MI_TYPE_NONE; + + switch (mi_type) { + case GSM_MI_TYPE_TMSI: + /* Table 10.5.4.3, reverse generate_mid_from_tmsi */ + if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) { + tmsi = osmo_load32be(&mi[1]); + snprintf(mi_name, sizeof(mi_name), "TMSI-0x%08" PRIX32, tmsi); + return mi_name; + } + return "TMSI-invalid"; + + case GSM_MI_TYPE_IMSI: + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMEISV: + osmo_bcd2str(mi_string, sizeof(mi_string), mi, 1, (mi_len * 2) - (mi[0] & GSM_MI_ODD ? 0 : 1), true); + snprintf(mi_name, sizeof(mi_name), "%s-%s", gsm48_mi_type_name(mi_type), mi_string); + return mi_name; + + default: + return "unknown"; + } +} + /*! Checks is particular message is cipherable in A/Gb mode according to * 3GPP TS 24.008 ? 4.7.1.2 * \param[in] hdr Message header diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bb97878..8b7a164 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -325,6 +325,7 @@ gsm48_set_dtx; gsm48_dtx_mode; gsm48_mi_type_name; +osmo_mi_name; gsm48_mcc_mnc_to_bcd; gsm48_mcc_mnc_from_bcd; gsm48_generate_lai2; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 9bb320d..37ef3f1 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -355,6 +355,7 @@ struct test_mid_encode_decode_test { uint8_t mi_type; const char *mi_str; + const char *mi_name; size_t str_size; const char *expect_mi_tlv_hex; const char *expect_str; @@ -365,31 +366,37 @@ { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "123456789012345", + .mi_name = "IMSI-123456789012345", .expect_mi_tlv_hex = "17081932547698103254", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "12345678901234", + .mi_name = "IMSI-12345678901234", .expect_mi_tlv_hex = "170811325476981032f4", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "423423", + .mi_name = "IMSI-423423", .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, .mi_str = "423423", + .mi_name = "IMSI-423423", .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "4234235", + .mi_name = "IMSI-4234235", .expect_mi_tlv_hex = "170449322453", }, { .mi_type = GSM_MI_TYPE_IMSI, .mi_str = "4234235", + .mi_name = "IMSI-4234235", .expect_mi_tlv_hex = "170449322453", .str_size = 4, .expect_str = "423", @@ -397,26 +404,31 @@ { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "123456789012345", + .mi_name = "IMEI-123456789012345", .expect_mi_tlv_hex = "17081a32547698103254", }, { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "98765432109876", + .mi_name = "IMEI-98765432109876", .expect_mi_tlv_hex = "170892785634129078f6", }, { .mi_type = GSM_MI_TYPE_IMEI, .mi_str = "987654321098765", + .mi_name = "IMEI-987654321098765", .expect_mi_tlv_hex = "17089a78563412907856", }, { .mi_type = GSM_MI_TYPE_IMEISV, .mi_str = "987654321098765432", + .mi_name = "IMEI-SV-987654321098765432", .expect_mi_tlv_hex = "170a937856341290785634f2", }, { .mi_type = GSM_MI_TYPE_IMEISV, .mi_str = "987654321098765432", + .mi_name = "IMEI-SV-987654321098765432", .expect_mi_tlv_hex = "170a937856341290785634f2", .str_size = 16, .expect_str = "987654321098765", @@ -425,18 +437,21 @@ /* gsm48 treats TMSI as decimal string */ .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "305419896", /* 0x12345678 as decimal */ + .mi_name = "TMSI-0x12345678", .expect_mi_tlv_hex = "1705f412345678", .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "12648430", /* 0xc0ffee as decimal */ + .mi_name = "TMSI-0x00C0FFEE", .expect_mi_tlv_hex = "1705f400c0ffee", .expect_rc = 8, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "0", + .mi_name = "TMSI-0x00000000", .expect_mi_tlv_hex = "1705f400000000", .expect_rc = 1, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ }, @@ -444,6 +459,7 @@ /* gsm48 treats TMSI as decimal string */ .mi_type = GSM_MI_TYPE_TMSI, .mi_str = "305419896", /* 0x12345678 as decimal */ + .mi_name = "TMSI-0x12345678", .expect_mi_tlv_hex = "1705f412345678", .str_size = 5, .expect_str = "3054", @@ -452,18 +468,21 @@ { .mi_type = GSM_MI_TYPE_NONE, .mi_str = "123", + .mi_name = "unknown", .expect_mi_tlv_hex = "17021832", /* encoding invalid MI type */ .expect_str = "", }, { .mi_type = GSM_MI_TYPE_NONE, .mi_str = "1234", + .mi_name = "unknown", .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ .expect_str = "", }, { .mi_type = GSM_MI_ODD, .mi_str = "1234", + .mi_name = "unknown", .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ .expect_str = "", }, @@ -512,6 +531,13 @@ if (rc != expect_rc) printf(" ERROR: expected rc=%d\n", expect_rc); + if (t->mi_name) { + const char *mi_name = osmo_mi_name(mi_buf, mi_len); + printf(" -> MI-name=%s\n", osmo_quote_str(mi_name, -1)); + if (strcmp(mi_name, t->mi_name)) + printf(" ERROR: expected MI-name=%s\n", osmo_quote_str(t->mi_name, -1)); + } + /* Now make sure the resulting string is always '\0' terminated. * The above started out with a zeroed buffer, now repeat with a tainted one. */ str_len = strlen(str); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index d6579e5..0c13555 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -7,57 +7,75 @@ - IMSI 123456789012345 -> MI-TLV-hex='17081932547698103254' -> MI-str="123456789012345" rc=16 + -> MI-name="IMSI-123456789012345" - IMSI 12345678901234 -> MI-TLV-hex='170811325476981032f4' -> MI-str="12345678901234" rc=15 + -> MI-name="IMSI-12345678901234" - IMSI 423423 -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 + -> MI-name="IMSI-423423" - unknown 0x9 423423 -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 + -> MI-name="IMSI-423423" - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="4234235" rc=8 + -> MI-name="IMSI-4234235" - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="423" rc=4 + -> MI-name="IMSI-4234235" - IMEI 123456789012345 -> MI-TLV-hex='17081a32547698103254' -> MI-str="123456789012345" rc=16 + -> MI-name="IMEI-123456789012345" - IMEI 98765432109876 -> MI-TLV-hex='170892785634129078f6' -> MI-str="98765432109876" rc=15 + -> MI-name="IMEI-98765432109876" - IMEI 987654321098765 -> MI-TLV-hex='17089a78563412907856' -> MI-str="987654321098765" rc=16 + -> MI-name="IMEI-987654321098765" - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' -> MI-str="987654321098765432" rc=19 + -> MI-name="IMEI-SV-987654321098765432" - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' -> MI-str="987654321098765" rc=16 + -> MI-name="IMEI-SV-987654321098765432" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 + -> MI-name="TMSI-0x12345678" - TMSI 12648430 -> MI-TLV-hex='1705f400c0ffee' -> MI-str="12648430" rc=8 + -> MI-name="TMSI-0x00C0FFEE" - TMSI 0 -> MI-TLV-hex='1705f400000000' -> MI-str="0" rc=1 + -> MI-name="TMSI-0x00000000" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="3054" rc=9 + -> MI-name="TMSI-0x12345678" - NONE 123 -> MI-TLV-hex='17021832' -> MI-str="" rc=1 + -> MI-name="unknown" - NONE 1234 -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 + -> MI-name="unknown" - unknown 0x8 1234 -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 + -> MI-name="unknown" Decoding zero length Mobile Identities - MI type: IMSI -- To view, visit https://gerrit.osmocom.org/12468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 Gerrit-Change-Number: 12468 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:07:08 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 14:07:08 +0000 Subject: Change in libosmocore[master]: add osmo_lu_type_names[], osmo_lu_type_name() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12469 ) Change subject: add osmo_lu_type_names[], osmo_lu_type_name() ...................................................................... add osmo_lu_type_names[], osmo_lu_type_name() Move lupd_names[] from osmo-msc to libosmo-gsm. Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index a97225c..791fbd4 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1652,6 +1652,10 @@ #define GSM48_LUPD_IMSI_ATT 0x2 #define GSM48_LUPD_RESERVED 0x3 +extern const struct value_string osmo_lu_type_names[]; +static inline const char *osmo_lu_type_name(uint8_t lu_type) +{ return get_value_string(osmo_lu_type_names, lu_type); } + /* Table 10.5.4 */ #define GSM_MI_TYPE_MASK 0x07 #define GSM_MI_TYPE_NONE 0x00 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 853ea51..099b85d 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1137,4 +1137,12 @@ return gh; } +const struct value_string osmo_lu_type_names[] = { + { GSM48_LUPD_NORMAL, "NORMAL" }, + { GSM48_LUPD_PERIODIC, "PERIODIC" }, + { GSM48_LUPD_IMSI_ATT, "IMSI-ATTACH" }, + { GSM48_LUPD_RESERVED, "RESERVED" }, + {} +}; + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8b7a164..cdcbcc9 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -555,6 +555,7 @@ sgsap_ie_tlvdef; osmo_rat_type_names; +osmo_lu_type_names; local: *; }; -- To view, visit https://gerrit.osmocom.org/12469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ica25919758ef6cba8348da199b0ae7e0ba628798 Gerrit-Change-Number: 12469 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:14:25 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 14:14:25 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err File tests/msc_vlr/msc_vlr_test_hlr_reject.err: https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err at 12 PS1, Line 12: DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH > Seems like we log duplicated information now. yes. This patch generally adds context information to conn related logging. It doesn't change what the log strings contain. When a LU request comes in, we log the Mobile Identity and type; we could now remove the MI logging from the log string since it is already in the FSM id. But since this happens only once when a L3 complete request comes in, I'd just keep it. -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max Gerrit-Comment-Date: Tue, 08 Jan 2019 14:14:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 14:14:50 +0000 Subject: Change in osmo-bsc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12358 ) Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index c1ac6eb..fc34968 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -468,7 +468,8 @@ conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT, conn->network->mgw.client, conn->fi->id, - "%x at mgw", msc_assigned_cic); + "%x@%s", msc_assigned_cic, + mgcp_client_endpoint_domain(conn->network->mgw.client)); LOGPFSML(conn->fi, LOGL_DEBUG, "MGW endpoint name derived from CIC 0x%x: %s\n", msc_assigned_cic, mgw_endpoint_name(conn->user_plane.mgw_endpoint)); @@ -477,7 +478,7 @@ conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT, conn->network->mgw.client, conn->fi->id, - "rtpbridge/*@mgw"); + "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client)); } else { LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/12358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 Gerrit-Change-Number: 12358 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 14:15:01 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12361 ) Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 --- M src/libmsc/msc_mgcp.c 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 703bb0b..08a1db0 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -51,8 +51,6 @@ #define MGCP_ASS_TIMEOUT 10 /* in seconds */ #define MGCP_ASS_TIMEOUT_TIMER_NR 4 -#define ENDPOINT_ID "rtpbridge/*@mgw" - /* Some internal cause codes to indicate fault condition inside the FSM */ enum msc_mgcp_cause_code { MGCP_ERR_MGW_FAIL, @@ -306,7 +304,7 @@ .call_id = mgcp_ctx->call_id, .conn_mode = MGCP_CONN_RECV_ONLY }; - if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= + if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_client_rtpbridge_wildcard(mgcp), sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, false); return; @@ -1021,11 +1019,12 @@ /* Allocate and configure a new fsm instance */ mgcp_ctx = talloc_zero(NULL, struct mgcp_ctx); OSMO_ASSERT(mgcp_ctx); - if (osmo_strlcpy(mgcp_ctx->rtp_endpoint, ENDPOINT_ID, sizeof(mgcp_ctx->rtp_endpoint)) >= - MGCP_ENDPOINT_MAXLEN) { + + if (osmo_strlcpy(mgcp_ctx->rtp_endpoint, mgcp_client_rtpbridge_wildcard(mgcp), sizeof(mgcp_ctx->rtp_endpoint)) + >= sizeof(mgcp_ctx->rtp_endpoint)) { talloc_free(mgcp_ctx); - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) endpoint identifier (%s) exceeds maximum length...\n", - vlr_subscr_name(trans->vsub), ENDPOINT_ID); + LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) endpoint identifier exceeds maximum length: %s\n", + vlr_subscr_name(trans->vsub), osmo_quote_str(mgcp_client_rtpbridge_wildcard(mgcp), -1)); return -EINVAL; } mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, name); -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:15:03 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 8 Jan 2019 14:15:03 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Patch Set 3: Can you also change debian/rules so the new service file is correctly packaged/installed? -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 08 Jan 2019 14:15:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:15:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:15:41 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12485 Change subject: LCLS: constify helper parameters ...................................................................... LCLS: constify helper parameters Related: OS#2487 Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/osmo_bsc_lcls.c 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/12485/1 diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h index 3eaa589..c8b0ebd 100644 --- a/include/osmocom/bsc/osmo_bsc_lcls.h +++ b/include/osmocom/bsc/osmo_bsc_lcls.h @@ -29,7 +29,7 @@ LCLS_EV_OTHER_DEAD, }; -enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn); +enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn); void lcls_update_config(struct gsm_subscriber_connection *conn, const uint8_t *config, const uint8_t *control); diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 2d5a077..2e86643 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -47,7 +47,7 @@ * Utility functions ***********************************************************************/ -enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn) +enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn) { if (!conn->lcls.fi) return GSM0808_LCLS_STS_NA; @@ -86,7 +86,7 @@ } static struct gsm_subscriber_connection * -find_conn_with_same_gcr(struct gsm_subscriber_connection *conn_local) +find_conn_with_same_gcr(const struct gsm_subscriber_connection *conn_local) { struct gsm_network *net = conn_local->network; struct gsm_subscriber_connection *conn_other; @@ -159,7 +159,7 @@ /* Update the connections LCLS configuration and return old/previous configuration. * \returns (staticallly allocated) old configuration; NULL if new config not supported */ static struct osmo_lcls *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, - struct osmo_lcls *new_cfg_csc) + const struct osmo_lcls *new_cfg_csc) { static struct osmo_lcls old_cfg_csc = { 0 }; old_cfg_csc.config = conn->lcls.config; @@ -275,7 +275,7 @@ NULL, 0, 0, NULL); } -static void lcls_break_local_switching(struct gsm_subscriber_connection *conn) +static void lcls_break_local_switching(const struct gsm_subscriber_connection *conn) { struct mgcp_conn_peer mdcx_info; @@ -303,7 +303,7 @@ } } -static bool lcls_enable_possible(struct gsm_subscriber_connection *conn) +static bool lcls_enable_possible(const struct gsm_subscriber_connection *conn) { struct gsm_subscriber_connection *other_conn = conn->lcls.other; OSMO_ASSERT(other_conn); -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:15:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:15:41 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12486 Change subject: LCLS: use libosmocore function to add status ...................................................................... LCLS: use libosmocore function to add status * use gsm0808_create_ass_compl2() to add BSS Status IE to Assignment Complete message * drop local helpers Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Related: OS#2487 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 3 files changed, 2 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/12486/1 diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h index c8b0ebd..d98fe98 100644 --- a/include/osmocom/bsc/osmo_bsc_lcls.h +++ b/include/osmocom/bsc/osmo_bsc_lcls.h @@ -37,5 +37,3 @@ void lcls_apply_config(struct gsm_subscriber_connection *conn); extern struct osmo_fsm lcls_fsm; - -void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a24f7f9..75704d9 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -175,10 +175,10 @@ } } - resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, + resp = gsm0808_create_ass_compl2(lchan->abis_ip.ass_compl.rr_cause, chosen_channel, lchan->encr.alg_id, perm_spch, - addr_local_p, sc_ptr, NULL); + addr_local_p, sc_ptr, NULL, lcls_get_status(conn)); if (!resp) { assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, @@ -186,9 +186,6 @@ return; } - /* Add LCLS BSS-Status IE in case there is any LCLS status for this connection */ - bssmap_add_lcls_status_if_needed(conn, resp); - rc = gscon_sigtran_send(conn, resp); if (rc) { assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 2e86643..3135089 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -864,35 +864,3 @@ .log_subsys = DLCLS, .event_names = lcls_event_names, }; - -/* Add the LCLS BSS Status IE to a BSSMAP message. We assume this is - * called on a msgb that was returned by gsm0808_create_ass_compl() */ -static void bssmap_add_lcls_status(struct msgb *msg, enum gsm0808_lcls_status status) -{ - OSMO_ASSERT(msg->l3h[0] == BSSAP_MSG_BSS_MANAGEMENT); - OSMO_ASSERT(msg->l3h[2] == BSS_MAP_MSG_ASSIGMENT_COMPLETE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_COMPLETE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_PERFORMED); - OSMO_ASSERT(msgb_tailroom(msg) >= 2); - - /* append IE to end of message */ - msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); - /* increment the "length" byte in the BSSAP header */ - msg->l3h[1] += 2; -} - -/* Add (append) the LCLS BSS Status IE to a BSSMAP message, if there is any LCLS - * active on the given \a conn */ -void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - enum gsm0808_lcls_status status = lcls_get_status(conn); - if (status != GSM0808_LCLS_STS_NA) { - LOGPFSM(conn->fi, "Adding LCLS BSS-Status (%s) to %s\n", - gsm0808_lcls_status_name(status), - gsm0808_bssmap_name(msg->l3h[2])); - bssmap_add_lcls_status(msg, status); - } -} - - -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:19:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:19:16 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12476 to look at the new patch set (#4). Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Add initial version of asyncio trap2cgi script It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399 --- M README A contrib/systemd/osmo-trap2cgi.service M debian/rules A scripts/osmo_trap2cgi.py M setup.py 5 files changed, 247 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/76/12476/4 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:22:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:22:00 +0000 Subject: Change in python/osmo-python-tests[master]: deb: fix wrong changelog date Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12487 Change subject: deb: fix wrong changelog date ...................................................................... deb: fix wrong changelog date Issue was discovered with lintian - likely a copy-paste error. Change-Id: Ie73b1f29bd13e68e9b5e05896f1f048bc8108d17 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/87/12487/1 diff --git a/debian/changelog b/debian/changelog index 3bee65a..03c1c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ * Initial package - -- Harald Welte Thu, 31 May 2019 10:33:31 +0100 + -- Harald Welte Fri, 31 May 2019 10:33:31 +0100 -- To view, visit https://gerrit.osmocom.org/12487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie73b1f29bd13e68e9b5e05896f1f048bc8108d17 Gerrit-Change-Number: 12487 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:23:03 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:23:03 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Patch Set 4: > Can you also change debian/rules so the new service file is correctly packaged/installed? Should be fixed in latest revision. It's odd that lintian missed it. -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 08 Jan 2019 14:23:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:36:50 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 14:36:50 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 14:36:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 14:45:48 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 8 Jan 2019 14:45:48 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 08 Jan 2019 14:45:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 15:29:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 8 Jan 2019 15:29:28 +0000 Subject: Change in libosmocore[master]: Cosmetic: GSUP: note "on wire" for imei_result Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12488 Change subject: Cosmetic: GSUP: note "on wire" for imei_result ...................................................................... Cosmetic: GSUP: note "on wire" for imei_result Note that OSMO_GSUP_IMEI_RESULT_ACK is 0 on the wire, although the enum value is 1. Same with NACK (1 on wire, enum 2). I had implemented enum osmo_gsup_imei_result after enum osmo_gsup_cancel_type above, where this comment exists as well, and I incorrectly assumed that enum osmo_gsup_cn_domain in the middle was also implemented this way and therefore adding the comments to each enum would be redundant. But for cn_domain, the values on the wire are the same as the enum values. Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 --- M include/osmocom/gsm/gsup.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/12488/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 6adb0bf..5dc2a82 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -174,8 +174,8 @@ }; enum osmo_gsup_imei_result { - OSMO_GSUP_IMEI_RESULT_ACK = 1, - OSMO_GSUP_IMEI_RESULT_NACK = 2, + OSMO_GSUP_IMEI_RESULT_ACK = 1, /* on wire: 0 */ + OSMO_GSUP_IMEI_RESULT_NACK = 2, /* on wire: 1 */ }; /*! TCAP-like session state */ -- To view, visit https://gerrit.osmocom.org/12488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 Gerrit-Change-Number: 12488 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 16:30:43 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 Jan 2019 16:30:43 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 29: Code-Review-1 (35 comments) Haven't managed to read everything yet. so far... https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h at 216 PS29, Line 216: RAN_CONN_USE_SGs_SERVICE > Missing comma. (yes, it is nicer to keep the last comma, so later additions are single-line patches) https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_iface.h File include/osmocom/msc/sgs_iface.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_iface.h at 29 PS29, Line 29: char *sockname; Here, I guess talloc ownership is clear and straightforward, so it would be ok to keep this as-is, but generally I'm in favor of char[123] storage (see osmo_sock_get_name_buf()). (I now see it as a mistake that I implemented osmo_sock_get_name() as a talloc string.) https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h File include/osmocom/msc/sgs_server.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h at 1 PS29, Line 1: /* (C 2018 by Harald Welte closing brace (C), and I guess it should contain 2019 https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h at 23 PS29, Line 23: #define DEFAULT_VLR_NAME "vlr.example.net" Maybe this name could be "*_SGS_SERVER_*"? https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_vty.h File include/osmocom/msc/sgs_vty.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_vty.h at 1 PS29, Line 1: /* (C 2018 by Harald Welte I think normally we don't have (C) in .h files? https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h at 114 PS29, Line 114: struct vlr_subscr; > Why do we need this? I don't see any references to this struct. the struct is defined 7 lines further down; indeed drop this https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c at 453 PS29, Line 453: struct msgb *gsm48_create_mm_info(struct gsm_network *net) In principle, we put the bare msg composition stuff in libosmocore. (It would be some effort to pull this apart from the osmo-msc local code base, though... so I'm not going to block on it) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 119 PS29, Line 119: Note > I think this note should precede the function definition. Agree, return val info should go to the "API doc" string. In general, I'd prefer to not start comments with "Note:". https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 130 PS29, Line 130: case OSMO_RAT_EUTRAN_SGS: meta question: IIUC on the EUTRAN, the subscriber does not actually send a LU request to the 2G MSC. When a call gets established or SMS handling takes place, the SGs sends something, and then the MS is implicitly set to "attached". So if an MS is attached to some LTE service, and if now the 2G MSC wants to send it an SMS or call it, that can only work if the MS has before used some 2G fallback service? Shouldn't all paging already be managed by the LTE side, and the 2G MSC isn't even responsible for paging, and only take over from the LTE once instructed over SGs? So, it doesn't make sense to me that an LTE subscriber is even listed as 'attached' in our VLR beyond an ongoing SGs transaction. Also, we will not get periodic location updates, and the VLR will remove the subscriber as soon as that period has passed; after that, we will again reject all paging. How does all this work? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 151 PS29, Line 151: * \param serv_ind sgsap service indicator (in case SGs interface is used to page) end with dot https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/msc_vty.c at 705 PS29, Line 705: /* SGs related */ maybe if (vsub->sgs_fsm && vsub->sgs_fsm->state != SGS_UE_ST_NULL) { ... ? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 3 PS29, Line 3: /* (C 2018 by Harald Welte ) 19 https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 98 PS29, Line 98: return vsub; This is a bad thing to do in general. You should keep the use count until done with the vlr subscr. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 110 PS29, Line 110: LOGSGC(sgc, LOGL_ERROR, "(sub %s) Cannot allocate connection, subscriber not found in HLR!\n", imsi); this is not the HLR ... the vlr_subscr_find_by_imsi() does not contact the HLR. I am wondering, IUUC the SGs implicitly sets a subscriber as attached. But we might want to first verify that our HLR even knows that IMSI, i.e. actually run a Location Updating Request procedure over GSUP? Later code does look like the SGs is doing that, but this here looks like it doesn't. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 121 PS29, Line 121: conn->vsub = vlr_subscr_get(vsub); instead of another get() here, keep the get() use count from vlr_subscr_find_by_imsi(). In above 'if (!conn)' err handling do a vlr_subscr_put(). https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 277 PS29, Line 277: vsub = vlr_subscr_by_imsi(gsm_network->vlr, imsi); In another VTY related patch I did argue that what you're doing here is safe. But in that patch I explicitly wanted the subscriber's use count to be printed without the temporary get(). Here please avoid handling a vsub outside of a get()..put() scope. I know it gets a bit more cumbersome, but for code maintainability it's worth it. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 329 PS29, Line 329: if (imsi) { this is not so nice, since you're obtaining log context info, even though you don't know whether something gets logged yet. We usually omit all string composition when the logging category is switched off, within the LOGFOO() macros. The pattern I recently use a lot is: at the beginning, when allocating an FSM instance, place all relevant context information into the FSM instance id; then use LOGPFSML everywhere. That saves the effort of obtaining the log context over and over. Is something similar possible here? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 348 PS29, Line 348: else you are *always* logging an error now. I guess the initial 'if (sgsap_iei < 0)' should have a { .. } enclosing all the other error logging? Also maybe that {..} should end in 'return -EINVAL'? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 354 PS29, Line 354: return 0; [after reading other code] ...the "status" is intended to always indicate an error on the SGs? Then above would even be ok. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 414 PS29, Line 414: msg = gsm29118_create_mm_info_req(vsub->imsi, msg_mm_info->data + 2, msg_mm_info->len - 2); (when we're sending MM Info data, is that really a "Request"?) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 454 PS29, Line 454: * we are supposed to start a search procedure as defined in 3GPP TS 23.018 */ Of course our VLR does not even have a VLR subscriber stored if it is not attached. As in my other comment, I doubt that this is useful as it is now. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 851 PS29, Line 851: LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s parsing error\n", sgsap_msg_type_name(msg_type)); LOGL_ERROR? Also below? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 865 PS29, Line 865: msgb_free(msg); you are often repeating the pattern "create_status, tx, free". That would qualify for a little static function to avoid code dup. You could even create something like an 'sgs_fail()' function or macro that also takes a log string, hence do all of error-logging and status tx in one function/macro invocation. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 871 PS29, Line 871: /* FIXME: Is there a well defined minimum length (MCC=3 + MNC=2 + MSIN=1 => 6?) */ GSM23003_IMSI_MIN_DIGITS https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 872 PS29, Line 872: if (imsi[0] == '\0' || strlen(imsi) <= 6) { (strlen() is enough, it implies a "[0] == '\0' check") https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 984 PS29, Line 984: sgs_tx(sgc, resp); others free() after sgs_tx(). One or the other is wrong. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 987 PS29, Line 987: OSMO_ASSERT(false); ... https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1083 PS29, Line 1083: LOGMME(mme, LOGL_ERROR, "Ts11 expired more than Ns11 times, giving up\n"); (would be nice to also log the Ns11 value) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_server.c at 1 PS29, Line 1: /* (C 2018 by Harald Welte ) 19 https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c File src/libmsc/sgs_vty.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 1 PS29, Line 1: /* (C 2018 by Harald Welte ) 19 https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 99 PS29, Line 99: "timer (Ts5|TS6-2|Ts7|Ts11|Ts14|Ts15) <1-120>", have you tested that the keywords are allowed to contain capital letters? Normally for VTY all-caps means that it is a free-form arg. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 123 PS29, Line 123: "counter (Ns7|Ns11) <0-255>", same capital chars: tested? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 142 PS29, Line 142: "show sgs-connections", SHOW_STR (prefer line break before SHOW_STR) https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/Makefile.am File src/libvlr/Makefile.am: https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/Makefile.am at 11 PS29, Line 11: $(LIBOSMOGSM_CFLAGS) \ interesting, why is this needed? So far the idea of the VLR is to be separate from GSM specifics. It calls vlr->ops.foo callback functions to request actions, and it receives readily parsed function arguments. So far all message encoding and decoding happens in the MSC or the GSUP client, not in libvlr. https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr.c at 838 PS29, Line 838: sgs_lu_in_progress = true; this again looks like you are indeed invoking a Location Updating towards the HLR? Earlier the patch looked like that was not the case. Which is it / should it be? -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 08 Jan 2019 16:30:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 16:57:55 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 16:57:55 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: Fix nullpointer deref In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12481 ) Change subject: gsm_04_08: Fix nullpointer deref ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e Gerrit-Change-Number: 12481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 16:57:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 17:04:00 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 17:04:00 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c at 253 PS1, Line 253: LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, Why is this line not guarded by "print" variable? https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c at 263 PS1, Line 263: LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", osmo_hexdump(m_data, len)); Why is this line not guarded by "print" variable? At least before it was supposed to print NULL and not call osmo_hexdump() before if not needed. -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 17:04:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 17:15:28 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 17:15:28 +0000 Subject: Change in osmo-trx[master]: convolve: Remove support for step, offset parameters In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12415 ) Change subject: convolve: Remove support for step, offset parameters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Gerrit-Change-Number: 12415 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 17:15:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 17:46:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 17:46:18 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/#/c/12416/4/tests/Transceiver52M/convolve_test.c File tests/Transceiver52M/convolve_test.c: https://gerrit.osmocom.org/#/c/12416/4/tests/Transceiver52M/convolve_test.c at 106 PS4, Line 106: enum { You could make this enum named (move it out of struct test_data) and then use it as parameter in run_convolve to make parameter "int test" easier to read and understand. https://gerrit.osmocom.org/#/c/12416/4/tests/Transceiver52M/convolve_test.c at 226 PS4, Line 226: case CONV_REAL_OPT: missing break? Otherwise add /* fall through */ https://gerrit.osmocom.org/#/c/12416/4/tests/Transceiver52M/convolve_test.c at 233 PS4, Line 233: case CONV_COMPLEX_BASE: missing break? Otherwise add /* fall through */ -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 17:46:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 17:48:15 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 17:48:15 +0000 Subject: Change in osmo-trx[master]: arm/convolve: Fix the vfp4 real convolution for h_len=12 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12417 ) Change subject: arm/convolve: Fix the vfp4 real convolution for h_len=12 ...................................................................... Patch Set 4: Code-Review+1 I guess you tested by running the test in an ARM board and comparing results. You could add this kind of information to the commit description. -- To view, visit https://gerrit.osmocom.org/12417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Gerrit-Change-Number: 12417 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 17:48:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 17:48:38 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 17:48:38 +0000 Subject: Change in osmo-trx[master]: tests: Re-enable the convolve_test by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12418 ) Change subject: tests: Re-enable the convolve_test by default ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Gerrit-Change-Number: 12418 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 17:48:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 18:14:18 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 8 Jan 2019 18:14:18 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c at 253 PS1, Line 253: LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, > Why is this line not guarded by "print" variable? It is - see the line right above. https://gerrit.osmocom.org/#/c/12484/1/src/msgb.c at 263 PS1, Line 263: LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", osmo_hexdump(m_data, len)); > Why is this line not guarded by "print" variable? [?] The same. -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 18:14:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 8 19:03:51 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 Jan 2019 19:03:51 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 08 Jan 2019 19:03:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 02:50:45 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 02:50:45 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#9). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/iu_dummy.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 20 files changed, 11,772 insertions(+), 11,425 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/9 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 02:53:48 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 9 Jan 2019 02:53:48 +0000 Subject: Change in osmo-trx[master]: convolve: Remove support for step, offset parameters In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12415 ) Change subject: convolve: Remove support for step, offset parameters ...................................................................... Patch Set 1: Code-Review+1 (3 comments) Looks fine, just a few cosmetic issues. https://gerrit.osmocom.org/#/c/12415/1/Transceiver52M/arch/common/convolve_base.c File Transceiver52M/arch/common/convolve_base.c: https://gerrit.osmocom.org/#/c/12415/1/Transceiver52M/arch/common/convolve_base.c at 46 PS1, Line 46: for (int i=0; i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 02:53:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 09:07:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 09:07:17 +0000 Subject: Change in python/osmo-python-tests[master]: deb: fix wrong changelog date In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12487 ) Change subject: deb: fix wrong changelog date ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie73b1f29bd13e68e9b5e05896f1f048bc8108d17 Gerrit-Change-Number: 12487 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 09 Jan 2019 09:07:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 09:55:25 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 09:55:25 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12489 Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Cosmetic: msc_vty: remove redundant "0 =", "1 =" Remove "0 =", "1 =" in-front of the boolean descriptions of auth-tuple-reuse-on-error. The online VTY doc and the pdf manual prepend the value automatically. remove redundant VTY values Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/12489/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index fbc2056..e2582a9 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -425,8 +425,8 @@ DEFUN(cfg_msc_auth_tuple_reuse_on_error, cfg_msc_auth_tuple_reuse_on_error_cmd, "auth-tuple-reuse-on-error (0|1)", "Configure authentication tuple re-use when HLR is not responsive\n" - "0 = never re-use auth tuples beyond auth-tuple-max-reuse-count (default)\n" - "1 = if the HLR does not deliver new tuples, do re-use already available old ones.\n") + "Never re-use auth tuples beyond auth-tuple-max-reuse-count (default)\n" + "If the HLR does not deliver new tuples, do re-use already available old ones.\n") { gsmnet->vlr->cfg.auth_reuse_old_sets_on_error = atoi(argv[0]) ? true : false; return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 09:56:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 09:56:27 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 440 PS1, Line 440: "1 = send each IMEI to the EIR\n") > Ack, and I'll submit a patch later to fix this in the description above. Patch submitted: https://gerrit.osmocom.org/#/c/osmo-msc/+/12489 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 09 Jan 2019 09:56:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 10:02:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 10:02:08 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12489 ) Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 10:02:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 11:13:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 11:13:28 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: hlr.c: remove confusing indent below if Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12490 Change subject: Cosmetic: hlr.c: remove confusing indent below if ...................................................................... Cosmetic: hlr.c: remove confusing indent below if Remove a misleading block in rx_upd_loc_req() around the call to lu_op_tx_insert_subscr_data(). At least for me, this made the block look like it belonged to the if statement above (which has no brackets), before I looked more closely at it. Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 --- M src/hlr.c 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/90/12490/1 diff --git a/src/hlr.c b/src/hlr.c index ce5618a..614e99f 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -330,13 +330,12 @@ LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n", subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number"); - { - /* TODO: Subscriber allowed to roam in PLMN? */ - /* TODO: Update RoutingInfo */ - /* TODO: Reset Flag MS Purged (cs/ps) */ - /* TODO: Control_Tracing_HLR / Control_Tracing_HLR_with_SGSN */ - lu_op_tx_insert_subscr_data(luop); - } + /* TODO: Subscriber allowed to roam in PLMN? */ + /* TODO: Update RoutingInfo */ + /* TODO: Reset Flag MS Purged (cs/ps) */ + /* TODO: Control_Tracing_HLR / Control_Tracing_HLR_with_SGSN */ + lu_op_tx_insert_subscr_data(luop); + return 0; } -- To view, visit https://gerrit.osmocom.org/12490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 Gerrit-Change-Number: 12490 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 11:16:49 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 11:16:49 +0000 Subject: Change in libosmocore[master]: LCLS: add allocator function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12491 Change subject: LCLS: add allocator function ...................................................................... LCLS: add allocator function Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 4 files changed, 32 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/12491/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 4a2233e..2d86a7d 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -67,6 +67,8 @@ bool corr_needed; /**< ?3.2.2.118 Correlation-Not-Needed */ }; +struct osmo_lcls *osmo_lcls_alloc(void *ctx); + extern const struct value_string gsm0808_cell_id_discr_names[]; static inline const char *gsm0808_cell_id_discr_name(enum CELL_IDENT id_discr) { return get_value_string(gsm0808_cell_id_discr_names, id_discr); } diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2a458c3..90388fa 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -575,6 +575,22 @@ return enc; } +/*! Dynamically allocate LCLS parameters struct. + * \param[in] ctx context pointer to hang the result off + * \returns osmo_lcls pointer or NULL on error */ +struct osmo_lcls *osmo_lcls_alloc(void *ctx) +{ + struct osmo_lcls *r = talloc_zero(ctx, struct osmo_lcls); + if (!r) + return NULL; + + r->gcr = talloc_zero(r, struct osmo_gcr_parsed); + if (!r->gcr) + return NULL; + + return r; +} + /*! Decode LCLS parameters to a given msgb, 3GPP TS 48.008 ?3.2.2.115 - 3.2.2.120. * \param[out] lcls Caller-provided memory to store LCLS-related data * \param[in] tp IE values to be decoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bb97878..6b5f0ae 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -38,6 +38,7 @@ abis_nm_get_sw_conf; abis_nm_get_sw_desc_len; +osmo_lcls_alloc; osmo_sitype_strs; osmo_c4; osmo_get_rand_id; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 40e2b87..cb0df88 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -682,7 +682,7 @@ }; uint8_t len; struct msgb *msg; - struct osmo_gcr_parsed p = { 0 }, g = { + struct osmo_gcr_parsed g = { .net_len = 3, .net = { 0xf1, 0xf2, 0xf3 }, .node = 0xDEAD, @@ -690,7 +690,7 @@ }; int rc; struct tlv_parsed tp; - struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = { + struct osmo_lcls *lcls_out, lcls_in = { .gcr = &g, .config = GSM0808_LCLS_CFG_NA, .control = GSM0808_LCLS_CSC_NA, @@ -701,6 +701,8 @@ if (!msg) return; + lcls_out = osmo_lcls_alloc(msg); + len = gsm0808_enc_lcls(msg, &lcls_in); printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); @@ -714,29 +716,29 @@ abort(); } - rc = gsm0808_dec_lcls(&lcls_out, &tp); + rc = gsm0808_dec_lcls(lcls_out, &tp); if (rc < 0) { printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(); } - if (lcls_out.gcr->net_len != g.net_len) { - printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); + if (lcls_out->gcr->net_len != g.net_len) { + printf("Network ID length parsed wrong: %u != %u\n", lcls_out->gcr->net_len, g.net_len); abort(); } - if (lcls_out.gcr->node != g.node) { - printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out.gcr->node, g.node); + if (lcls_out->gcr->node != g.node) { + printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out->gcr->node, g.node); abort(); } - if (memcmp(lcls_out.gcr->net, g.net, g.net_len) != 0) { - printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->net, lcls_out.gcr->net_len)); + if (memcmp(lcls_out->gcr->net, g.net, g.net_len) != 0) { + printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out->gcr->net, lcls_out->gcr->net_len)); abort(); } - if (memcmp(lcls_out.gcr->cr, g.cr, 5) != 0) { - printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->cr, 5)); + if (memcmp(lcls_out->gcr->cr, g.cr, 5) != 0) { + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out->gcr->cr, 5)); abort(); } -- To view, visit https://gerrit.osmocom.org/12491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 Gerrit-Change-Number: 12491 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 11:17:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 11:17:21 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12492 Change subject: LCLS: add string dump helper ...................................................................... LCLS: add string dump helper Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm29205.h M src/gsm/gsm0808_utils.c M src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12492/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 4a2233e..c8924f2 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -241,5 +241,6 @@ } const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct); +char *osmo_lcls_dump(const struct osmo_lcls *lcls, bool print_gcr); /*! @} */ diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index 0c3c153..3c47edf 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -39,3 +39,4 @@ uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); +char *osmo_gcr_dump(const struct osmo_gcr_parsed *gcr); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2a458c3..272695c 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define IP_V4_ADDR_LEN 4 @@ -592,6 +593,21 @@ return ret; } +/*! Dump LCLS parameters struct into string for printing. + * \param[in] lcls pointer to the struct to print + * \returns string representation of LCLS or NULL on error */ +char *osmo_lcls_dump(const struct osmo_lcls *lcls, bool print_gcr) +{ + char *s = talloc_asprintf(lcls, "LCLS Config: %s, Control: %s, Correlation-Needed: %u", + gsm0808_lcls_config_name(lcls->config), + gsm0808_lcls_control_name(lcls->control), + lcls->corr_needed); + if (s && print_gcr) + return talloc_asprintf_append(s, ", %s", osmo_gcr_dump(lcls->gcr)); + + return s; +} + /*! Encode TS 08.08 Encryption Information IE * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ei Encryption Information to be encoded diff --git a/src/gsm/gsm29205.c b/src/gsm/gsm29205.c index 0ef29b7..c764c93 100644 --- a/src/gsm/gsm29205.c +++ b/src/gsm/gsm29205.c @@ -91,3 +91,15 @@ return parsed + 5; } + +/*! Dump GCR struct into string for printing. + * \param[in] gcr pointer to the struct to print + * \returns string representation of GCR or NULL on error */ +char *osmo_gcr_dump(const struct osmo_gcr_parsed *gcr) +{ + char *s = talloc_asprintf(gcr, "GCR NetID 0x%s, ", osmo_hexdump_nospc(gcr->net, gcr->net_len)); + if (!s) + return NULL; + /* osmo_hexdump() uses static buffers so we can't call it twice withing the same parameter list */ + return talloc_asprintf_append(s, "Node 0x%x, CallRefID 0x%s", gcr->node, osmo_hexdump_nospc(gcr->cr, 5)); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bb97878..fd21f30 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -240,6 +240,8 @@ osmo_enc_gcr; osmo_dec_gcr; +osmo_gcr_dump; +osmo_lcls_dump; gsm0858_rsl_ul_meas_enc; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 40e2b87..72b501c 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -740,7 +740,8 @@ abort(); } - printf("\tdecoded %d bytes: %s\n", rc, rc == len ? "OK" : "FAIL"); + printf("\tdecoded %d bytes: %s:\n%s\n", rc, rc == len ? "OK" : "FAIL", osmo_lcls_dump(lcls_out, false)); + printf("\t%s\n", osmo_gcr_dump(lcls_out->gcr)); msgb_free(msg); } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 8e6d262..806e625 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -25,7 +25,9 @@ Testing prepend DTAP Testing Global Call Reference IE encoder... 15 bytes added: OK - decoded 15 bytes: OK + decoded 15 bytes: OK: +LCLS Config: Not available, Control: Not available, Correlation-Needed: 1 + GCR NetID 0xf1f2f3, Node 0xdead, CallRefID 0x4142434445 test_gsm0808_enc_dec_cell_id_list_lac: encoded: 1a 07 05 01 24 ab cd 56 78 (rc = 9) ------- test_cell_id_list_add cell_id_list == CGI[0]:{} -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 11:48:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 11:48:41 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 11:48:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:18:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 12:18:18 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 09 Jan 2019 12:18:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:19:39 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:19:39 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 09 Jan 2019 12:19:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:19:44 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:19:44 +0000 Subject: Change in libosmocore[master]: msgb: fix debug print In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12484 ) Change subject: msgb: fix debug print ...................................................................... msgb: fix debug print Since osmo_hexdump() use static buffers we can't re-use pointers to it after subsequent osmo_hexdump() calls. Let's print data used for comparison directly instead. Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 --- M src/msgb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/msgb.c b/src/msgb.c index 9cd59c6..3902f6e 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -260,7 +260,7 @@ } else LOGPC(DLGLOBAL, LOGL_FATAL, ".. "); - LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", m_dump); + LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", osmo_hexdump(m_data, len)); return false; } -- To view, visit https://gerrit.osmocom.org/12484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I24dc3fad6f64ef788da9b7d790f9d5f689190c42 Gerrit-Change-Number: 12484 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:22:58 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:22:58 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 09 Jan 2019 12:22:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:29:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:29:04 +0000 Subject: Change in libosmocore[master]: Cosmetic: GSUP: note "on wire" for imei_result In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12488 ) Change subject: Cosmetic: GSUP: note "on wire" for imei_result ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 Gerrit-Change-Number: 12488 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 12:29:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:33:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:33:21 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12492 ) Change subject: LCLS: add string dump helper ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 09 Jan 2019 12:33:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:52:28 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:52:28 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helper In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12492 to look at the new patch set (#7). Change subject: LCLS: add string dump helper ...................................................................... LCLS: add string dump helper Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm29205.h M src/gsm/gsm0808_utils.c M src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12492/7 -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 12:52:29 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 12:52:29 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12493 Change subject: LCLS: add GCR comparison helper ...................................................................... LCLS: add GCR comparison helper Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 --- M include/osmocom/gsm/gsm29205.h M src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 4 files changed, 31 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/12493/1 diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index 3c47edf..e3ac1b8 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -39,4 +39,5 @@ uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); +bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); char *osmo_gcr_dump(const struct osmo_gcr_parsed *gcr); diff --git a/src/gsm/gsm29205.c b/src/gsm/gsm29205.c index 17308da..c31a944 100644 --- a/src/gsm/gsm29205.c +++ b/src/gsm/gsm29205.c @@ -95,6 +95,27 @@ return parsed + 5; } +/*! Compare two GCR structs. + * \param[in] gcr1 pointer to the GCR struct + * \param[in] gcr2 pointer to the GCR struct + * \returns true if GCRs are equal, false otherwise */ +bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2) +{ + if (gcr1->net_len != gcr2->net_len) + return false; + + if (gcr1->node != gcr2->node) + return false; + + if (memcmp(gcr1->cr, gcr2->cr, 5) != 0) + return false; + + if (memcmp(gcr1->net, gcr2->net, gcr2->net_len) != 0) + return false; + + return true; +} + /*! Dump GCR struct into string for printing. * \param[in] gcr pointer to the struct to print * \returns string representation of GCR or NULL on error */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 7b5f2e9..3d3b74e 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -241,6 +241,7 @@ osmo_enc_gcr; osmo_dec_gcr; +osmo_gcr_eq; osmo_gcr_dump; osmo_lcls_dump; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 628bff9..425af64 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -722,23 +722,20 @@ abort(); } - if (lcls_out->gcr->net_len != g.net_len) { - printf("Network ID length parsed wrong: %u != %u\n", lcls_out->gcr->net_len, g.net_len); + if (lcls_out->config != lcls_in.config) { + printf("LCLS Config parsed wrong: %s != %s\n", + gsm0808_lcls_config_name(lcls_out->config), gsm0808_lcls_config_name(lcls_in.config)); abort(); } - if (lcls_out->gcr->node != g.node) { - printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out->gcr->node, g.node); + if (lcls_out->control != lcls_in.control) { + printf("LCLS Control parsed wrong: %s != %s\n", + gsm0808_lcls_control_name(lcls_out->control), gsm0808_lcls_control_name(lcls_in.control)); abort(); } - if (memcmp(lcls_out->gcr->net, g.net, g.net_len) != 0) { - printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out->gcr->net, lcls_out->gcr->net_len)); - abort(); - } - - if (memcmp(lcls_out->gcr->cr, g.cr, 5) != 0) { - printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out->gcr->cr, 5)); + if (!osmo_gcr_eq(lcls_out->gcr, lcls_in.gcr)) { + printf("GCR parsed wrong:\n\t%s\n\t%s\n", osmo_gcr_dump(lcls_out->gcr), osmo_gcr_dump(lcls_in.gcr)); abort(); } -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 13:50:44 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 13:50:44 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12404 to look at the new patch set (#10). Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... err log: fully log MS supported A5 algos on mismatch Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 --- M src/libmsc/gsm_04_08.c 1 file changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/04/12404/10 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 13:51:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 13:51:33 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 10: Code-Review+2 I trivially moved a whitespace out of the returned string. re-adding previous +2 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 13:51:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 13:53:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 13:53:33 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: hlr.c: remove confusing indent below if In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12490 ) Change subject: Cosmetic: hlr.c: remove confusing indent below if ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 Gerrit-Change-Number: 12490 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 09 Jan 2019 13:53:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 13:59:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 13:59:22 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err File tests/msc_vlr/msc_vlr_test_hlr_reject.err: https://gerrit.osmocom.org/#/c/12470/1/tests/msc_vlr/msc_vlr_test_hlr_reject.err at 12 PS1, Line 12: DMM RAN_conn(LU:901700000004620) LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH > yes. [?] actually, I just realize that I am removing the IMSI logging as you request in https://gerrit.osmocom.org/c/osmo-msc/+/12402 -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max Gerrit-Comment-Date: Wed, 09 Jan 2019 13:59:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:03:24 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:03:24 +0000 Subject: Change in osmo-bsc[master]: fix call-during-call: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix call-during-call: switch off re-using lchan during assignment ...................................................................... Patch Set 2: > I'm not really buying the argument about a "rare" case. Maybe that's the wrong argument, then. The better one is: untested; and: AFAICT we cannot possibly handle that correctly, because I am pretty sure the lchan FSM only does RTP handling properly when it is activated with 'requires_voice_stream' enabled, and so far has no code path to enable it later, yet. -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 09 Jan 2019 14:03:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:11:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:11:49 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12401 to look at the new patch set (#3). Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... fix lchan modifications: switch off re-using lchan during assignment Always set up a fresh lchan for both SDCCH->TCH/* as well as call-during-call, which allows these scenarios to properly set up an RTP stream. Disable lchan re-use on repeated Assignment Requests: so far the lchan FSM does RTP handling properly *only* when it 'requires_voice_stream' from the start. The nicer way to support call-during-call, as well as Channel Mode Modify, would be to rather re-use the old lchan and implement FSM states to re-route the audio. But that is a task for another day. A more detailed explanation is given in the '#if 0' section added by this patch. To really get call-during-call working, osmo-msc also needs a fix, see the change-id in 'Related' below. Related: OS#3735, osmo-msc I0ba216b737909e92080a722db26e3577726c63cb Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/12401/3 -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:15:45 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:15:45 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12489 ) Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 14:15:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:19:44 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:19:44 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 09 Jan 2019 14:19:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:20:43 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:20:43 +0000 Subject: Change in osmo-msc[master]: vlr_core.h: remove duplicate declarations In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12479 ) Change subject: vlr_core.h: remove duplicate declarations ...................................................................... Patch Set 1: Code-Review+2 what, we have a vlr_core.h? :P -- To view, visit https://gerrit.osmocom.org/12479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 Gerrit-Change-Number: 12479 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 14:20:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:21:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:21:15 +0000 Subject: Change in osmo-msc[master]: VLR: vlr_subscr_{, msisdn_or_}name: const vsub arg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12480 ) Change subject: VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If609269191f4df6186d823a2eee14012846328e2 Gerrit-Change-Number: 12480 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 14:21:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:31:24 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 14:31:24 +0000 Subject: Change in osmo-asf4-dfu[master]: use USB CDC Echo example project Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12494 Change subject: use USB CDC Echo example project ...................................................................... use USB CDC Echo example project this is the USB CDC Echo example project source code, for the Microchip SAM E54 Xplained Pro development board, based on the ATSAME54P20A micro-controller, exported from the Atmel START website, using the ASFv4 library. Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 --- A AtmelStart.env_conf A AtmelStart.gpdsc A CMSIS/Documentation/Core/html/index.html A CMSIS/Include/arm_common_tables.h A CMSIS/Include/arm_const_structs.h A CMSIS/Include/arm_math.h A CMSIS/Include/cmsis_armcc.h A CMSIS/Include/cmsis_armclang.h A CMSIS/Include/cmsis_compiler.h A CMSIS/Include/cmsis_gcc.h A CMSIS/Include/core_armv8mbl.h A CMSIS/Include/core_armv8mml.h A CMSIS/Include/core_cm0.h A CMSIS/Include/core_cm0plus.h A CMSIS/Include/core_cm23.h A CMSIS/Include/core_cm3.h A CMSIS/Include/core_cm33.h A CMSIS/Include/core_cm4.h A CMSIS/Include/core_cm7.h A CMSIS/Include/core_sc000.h A CMSIS/Include/core_sc300.h A CMSIS/Include/tz_context.h A armcc/Makefile A armcc/arm_addon/armcc/arm/startup_same54.s A armcc/arm_addon/armcc/system_same54.c A atmel_start.c A atmel_start.h A atmel_start_config.atstart A atmel_start_pins.h A config/hpl_cmcc_config.h A config/hpl_dmac_config.h A config/hpl_gclk_config.h A config/hpl_mclk_config.h A config/hpl_osc32kctrl_config.h A config/hpl_oscctrl_config.h A config/hpl_port_config.h A config/hpl_usb_config.h A config/peripheral_clk_config.h A config/usbd_config.h A documentation/usb_cdc_echo.rst A documentation/usb_device_cdc.rst A documentation/usb_device_core.rst A documentation/usb_protocol_cdc.rst A documentation/usb_protocol_core.rst A driver_init.c A driver_init.h A examples/driver_examples.c A examples/driver_examples.h A gcc/Makefile A gcc/gcc/same54p20a_flash.ld A gcc/gcc/same54p20a_sram.ld A gcc/gcc/startup_same54.c A gcc/system_same54.c A hal/documentation/usb_device_async.rst A hal/include/hal_atomic.h A hal/include/hal_cache.h A hal/include/hal_delay.h A hal/include/hal_gpio.h A hal/include/hal_init.h A hal/include/hal_io.h A hal/include/hal_sleep.h A hal/include/hal_usb_device.h A hal/include/hpl_cmcc.h A hal/include/hpl_core.h A hal/include/hpl_delay.h A hal/include/hpl_dma.h A hal/include/hpl_gpio.h A hal/include/hpl_init.h A hal/include/hpl_irq.h A hal/include/hpl_missing_features.h A hal/include/hpl_ramecc.h A hal/include/hpl_reset.h A hal/include/hpl_sleep.h A hal/include/hpl_usb.h A hal/include/hpl_usb_device.h A hal/include/hpl_usb_host.h A hal/src/hal_atomic.c A hal/src/hal_cache.c A hal/src/hal_delay.c A hal/src/hal_gpio.c A hal/src/hal_init.c A hal/src/hal_io.c A hal/src/hal_sleep.c A hal/src/hal_usb_device.c A hal/utils/include/compiler.h A hal/utils/include/err_codes.h A hal/utils/include/events.h A hal/utils/include/parts.h A hal/utils/include/utils.h A hal/utils/include/utils_assert.h A hal/utils/include/utils_event.h A hal/utils/include/utils_increment_macro.h A hal/utils/include/utils_list.h A hal/utils/include/utils_repeat_macro.h A hal/utils/src/utils_assert.c A hal/utils/src/utils_event.c A hal/utils/src/utils_list.c A hal/utils/src/utils_syscalls.c A hpl/cmcc/hpl_cmcc.c A hpl/core/hpl_core_m4.c A hpl/core/hpl_core_port.h A hpl/core/hpl_init.c A hpl/dmac/hpl_dmac.c A hpl/gclk/hpl_gclk.c A hpl/gclk/hpl_gclk_base.h A hpl/mclk/hpl_mclk.c A hpl/osc32kctrl/hpl_osc32kctrl.c A hpl/oscctrl/hpl_oscctrl.c A hpl/pm/hpl_pm.c A hpl/pm/hpl_pm_base.h A hpl/port/hpl_gpio_base.h A hpl/ramecc/hpl_ramecc.c A hpl/usb/hpl_usb.c A hri/hri_ac_e54.h A hri/hri_adc_e54.h A hri/hri_aes_e54.h A hri/hri_can_e54.h A hri/hri_ccl_e54.h A hri/hri_cmcc_e54.h A hri/hri_dac_e54.h A hri/hri_dmac_e54.h A hri/hri_dsu_e54.h A hri/hri_e54.h A hri/hri_eic_e54.h A hri/hri_evsys_e54.h A hri/hri_freqm_e54.h A hri/hri_gclk_e54.h A hri/hri_gmac_e54.h A hri/hri_hmatrixb_e54.h A hri/hri_i2s_e54.h A hri/hri_icm_e54.h A hri/hri_mclk_e54.h A hri/hri_mpu_e54.h A hri/hri_nvic_e54.h A hri/hri_nvmctrl_e54.h A hri/hri_osc32kctrl_e54.h A hri/hri_oscctrl_e54.h A hri/hri_pac_e54.h A hri/hri_pcc_e54.h A hri/hri_pdec_e54.h A hri/hri_pm_e54.h A hri/hri_port_e54.h A hri/hri_qspi_e54.h A hri/hri_ramecc_e54.h A hri/hri_rstc_e54.h A hri/hri_rtc_e54.h A hri/hri_sdhc_e54.h A hri/hri_sercom_e54.h A hri/hri_supc_e54.h A hri/hri_systemcontrol_e54.h A hri/hri_systick_e54.h A hri/hri_tc_e54.h A hri/hri_tcc_e54.h A hri/hri_trng_e54.h A hri/hri_usb_e54.h A hri/hri_wdt_e54.h A include/component-version.h A include/component/ac.h A include/component/adc.h A include/component/aes.h A include/component/can.h A include/component/ccl.h A include/component/cmcc.h A include/component/dac.h A include/component/dmac.h A include/component/dsu.h A include/component/eic.h A include/component/evsys.h A include/component/freqm.h A include/component/gclk.h A include/component/gmac.h A include/component/hmatrixb.h A include/component/i2s.h A include/component/icm.h A include/component/mclk.h A include/component/nvmctrl.h A include/component/osc32kctrl.h A include/component/oscctrl.h A include/component/pac.h A include/component/pcc.h A include/component/pdec.h A include/component/picop.h A include/component/pm.h A include/component/port.h A include/component/qspi.h A include/component/ramecc.h A include/component/rstc.h A include/component/rtc.h A include/component/sdhc.h A include/component/sercom.h A include/component/supc.h A include/component/tc.h A include/component/tcc.h A include/component/trng.h A include/component/usb.h A include/component/wdt.h A include/instance/ac.h A include/instance/adc0.h A include/instance/adc1.h A include/instance/aes.h A include/instance/can0.h A include/instance/can1.h A include/instance/ccl.h A include/instance/cmcc.h A include/instance/dac.h A include/instance/dmac.h A include/instance/dsu.h A include/instance/eic.h A include/instance/evsys.h A include/instance/freqm.h A include/instance/gclk.h A include/instance/gmac.h A include/instance/hmatrix.h A include/instance/i2s.h A include/instance/icm.h A include/instance/mclk.h A include/instance/nvmctrl.h A include/instance/osc32kctrl.h A include/instance/oscctrl.h A include/instance/pac.h A include/instance/pcc.h A include/instance/pdec.h A include/instance/picop.h A include/instance/pm.h A include/instance/port.h A include/instance/pukcc.h A include/instance/qspi.h A include/instance/ramecc.h A include/instance/rstc.h A include/instance/rtc.h A include/instance/sdhc0.h A include/instance/sdhc1.h A include/instance/sercom0.h A include/instance/sercom1.h A include/instance/sercom2.h A include/instance/sercom3.h A include/instance/sercom4.h A include/instance/sercom5.h A include/instance/sercom6.h A include/instance/sercom7.h A include/instance/supc.h A include/instance/tc0.h A include/instance/tc1.h A include/instance/tc2.h A include/instance/tc3.h A include/instance/tc4.h A include/instance/tc5.h A include/instance/tc6.h A include/instance/tc7.h A include/instance/tcc0.h A include/instance/tcc1.h A include/instance/tcc2.h A include/instance/tcc3.h A include/instance/tcc4.h A include/instance/trng.h A include/instance/usb.h A include/instance/wdt.h A include/pio/same54n19a.h A include/pio/same54n20a.h A include/pio/same54p19a.h A include/pio/same54p20a.h A include/sam.h A include/same54.h A include/same54n19a.h A include/same54n20a.h A include/same54p19a.h A include/same54p20a.h A include/system_same54.h A usb/class/cdc/device/atmel_devices_cdc.cat A usb/class/cdc/device/atmel_devices_cdc.inf A usb/class/cdc/device/cdcdf_acm.c A usb/class/cdc/device/cdcdf_acm.h A usb/class/cdc/device/cdcdf_acm_desc.h A usb/class/cdc/usb_protocol_cdc.h A usb/device/usbdc.c A usb/device/usbdc.h A usb/usb_atmel.h A usb/usb_debug.h A usb/usb_includes.h A usb/usb_protocol.c A usb/usb_protocol.h A usb_cdc_echo_main.c A usb_start.c A usb_start.h 284 files changed, 242,151 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/94/12494/1 -- To view, visit https://gerrit.osmocom.org/12494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 Gerrit-Change-Number: 12494 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:32:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:32:04 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12489 to look at the new patch set (#2). Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Cosmetic: msc_vty: remove redundant "0 =", "1 =" Remove "0 =", "1 =" in-front of the boolean descriptions of auth-tuple-reuse-on-error. The online VTY doc and the pdf manual prepend the value automatically. Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/12489/2 -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:32:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:32:29 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12489 ) Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 09 Jan 2019 14:32:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:32:34 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:32:34 +0000 Subject: Change in osmo-msc[master]: Cosmetic: msc_vty: remove redundant "0 =", "1 =" In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12489 ) Change subject: Cosmetic: msc_vty: remove redundant "0 =", "1 =" ...................................................................... Cosmetic: msc_vty: remove redundant "0 =", "1 =" Remove "0 =", "1 =" in-front of the boolean descriptions of auth-tuple-reuse-on-error. The online VTY doc and the pdf manual prepend the value automatically. Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index fbc2056..e2582a9 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -425,8 +425,8 @@ DEFUN(cfg_msc_auth_tuple_reuse_on_error, cfg_msc_auth_tuple_reuse_on_error_cmd, "auth-tuple-reuse-on-error (0|1)", "Configure authentication tuple re-use when HLR is not responsive\n" - "0 = never re-use auth tuples beyond auth-tuple-max-reuse-count (default)\n" - "1 = if the HLR does not deliver new tuples, do re-use already available old ones.\n") + "Never re-use auth tuples beyond auth-tuple-max-reuse-count (default)\n" + "If the HLR does not deliver new tuples, do re-use already available old ones.\n") { gsmnet->vlr->cfg.auth_reuse_old_sets_on_error = atoi(argv[0]) ? true : false; return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/12489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifd14c2fb3f58701eaf66570d729a660233fb83ed Gerrit-Change-Number: 12489 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:33:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:33:35 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: make check-imei-rqd configurable In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: make check-imei-rqd configurable ...................................................................... msc_vty.c: make check-imei-rqd configurable Related: OS#3189 Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 17 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index e2582a9..1fdf560 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -432,6 +432,17 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_check_imei_rqd, cfg_msc_check_imei_rqd_cmd, + "check-imei-rqd (0|1)", + "Send each IMEI to the EIR to ask if it is permitted or not. The EIR is implemented as part of OsmoHLR, " + "and can optionally save the IMEI in the HLR.\n" + "Do not send IMEIs to the EIR\n" + "Send each IMEI to the EIR\n") +{ + gsmnet->vlr->cfg.check_imei_rqd = atoi(argv[0]) ? true : false; + return CMD_SUCCESS; +} + DEFUN(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, "paging response-timer (default|<1-65535>)", "Configure Paging\n" @@ -501,6 +512,10 @@ vty_out(vty, " auth-tuple-reuse-on-error 1%s", VTY_NEWLINE); + if (gsmnet->vlr->cfg.check_imei_rqd) + vty_out(vty, " check-imei-rqd 1 %s", + VTY_NEWLINE); + if (gsmnet->paging_response_timer != MSC_PAGING_RESPONSE_TIMER_DEFAULT) vty_out(vty, " paging response-timer %u%s", gsmnet->paging_response_timer, VTY_NEWLINE); @@ -1548,6 +1563,7 @@ install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); + install_element(MSC_NODE, &cfg_msc_check_imei_rqd_cmd); install_element(MSC_NODE, &cfg_msc_cs7_instance_a_cmd); install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 3fd37b0..c62c692 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -36,6 +36,7 @@ no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) + check-imei-rqd (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:33:41 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 14:33:41 +0000 Subject: Change in osmo-asf4-dfu[master]: use USB CDC Echo example project In-Reply-To: References: Message-ID: K?vin Redon has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12494 ) Change subject: use USB CDC Echo example project ...................................................................... use USB CDC Echo example project this is the USB CDC Echo example project source code, for the Microchip SAM E54 Xplained Pro development board, based on the ATSAME54P20A micro-controller, exported from the Atmel START website, using the ASFv4 library. Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 --- A AtmelStart.env_conf A AtmelStart.gpdsc A CMSIS/Documentation/Core/html/index.html A CMSIS/Include/arm_common_tables.h A CMSIS/Include/arm_const_structs.h A CMSIS/Include/arm_math.h A CMSIS/Include/cmsis_armcc.h A CMSIS/Include/cmsis_armclang.h A CMSIS/Include/cmsis_compiler.h A CMSIS/Include/cmsis_gcc.h A CMSIS/Include/core_armv8mbl.h A CMSIS/Include/core_armv8mml.h A CMSIS/Include/core_cm0.h A CMSIS/Include/core_cm0plus.h A CMSIS/Include/core_cm23.h A CMSIS/Include/core_cm3.h A CMSIS/Include/core_cm33.h A CMSIS/Include/core_cm4.h A CMSIS/Include/core_cm7.h A CMSIS/Include/core_sc000.h A CMSIS/Include/core_sc300.h A CMSIS/Include/tz_context.h A armcc/Makefile A armcc/arm_addon/armcc/arm/startup_same54.s A armcc/arm_addon/armcc/system_same54.c A atmel_start.c A atmel_start.h A atmel_start_config.atstart A atmel_start_pins.h A config/hpl_cmcc_config.h A config/hpl_dmac_config.h A config/hpl_gclk_config.h A config/hpl_mclk_config.h A config/hpl_osc32kctrl_config.h A config/hpl_oscctrl_config.h A config/hpl_port_config.h A config/hpl_usb_config.h A config/peripheral_clk_config.h A config/usbd_config.h A documentation/usb_cdc_echo.rst A documentation/usb_device_cdc.rst A documentation/usb_device_core.rst A documentation/usb_protocol_cdc.rst A documentation/usb_protocol_core.rst A driver_init.c A driver_init.h A examples/driver_examples.c A examples/driver_examples.h A gcc/Makefile A gcc/gcc/same54p20a_flash.ld A gcc/gcc/same54p20a_sram.ld A gcc/gcc/startup_same54.c A gcc/system_same54.c A hal/documentation/usb_device_async.rst A hal/include/hal_atomic.h A hal/include/hal_cache.h A hal/include/hal_delay.h A hal/include/hal_gpio.h A hal/include/hal_init.h A hal/include/hal_io.h A hal/include/hal_sleep.h A hal/include/hal_usb_device.h A hal/include/hpl_cmcc.h A hal/include/hpl_core.h A hal/include/hpl_delay.h A hal/include/hpl_dma.h A hal/include/hpl_gpio.h A hal/include/hpl_init.h A hal/include/hpl_irq.h A hal/include/hpl_missing_features.h A hal/include/hpl_ramecc.h A hal/include/hpl_reset.h A hal/include/hpl_sleep.h A hal/include/hpl_usb.h A hal/include/hpl_usb_device.h A hal/include/hpl_usb_host.h A hal/src/hal_atomic.c A hal/src/hal_cache.c A hal/src/hal_delay.c A hal/src/hal_gpio.c A hal/src/hal_init.c A hal/src/hal_io.c A hal/src/hal_sleep.c A hal/src/hal_usb_device.c A hal/utils/include/compiler.h A hal/utils/include/err_codes.h A hal/utils/include/events.h A hal/utils/include/parts.h A hal/utils/include/utils.h A hal/utils/include/utils_assert.h A hal/utils/include/utils_event.h A hal/utils/include/utils_increment_macro.h A hal/utils/include/utils_list.h A hal/utils/include/utils_repeat_macro.h A hal/utils/src/utils_assert.c A hal/utils/src/utils_event.c A hal/utils/src/utils_list.c A hal/utils/src/utils_syscalls.c A hpl/cmcc/hpl_cmcc.c A hpl/core/hpl_core_m4.c A hpl/core/hpl_core_port.h A hpl/core/hpl_init.c A hpl/dmac/hpl_dmac.c A hpl/gclk/hpl_gclk.c A hpl/gclk/hpl_gclk_base.h A hpl/mclk/hpl_mclk.c A hpl/osc32kctrl/hpl_osc32kctrl.c A hpl/oscctrl/hpl_oscctrl.c A hpl/pm/hpl_pm.c A hpl/pm/hpl_pm_base.h A hpl/port/hpl_gpio_base.h A hpl/ramecc/hpl_ramecc.c A hpl/usb/hpl_usb.c A hri/hri_ac_e54.h A hri/hri_adc_e54.h A hri/hri_aes_e54.h A hri/hri_can_e54.h A hri/hri_ccl_e54.h A hri/hri_cmcc_e54.h A hri/hri_dac_e54.h A hri/hri_dmac_e54.h A hri/hri_dsu_e54.h A hri/hri_e54.h A hri/hri_eic_e54.h A hri/hri_evsys_e54.h A hri/hri_freqm_e54.h A hri/hri_gclk_e54.h A hri/hri_gmac_e54.h A hri/hri_hmatrixb_e54.h A hri/hri_i2s_e54.h A hri/hri_icm_e54.h A hri/hri_mclk_e54.h A hri/hri_mpu_e54.h A hri/hri_nvic_e54.h A hri/hri_nvmctrl_e54.h A hri/hri_osc32kctrl_e54.h A hri/hri_oscctrl_e54.h A hri/hri_pac_e54.h A hri/hri_pcc_e54.h A hri/hri_pdec_e54.h A hri/hri_pm_e54.h A hri/hri_port_e54.h A hri/hri_qspi_e54.h A hri/hri_ramecc_e54.h A hri/hri_rstc_e54.h A hri/hri_rtc_e54.h A hri/hri_sdhc_e54.h A hri/hri_sercom_e54.h A hri/hri_supc_e54.h A hri/hri_systemcontrol_e54.h A hri/hri_systick_e54.h A hri/hri_tc_e54.h A hri/hri_tcc_e54.h A hri/hri_trng_e54.h A hri/hri_usb_e54.h A hri/hri_wdt_e54.h A include/component-version.h A include/component/ac.h A include/component/adc.h A include/component/aes.h A include/component/can.h A include/component/ccl.h A include/component/cmcc.h A include/component/dac.h A include/component/dmac.h A include/component/dsu.h A include/component/eic.h A include/component/evsys.h A include/component/freqm.h A include/component/gclk.h A include/component/gmac.h A include/component/hmatrixb.h A include/component/i2s.h A include/component/icm.h A include/component/mclk.h A include/component/nvmctrl.h A include/component/osc32kctrl.h A include/component/oscctrl.h A include/component/pac.h A include/component/pcc.h A include/component/pdec.h A include/component/picop.h A include/component/pm.h A include/component/port.h A include/component/qspi.h A include/component/ramecc.h A include/component/rstc.h A include/component/rtc.h A include/component/sdhc.h A include/component/sercom.h A include/component/supc.h A include/component/tc.h A include/component/tcc.h A include/component/trng.h A include/component/usb.h A include/component/wdt.h A include/instance/ac.h A include/instance/adc0.h A include/instance/adc1.h A include/instance/aes.h A include/instance/can0.h A include/instance/can1.h A include/instance/ccl.h A include/instance/cmcc.h A include/instance/dac.h A include/instance/dmac.h A include/instance/dsu.h A include/instance/eic.h A include/instance/evsys.h A include/instance/freqm.h A include/instance/gclk.h A include/instance/gmac.h A include/instance/hmatrix.h A include/instance/i2s.h A include/instance/icm.h A include/instance/mclk.h A include/instance/nvmctrl.h A include/instance/osc32kctrl.h A include/instance/oscctrl.h A include/instance/pac.h A include/instance/pcc.h A include/instance/pdec.h A include/instance/picop.h A include/instance/pm.h A include/instance/port.h A include/instance/pukcc.h A include/instance/qspi.h A include/instance/ramecc.h A include/instance/rstc.h A include/instance/rtc.h A include/instance/sdhc0.h A include/instance/sdhc1.h A include/instance/sercom0.h A include/instance/sercom1.h A include/instance/sercom2.h A include/instance/sercom3.h A include/instance/sercom4.h A include/instance/sercom5.h A include/instance/sercom6.h A include/instance/sercom7.h A include/instance/supc.h A include/instance/tc0.h A include/instance/tc1.h A include/instance/tc2.h A include/instance/tc3.h A include/instance/tc4.h A include/instance/tc5.h A include/instance/tc6.h A include/instance/tc7.h A include/instance/tcc0.h A include/instance/tcc1.h A include/instance/tcc2.h A include/instance/tcc3.h A include/instance/tcc4.h A include/instance/trng.h A include/instance/usb.h A include/instance/wdt.h A include/pio/same54n19a.h A include/pio/same54n20a.h A include/pio/same54p19a.h A include/pio/same54p20a.h A include/sam.h A include/same54.h A include/same54n19a.h A include/same54n20a.h A include/same54p19a.h A include/same54p20a.h A include/system_same54.h A usb/class/cdc/device/atmel_devices_cdc.cat A usb/class/cdc/device/atmel_devices_cdc.inf A usb/class/cdc/device/cdcdf_acm.c A usb/class/cdc/device/cdcdf_acm.h A usb/class/cdc/device/cdcdf_acm_desc.h A usb/class/cdc/usb_protocol_cdc.h A usb/device/usbdc.c A usb/device/usbdc.h A usb/usb_atmel.h A usb/usb_debug.h A usb/usb_includes.h A usb/usb_protocol.c A usb/usb_protocol.h A usb_cdc_echo_main.c A usb_start.c A usb_start.h 284 files changed, 242,151 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/94/12494/2 -- To view, visit https://gerrit.osmocom.org/12494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 Gerrit-Change-Number: 12494 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:34:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:34:14 +0000 Subject: Change in osmo-msc[master]: vlr_core.h: remove duplicate declarations In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12479 ) Change subject: vlr_core.h: remove duplicate declarations ...................................................................... vlr_core.h: remove duplicate declarations Remove vlr_subscr_name() and vlr_subscr_alloc() declarations from vlr_core.h, as they are already defined in osmocom/msc/vlr.h and vlr.h gets included on top of vlr_core.h. Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 --- M src/libvlr/vlr_core.h 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index d336b1b..c249dff 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -4,10 +4,8 @@ struct osmo_gsup_message; -const char *vlr_subscr_name(struct vlr_subscr *vsub); int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); -struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); void vlr_subscr_update_tuples(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup); -- To view, visit https://gerrit.osmocom.org/12479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5c029be490577b513395dc3f2c2698f365157e73 Gerrit-Change-Number: 12479 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:34:34 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:34:34 +0000 Subject: Change in osmo-msc[master]: VLR: vlr_subscr_{, msisdn_or_}name: const vsub arg In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12480 ) Change subject: VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg ...................................................................... VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg Make the vsub argument of both vlr_subscr_msisdn_or_name() and vlr_subscr_name() a const. The LOGVSUBP() macro uses vlr_subscr_name() and will not generate a warning anymore when used with a const vsub. Change-Id: If609269191f4df6186d823a2eee14012846328e2 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 029ef31..b328b70 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -330,8 +330,8 @@ uint32_t parent_event_failure); -const char *vlr_subscr_name(struct vlr_subscr *vsub); -const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub); +const char *vlr_subscr_name(const struct vlr_subscr *vsub); +const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub); #define vlr_subscr_find_by_imsi(vlr, imsi) \ _vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__) diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 7de78bf..b0e7f79 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -79,7 +79,7 @@ } /* return static buffer with printable name of VLR subscriber */ -const char *vlr_subscr_name(struct vlr_subscr *vsub) +const char *vlr_subscr_name(const struct vlr_subscr *vsub) { static char buf[32]; if (!vsub) @@ -98,7 +98,7 @@ return buf; } -const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub) +const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub) { if (!vsub || !vsub->msisdn[0]) return vlr_subscr_name(vsub); -- To view, visit https://gerrit.osmocom.org/12480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If609269191f4df6186d823a2eee14012846328e2 Gerrit-Change-Number: 12480 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:38:25 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 14:38:25 +0000 Subject: Change in osmo-asf4-dfu[master]: use USB CDC Echo example project In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12494 ) Change subject: use USB CDC Echo example project ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 Gerrit-Change-Number: 12494 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 09 Jan 2019 14:38:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:43:46 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 14:43:46 +0000 Subject: Change in osmo-asf4-dfu[master]: use USB CDC Echo example project In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12494 ) Change subject: use USB CDC Echo example project ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/12494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 Gerrit-Change-Number: 12494 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 09 Jan 2019 14:43:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:43:54 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 14:43:54 +0000 Subject: Change in osmo-asf4-dfu[master]: use USB CDC Echo example project In-Reply-To: References: Message-ID: K?vin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/12494 ) Change subject: use USB CDC Echo example project ...................................................................... use USB CDC Echo example project this is the USB CDC Echo example project source code, for the Microchip SAM E54 Xplained Pro development board, based on the ATSAME54P20A micro-controller, exported from the Atmel START website, using the ASFv4 library. Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 --- A AtmelStart.env_conf A AtmelStart.gpdsc A CMSIS/Documentation/Core/html/index.html A CMSIS/Include/arm_common_tables.h A CMSIS/Include/arm_const_structs.h A CMSIS/Include/arm_math.h A CMSIS/Include/cmsis_armcc.h A CMSIS/Include/cmsis_armclang.h A CMSIS/Include/cmsis_compiler.h A CMSIS/Include/cmsis_gcc.h A CMSIS/Include/core_armv8mbl.h A CMSIS/Include/core_armv8mml.h A CMSIS/Include/core_cm0.h A CMSIS/Include/core_cm0plus.h A CMSIS/Include/core_cm23.h A CMSIS/Include/core_cm3.h A CMSIS/Include/core_cm33.h A CMSIS/Include/core_cm4.h A CMSIS/Include/core_cm7.h A CMSIS/Include/core_sc000.h A CMSIS/Include/core_sc300.h A CMSIS/Include/tz_context.h A armcc/Makefile A armcc/arm_addon/armcc/arm/startup_same54.s A armcc/arm_addon/armcc/system_same54.c A atmel_start.c A atmel_start.h A atmel_start_config.atstart A atmel_start_pins.h A config/hpl_cmcc_config.h A config/hpl_dmac_config.h A config/hpl_gclk_config.h A config/hpl_mclk_config.h A config/hpl_osc32kctrl_config.h A config/hpl_oscctrl_config.h A config/hpl_port_config.h A config/hpl_usb_config.h A config/peripheral_clk_config.h A config/usbd_config.h A documentation/usb_cdc_echo.rst A documentation/usb_device_cdc.rst A documentation/usb_device_core.rst A documentation/usb_protocol_cdc.rst A documentation/usb_protocol_core.rst A driver_init.c A driver_init.h A examples/driver_examples.c A examples/driver_examples.h A gcc/Makefile A gcc/gcc/same54p20a_flash.ld A gcc/gcc/same54p20a_sram.ld A gcc/gcc/startup_same54.c A gcc/system_same54.c A hal/documentation/usb_device_async.rst A hal/include/hal_atomic.h A hal/include/hal_cache.h A hal/include/hal_delay.h A hal/include/hal_gpio.h A hal/include/hal_init.h A hal/include/hal_io.h A hal/include/hal_sleep.h A hal/include/hal_usb_device.h A hal/include/hpl_cmcc.h A hal/include/hpl_core.h A hal/include/hpl_delay.h A hal/include/hpl_dma.h A hal/include/hpl_gpio.h A hal/include/hpl_init.h A hal/include/hpl_irq.h A hal/include/hpl_missing_features.h A hal/include/hpl_ramecc.h A hal/include/hpl_reset.h A hal/include/hpl_sleep.h A hal/include/hpl_usb.h A hal/include/hpl_usb_device.h A hal/include/hpl_usb_host.h A hal/src/hal_atomic.c A hal/src/hal_cache.c A hal/src/hal_delay.c A hal/src/hal_gpio.c A hal/src/hal_init.c A hal/src/hal_io.c A hal/src/hal_sleep.c A hal/src/hal_usb_device.c A hal/utils/include/compiler.h A hal/utils/include/err_codes.h A hal/utils/include/events.h A hal/utils/include/parts.h A hal/utils/include/utils.h A hal/utils/include/utils_assert.h A hal/utils/include/utils_event.h A hal/utils/include/utils_increment_macro.h A hal/utils/include/utils_list.h A hal/utils/include/utils_repeat_macro.h A hal/utils/src/utils_assert.c A hal/utils/src/utils_event.c A hal/utils/src/utils_list.c A hal/utils/src/utils_syscalls.c A hpl/cmcc/hpl_cmcc.c A hpl/core/hpl_core_m4.c A hpl/core/hpl_core_port.h A hpl/core/hpl_init.c A hpl/dmac/hpl_dmac.c A hpl/gclk/hpl_gclk.c A hpl/gclk/hpl_gclk_base.h A hpl/mclk/hpl_mclk.c A hpl/osc32kctrl/hpl_osc32kctrl.c A hpl/oscctrl/hpl_oscctrl.c A hpl/pm/hpl_pm.c A hpl/pm/hpl_pm_base.h A hpl/port/hpl_gpio_base.h A hpl/ramecc/hpl_ramecc.c A hpl/usb/hpl_usb.c A hri/hri_ac_e54.h A hri/hri_adc_e54.h A hri/hri_aes_e54.h A hri/hri_can_e54.h A hri/hri_ccl_e54.h A hri/hri_cmcc_e54.h A hri/hri_dac_e54.h A hri/hri_dmac_e54.h A hri/hri_dsu_e54.h A hri/hri_e54.h A hri/hri_eic_e54.h A hri/hri_evsys_e54.h A hri/hri_freqm_e54.h A hri/hri_gclk_e54.h A hri/hri_gmac_e54.h A hri/hri_hmatrixb_e54.h A hri/hri_i2s_e54.h A hri/hri_icm_e54.h A hri/hri_mclk_e54.h A hri/hri_mpu_e54.h A hri/hri_nvic_e54.h A hri/hri_nvmctrl_e54.h A hri/hri_osc32kctrl_e54.h A hri/hri_oscctrl_e54.h A hri/hri_pac_e54.h A hri/hri_pcc_e54.h A hri/hri_pdec_e54.h A hri/hri_pm_e54.h A hri/hri_port_e54.h A hri/hri_qspi_e54.h A hri/hri_ramecc_e54.h A hri/hri_rstc_e54.h A hri/hri_rtc_e54.h A hri/hri_sdhc_e54.h A hri/hri_sercom_e54.h A hri/hri_supc_e54.h A hri/hri_systemcontrol_e54.h A hri/hri_systick_e54.h A hri/hri_tc_e54.h A hri/hri_tcc_e54.h A hri/hri_trng_e54.h A hri/hri_usb_e54.h A hri/hri_wdt_e54.h A include/component-version.h A include/component/ac.h A include/component/adc.h A include/component/aes.h A include/component/can.h A include/component/ccl.h A include/component/cmcc.h A include/component/dac.h A include/component/dmac.h A include/component/dsu.h A include/component/eic.h A include/component/evsys.h A include/component/freqm.h A include/component/gclk.h A include/component/gmac.h A include/component/hmatrixb.h A include/component/i2s.h A include/component/icm.h A include/component/mclk.h A include/component/nvmctrl.h A include/component/osc32kctrl.h A include/component/oscctrl.h A include/component/pac.h A include/component/pcc.h A include/component/pdec.h A include/component/picop.h A include/component/pm.h A include/component/port.h A include/component/qspi.h A include/component/ramecc.h A include/component/rstc.h A include/component/rtc.h A include/component/sdhc.h A include/component/sercom.h A include/component/supc.h A include/component/tc.h A include/component/tcc.h A include/component/trng.h A include/component/usb.h A include/component/wdt.h A include/instance/ac.h A include/instance/adc0.h A include/instance/adc1.h A include/instance/aes.h A include/instance/can0.h A include/instance/can1.h A include/instance/ccl.h A include/instance/cmcc.h A include/instance/dac.h A include/instance/dmac.h A include/instance/dsu.h A include/instance/eic.h A include/instance/evsys.h A include/instance/freqm.h A include/instance/gclk.h A include/instance/gmac.h A include/instance/hmatrix.h A include/instance/i2s.h A include/instance/icm.h A include/instance/mclk.h A include/instance/nvmctrl.h A include/instance/osc32kctrl.h A include/instance/oscctrl.h A include/instance/pac.h A include/instance/pcc.h A include/instance/pdec.h A include/instance/picop.h A include/instance/pm.h A include/instance/port.h A include/instance/pukcc.h A include/instance/qspi.h A include/instance/ramecc.h A include/instance/rstc.h A include/instance/rtc.h A include/instance/sdhc0.h A include/instance/sdhc1.h A include/instance/sercom0.h A include/instance/sercom1.h A include/instance/sercom2.h A include/instance/sercom3.h A include/instance/sercom4.h A include/instance/sercom5.h A include/instance/sercom6.h A include/instance/sercom7.h A include/instance/supc.h A include/instance/tc0.h A include/instance/tc1.h A include/instance/tc2.h A include/instance/tc3.h A include/instance/tc4.h A include/instance/tc5.h A include/instance/tc6.h A include/instance/tc7.h A include/instance/tcc0.h A include/instance/tcc1.h A include/instance/tcc2.h A include/instance/tcc3.h A include/instance/tcc4.h A include/instance/trng.h A include/instance/usb.h A include/instance/wdt.h A include/pio/same54n19a.h A include/pio/same54n20a.h A include/pio/same54p19a.h A include/pio/same54p20a.h A include/sam.h A include/same54.h A include/same54n19a.h A include/same54n20a.h A include/same54p19a.h A include/same54p20a.h A include/system_same54.h A usb/class/cdc/device/atmel_devices_cdc.cat A usb/class/cdc/device/atmel_devices_cdc.inf A usb/class/cdc/device/cdcdf_acm.c A usb/class/cdc/device/cdcdf_acm.h A usb/class/cdc/device/cdcdf_acm_desc.h A usb/class/cdc/usb_protocol_cdc.h A usb/device/usbdc.c A usb/device/usbdc.h A usb/usb_atmel.h A usb/usb_debug.h A usb/usb_includes.h A usb/usb_protocol.c A usb/usb_protocol.h A usb_cdc_echo_main.c A usb_start.c A usb_start.h 284 files changed, 242,151 insertions(+), 0 deletions(-) Approvals: K?vin Redon: Looks good to me, approved; Verified -- To view, visit https://gerrit.osmocom.org/12494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0e58e42d1a4076bc84a0a8d3509ec4b09a37f46 Gerrit-Change-Number: 12494 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:46:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:46:54 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 6: Code-Review-1 (6 comments) very nice so far. Also add an msc_vlr_test that NACKs and one that ERRs the IMSI? Or are you doing that in TTCN3 already? maybe drop the FIXME from vlr_lu_fsm.c:506? https://gerrit.osmocom.org/#/c/12478/6/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/6/src/libvlr/vlr.c at 1017 PS6, Line 1017: osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_LU_COMPL_FAILURE, (void *)&gsup->cause); state LU_COMPL_VLR_S_WAIT_IMEI in vlr_lu_fsm.c doesn't allow event VLR_ULA_E_LU_COMPL_FAILURE? (a cast to void* is never needed) https://gerrit.osmocom.org/#/c/12478/6/src/libvlr/vlr.c at 1033 PS6, Line 1033: osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_NACK, (void *)&gsup->cause); what's the difference between the error above and this NACK? These events do not evaluate any data argument, do they? https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_authen.c File tests/msc_vlr/msc_vlr_test_gsm_authen.c: https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_authen.c at 579 PS6, Line 579: insert here another EXPECT_ACCEPTED(false) and thwart_rx_non_initial_requests(). https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_authen.c at 686 PS6, Line 686: and here https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_ciph.c File tests/msc_vlr/msc_vlr_test_gsm_ciph.c: https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_ciph.c at 559 PS6, Line 559: and here https://gerrit.osmocom.org/#/c/12478/6/tests/msc_vlr/msc_vlr_test_gsm_ciph.c at 768 PS6, Line 768: and here -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 14:46:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:48:17 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:48:17 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: hlr.c: remove confusing indent below if In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12490 ) Change subject: Cosmetic: hlr.c: remove confusing indent below if ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 Gerrit-Change-Number: 12490 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 14:48:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:50:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:50:03 +0000 Subject: Change in libosmocore[master]: Cosmetic: GSUP: note "on wire" for imei_result In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12488 ) Change subject: Cosmetic: GSUP: note "on wire" for imei_result ...................................................................... Patch Set 1: Code-Review+2 what would it be for wireless links? :P -- To view, visit https://gerrit.osmocom.org/12488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 Gerrit-Change-Number: 12488 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 14:50:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:52:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:52:09 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: hlr.c: remove confusing indent below if In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12490 ) Change subject: Cosmetic: hlr.c: remove confusing indent below if ...................................................................... Cosmetic: hlr.c: remove confusing indent below if Remove a misleading block in rx_upd_loc_req() around the call to lu_op_tx_insert_subscr_data(). At least for me, this made the block look like it belonged to the if statement above (which has no brackets), before I looked more closely at it. Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 --- M src/hlr.c 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index ce5618a..614e99f 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -330,13 +330,12 @@ LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n", subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number"); - { - /* TODO: Subscriber allowed to roam in PLMN? */ - /* TODO: Update RoutingInfo */ - /* TODO: Reset Flag MS Purged (cs/ps) */ - /* TODO: Control_Tracing_HLR / Control_Tracing_HLR_with_SGSN */ - lu_op_tx_insert_subscr_data(luop); - } + /* TODO: Subscriber allowed to roam in PLMN? */ + /* TODO: Update RoutingInfo */ + /* TODO: Reset Flag MS Purged (cs/ps) */ + /* TODO: Control_Tracing_HLR / Control_Tracing_HLR_with_SGSN */ + lu_op_tx_insert_subscr_data(luop); + return 0; } -- To view, visit https://gerrit.osmocom.org/12490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96d3ba4108f4811279caf088a9179afce24e8112 Gerrit-Change-Number: 12490 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:53:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 9 Jan 2019 14:53:35 +0000 Subject: Change in libosmocore[master]: Cosmetic: GSUP: note "on wire" for imei_result In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12488 ) Change subject: Cosmetic: GSUP: note "on wire" for imei_result ...................................................................... Cosmetic: GSUP: note "on wire" for imei_result Note that OSMO_GSUP_IMEI_RESULT_ACK is 0 on the wire, although the enum value is 1. Same with NACK (1 on wire, enum 2). I had implemented enum osmo_gsup_imei_result after enum osmo_gsup_cancel_type above, where this comment exists as well, and I incorrectly assumed that enum osmo_gsup_cn_domain in the middle was also implemented this way and therefore adding the comments to each enum would be redundant. But for cn_domain, the values on the wire are the same as the enum values. Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 --- M include/osmocom/gsm/gsup.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 6adb0bf..5dc2a82 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -174,8 +174,8 @@ }; enum osmo_gsup_imei_result { - OSMO_GSUP_IMEI_RESULT_ACK = 1, - OSMO_GSUP_IMEI_RESULT_NACK = 2, + OSMO_GSUP_IMEI_RESULT_ACK = 1, /* on wire: 0 */ + OSMO_GSUP_IMEI_RESULT_NACK = 2, /* on wire: 1 */ }; /*! TCAP-like session state */ -- To view, visit https://gerrit.osmocom.org/12488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If97c34f117bfaab2232bbb625e9d118c8f390e58 Gerrit-Change-Number: 12488 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 14:54:11 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 14:54:11 +0000 Subject: Change in osmo-bsc[master]: paging: fix nullpointer deref In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12482 ) Change subject: paging: fix nullpointer deref ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 Gerrit-Change-Number: 12482 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 14:54:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:14 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:14 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore output files Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12495 Change subject: ignore output files ...................................................................... ignore output files Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 --- A .gitignore 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/95/12495/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4608957 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.d +*.o +*.bin +*.eep +*.elf +*.hex +*.lss +*.map +NOTES -- To view, visit https://gerrit.osmocom.org/12495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 Gerrit-Change-Number: 12495 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:15 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:15 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12496 Change subject: add USB DFU description ...................................................................... add USB DFU description uses the USB CDC ACM example code as template to create a USB DFU description according to USB DFU specification version 1.1 Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 --- M config/usbd_config.h M gcc/Makefile A usb/class/dfu/device/dfudf.c C usb/class/dfu/device/dfudf.h A usb/class/dfu/device/dfudf_desc.h A usb/class/dfu/usb_protocol_dfu.h R usb_dfu_main.c M usb_start.c M usb_start.h 9 files changed, 696 insertions(+), 305 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/96/12496/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index e8334ec..e33f4ba 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -14,33 +14,54 @@ #define CONF_USBD_HS_SP 0 #endif -// ---- USB Device Stack CDC ACM Options ---- +// ---- USB Device Stack DFU Options ---- // Enable String Descriptors -// usb_cdcd_acm_str_en -#ifndef CONF_USB_CDCD_ACM_STR_EN -#define CONF_USB_CDCD_ACM_STR_EN 0 +// USB_DFUD_STR_EN +#ifndef CONF_USB_DFUD_STR_EN +#define CONF_USB_DFUD_STR_EN 0 #endif // Language IDs // Language IDs in c format, split by comma (E.g., 0x0409 ...) -// usb_cdcd_acm_langid -#ifndef CONF_USB_CDCD_ACM_LANGID -#define CONF_USB_CDCD_ACM_LANGID "0x0409" +// usb_dufd_langid +#ifndef CONF_USB_DFUD_LANGID +#define CONF_USB_DFUD_LANGID "0x0409" #endif -#ifndef CONF_USB_CDCD_ACM_LANGID_DESC -#define CONF_USB_CDCD_ACM_LANGID_DESC +#ifndef CONF_USB_DFUD_LANGID_DESC +#define CONF_USB_DFUD_LANGID_DESC 4, 0x03, 0x09, 0x04, #endif // -// CDC ACM Device Descriptor +// DFU Device Descriptor // bcdUSB // <0x0200=> USB 2.0 version // <0x0210=> USB 2.1 version -// usb_cdcd_acm_bcdusb -#ifndef CONF_USB_CDCD_ACM_BCDUSB -#define CONF_USB_CDCD_ACM_BCDUSB 0x200 +// usb_dfud_bcdusb +#ifndef CONF_USB_DFUD_BCDUSB +#define CONF_USB_DFUD_BCDUSB 0x200 +#endif + +// bDeviceClass +// <0=> unused +// usb_dfud_bdeviceclass +#ifndef CONF_USB_DFUD_BDEVICECLASS +#define CONF_USB_DFUD_BDEVICECLASS 0 +#endif + +// bDeviceSubClass +// <0=> unused +// usb_dfud_bdevicesubclass +#ifndef CONF_USB_DFUD_BDEVICESUBCLASS +#define CONF_USB_DFUD_BDEVICESUBCLASS 0 +#endif + +// bDeviceProtocol +// <0=> unused +// usb_dfud_bdeviceprotocol +#ifndef CONF_USB_DFUD_BDEVICEPROTOCOL +#define CONF_USB_DFUD_BDEVICEPROTOCOL 0 #endif // bMaxPackeSize0 @@ -48,133 +69,149 @@ // <0x0010=> 16 bytes // <0x0020=> 32 bytes // <0x0040=> 64 bytes -// usb_cdcd_acm_bmaxpksz0 -#ifndef CONF_USB_CDCD_ACM_BMAXPKSZ0 -#define CONF_USB_CDCD_ACM_BMAXPKSZ0 0x40 +// usb_dufd_bmaxpksz0 +#ifndef CONF_USB_DFUD_BMAXPKSZ0 +#define CONF_USB_DFUD_BMAXPKSZ0 0x40 #endif -// idVender <0x0000-0xFFFF> -// usb_cdcd_acm_idvender -#ifndef CONF_USB_CDCD_ACM_IDVENDER -#define CONF_USB_CDCD_ACM_IDVENDER 0x3eb +// idVendor <0x0000-0xFFFF> +// <0x1d50=> OpenMoko +// usb_octsim_idvendor +#ifndef CONF_USB_OCTSIM_IDVENDOR +#define CONF_USB_OCTSIM_IDVENDOR 0x1d50 #endif // idProduct <0x0000-0xFFFF> -// usb_cdcd_acm_idproduct -#ifndef CONF_USB_CDCD_ACM_IDPRODUCT -#define CONF_USB_CDCD_ACM_IDPRODUCT 0x2404 +// <0x6140=> sysmoOCTSIM +// usb_dufd_idproduct +#ifndef CONF_USB_OCTSIM_IDPRODUCT +#define CONF_USB_OCTSIM_IDPRODUCT 0x6140 #endif // bcdDevice <0x0000-0xFFFF> -// usb_cdcd_acm_bcddevice -#ifndef CONF_USB_CDCD_ACM_BCDDEVICE -#define CONF_USB_CDCD_ACM_BCDDEVICE 0x100 +// usb_dufd_bcddevice +#ifndef CONF_USB_DFUD_BCDDEVICE +#define CONF_USB_DFUD_BCDDEVICE 0x000 #endif // Enable string descriptor of iManufact -// usb_cdcd_acm_imanufact_en -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_EN -#define CONF_USB_CDCD_ACM_IMANUFACT_EN 0 +// usb_dufd_imanufact_en +#ifndef CONF_USB_DFUD_IMANUFACT_EN +#define CONF_USB_DFUD_IMANUFACT_EN 1 #endif -#ifndef CONF_USB_CDCD_ACM_IMANUFACT -#define CONF_USB_CDCD_ACM_IMANUFACT (CONF_USB_CDCD_ACM_IMANUFACT_EN * (CONF_USB_CDCD_ACM_IMANUFACT_EN)) +#ifndef CONF_USB_DFUD_IMANUFACT +#define CONF_USB_DFUD_IMANUFACT (CONF_USB_DFUD_IMANUFACT_EN * (CONF_USB_DFUD_IMANUFACT_EN)) #endif // Unicode string of iManufact -// usb_cdcd_acm_imanufact_str -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR -#define CONF_USB_CDCD_ACM_IMANUFACT_STR "Atmel" +// usb_dufd_imanufact_str +#ifndef CONF_USB_DFUD_IMANUFACT_STR +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" #endif -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC +#ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC +#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, #endif // // Enable string descriptor of iProduct -// usb_cdcd_acm_iproduct_en -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_EN -#define CONF_USB_CDCD_ACM_IPRODUCT_EN 0 +// usb_dufd_iproduct_en +#ifndef CONF_USB_DFUD_IPRODUCT_EN +#define CONF_USB_DFUD_IPRODUCT_EN 1 #endif -#ifndef CONF_USB_CDCD_ACM_IPRODUCT -#define CONF_USB_CDCD_ACM_IPRODUCT \ - (CONF_USB_CDCD_ACM_IPRODUCT_EN * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN)) +#ifndef CONF_USB_DFUD_IPRODUCT +#define CONF_USB_DFUD_IPRODUCT \ + (CONF_USB_DFUD_IPRODUCT_EN * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN)) #endif // Unicode string of iProduct -// usb_cdcd_acm_iproduct_str -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR -#define CONF_USB_CDCD_ACM_IPRODUCT_STR "CDC ACM Serial Bridge Demo" +// usb_dufd_iproduct_str +#ifndef CONF_USB_DFUD_IPRODUCT_STR +#define CONF_USB_DFUD_IPRODUCT_STR "sysmoOCTSIM" #endif -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC -#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC +#ifndef CONF_USB_DFUD_IPRODUCT_STR_DESC +#define CONF_USB_DFUD_IPRODUCT_STR_DESC 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', 0x00, 'M', 0x00, #endif // // Enable string descriptor of iSerialNum -// usb_cdcd_acm_iserialnum_en -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_EN -#define CONF_USB_CDCD_ACM_ISERIALNUM_EN 0 +// usb_dufd_iserialnum_en +#ifndef CONF_USB_DFUD_ISERIALNUM_EN +#define CONF_USB_DFUD_ISERIALNUM_EN 0 #endif -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM -#define CONF_USB_CDCD_ACM_ISERIALNUM \ - (CONF_USB_CDCD_ACM_ISERIALNUM_EN \ - * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN + CONF_USB_CDCD_ACM_ISERIALNUM_EN)) +#ifndef CONF_USB_DFUD_ISERIALNUM +#define CONF_USB_DFUD_ISERIALNUM \ + (CONF_USB_DFUD_ISERIALNUM_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN)) #endif // Unicode string of iSerialNum -// usb_cdcd_acm_iserialnum_str -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_STR -#define CONF_USB_CDCD_ACM_ISERIALNUM_STR "123456789ABCDEF" +// usb_dufd_iserialnum_str +#ifndef CONF_USB_DFUD_ISERIALNUM_STR +#define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF" #endif -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC -#define CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC +#ifndef CONF_USB_DFUD_ISERIALNUM_STR_DESC +#define CONF_USB_DFUD_ISERIALNUM_STR_DESC #endif // // bNumConfigurations <0x01-0xFF> -// usb_cdcd_acm_bnumconfig -#ifndef CONF_USB_CDCD_ACM_BNUMCONFIG -#define CONF_USB_CDCD_ACM_BNUMCONFIG 0x1 +// usb_dufd_bnumconfig +#ifndef CONF_USB_DFUD_BNUMCONFIG +#define CONF_USB_DFUD_BNUMCONFIG 0x1 #endif // -// CDC ACM Configuration Descriptor -// bConfigurationValue <0x01-0xFF> -// usb_cdcd_acm_bconfigval -#ifndef CONF_USB_CDCD_ACM_BCONFIGVAL -#define CONF_USB_CDCD_ACM_BCONFIGVAL 0x1 -#endif -// Enable string descriptor of iConfig -// usb_cdcd_acm_iconfig_en -#ifndef CONF_USB_CDCD_ACM_ICONFIG_EN -#define CONF_USB_CDCD_ACM_ICONFIG_EN 0 +// DFU Configuration Descriptor + +// wTotalLength <0x01-0xFF> +// usb_dufd_wtotallength +#ifndef CONF_USB_DFUD_WTOTALLENGTH +#define CONF_USB_DFUD_WTOTALLENGTH 27 #endif -#ifndef CONF_USB_CDCD_ACM_ICONFIG -#define CONF_USB_CDCD_ACM_ICONFIG \ - (CONF_USB_CDCD_ACM_ICONFIG_EN \ - * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN + CONF_USB_CDCD_ACM_ISERIALNUM_EN \ - + CONF_USB_CDCD_ACM_ICONFIG_EN)) +// bNumInterfaces <0x01-0xFF> +// usb_dufd_bnuminterfaces +#ifndef CONF_USB_DFUD_BNUMINTERFACES +#define CONF_USB_DFUD_BNUMINTERFACES 1 +#endif + +// bConfigurationValue <0x01-0xFF> +// usb_dufd_bconfigval +#ifndef CONF_USB_DFUD_BCONFIGVAL +#define CONF_USB_DFUD_BCONFIGVAL 0x1 +#endif + +// Enable string descriptor of iConfig +// usb_dufd_iconfig_en +#ifndef CONF_USB_DFUD_ICONFIG_EN +#define CONF_USB_DFUD_ICONFIG_EN 0 +#endif + +#ifndef CONF_USB_DFUD_ICONFIG +#define CONF_USB_DFUD_ICONFIG \ + (CONF_USB_DFUD_ICONFIG_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN \ + + CONF_USB_DFUD_ICONFIG_EN)) #endif // Unicode string of iConfig -// usb_cdcd_acm_iconfig_str -#ifndef CONF_USB_CDCD_ACM_ICONFIG_STR -#define CONF_USB_CDCD_ACM_ICONFIG_STR "" +// usb_dufd_iconfig_str +#ifndef CONF_USB_DFUD_ICONFIG_STR +#define CONF_USB_DFUD_ICONFIG_STR "" #endif -#ifndef CONF_USB_CDCD_ACM_ICONFIG_STR_DESC -#define CONF_USB_CDCD_ACM_ICONFIG_STR_DESC +#ifndef CONF_USB_DFUD_ICONFIG_STR_DESC +#define CONF_USB_DFUD_ICONFIG_STR_DESC #endif // @@ -184,157 +221,62 @@ // <0xA0=> Bus power supply, support for remote wakeup // <0xC0=> Self powered, not support for remote wakeup // <0xE0=> Self powered, support for remote wakeup -// usb_cdcd_acm_bmattri -#ifndef CONF_USB_CDCD_ACM_BMATTRI -#define CONF_USB_CDCD_ACM_BMATTRI 0x80 +// usb_dufd_bmattri +#ifndef CONF_USB_DFUD_BMATTRI +#define CONF_USB_DFUD_BMATTRI 0x80 #endif // bMaxPower <0x00-0xFF> -// usb_cdcd_acm_bmaxpower -#ifndef CONF_USB_CDCD_ACM_BMAXPOWER -#define CONF_USB_CDCD_ACM_BMAXPOWER 0x32 +// usb_dufd_bmaxpower +#ifndef CONF_USB_DFUD_BMAXPOWER +#define CONF_USB_DFUD_BMAXPOWER 0x32 #endif // -// CDC ACM Communication Interface Descriptor +// DFU Interface Descriptor // bInterfaceNumber <0x00-0xFF> -// usb_cdcd_acm_comm_bifcnum -#ifndef CONF_USB_CDCD_ACM_COMM_BIFCNUM -#define CONF_USB_CDCD_ACM_COMM_BIFCNUM 0x0 +// usb_dufd_bifcnum +#ifndef CONF_USB_DFUD_BIFCNUM +#define CONF_USB_DFUD_BIFCNUM 0x0 #endif + // bAlternateSetting <0x00-0xFF> -// usb_cdcd_acm_comm_baltset -#ifndef CONF_USB_CDCD_ACM_COMM_BALTSET -#define CONF_USB_CDCD_ACM_COMM_BALTSET 0x0 +// usb_dufd_baltset +#ifndef CONF_USB_DFUD_BALTSET +#define CONF_USB_DFUD_BALTSET 0x0 #endif -// iInterface <0x00-0xFF> -// usb_cdcd_acm_comm_iifc -#ifndef CONF_USB_CDCD_ACM_COMM_IIFC -#define CONF_USB_CDCD_ACM_COMM_IIFC 0x0 +// bNumEndpoints <0x00-0xFF> +// usb_dufd_bnumep +#ifndef CONF_USB_DFUD_BNUMEP +#define CONF_USB_DFUD_BNUMEP 0x0 #endif -// Interrupt IN Endpoint Address -// <0x81=> EndpointAddress = 0x81 -// <0x82=> EndpointAddress = 0x82 -// <0x83=> EndpointAddress = 0x83 -// <0x84=> EndpointAddress = 0x84 -// <0x85=> EndpointAddress = 0x85 -// <0x86=> EndpointAddress = 0x86 -// <0x87=> EndpointAddress = 0x87 -// usb_cdcd_acm_epaddr -#ifndef CONF_USB_CDCD_ACM_COMM_INT_EPADDR -#define CONF_USB_CDCD_ACM_COMM_INT_EPADDR 0x82 +// Enable string descriptor of iInterface +// usb_dufd_iinterface_en +#ifndef CONF_USB_DFUD_IINTERFACE_EN +#define CONF_USB_DFUD_IINTERFACE_EN 1 #endif -// Interrupt IN Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_comm_int_maxpksz -#ifndef CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ -#define CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ 0x40 +#ifndef CONF_USB_DFUD_IINTERFACE +#define CONF_USB_DFUD_IINTERFACE \ + (CONF_USB_DFUD_IINTERFACE_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN \ + + CONF_USB_DFUD_ICONFIG_EN + CONF_USB_DFUD_IINTERFACE_EN)) #endif -// Interrupt IN Endpoint Interval <0x00-0xFF> -// usb_cdcd_acm_comm_int_interval -#ifndef CONF_USB_CDCD_ACM_COMM_INT_INTERVAL -#define CONF_USB_CDCD_ACM_COMM_INT_INTERVAL 0xa -#endif -// - -// CDC ACM Data Interface Descriptor - -// bInterfaceNumber <0x00-0xFF> -// usb_cdcd_acm_data_bifcnum -#ifndef CONF_USB_CDCD_ACM_DATA_BIFCNUM -#define CONF_USB_CDCD_ACM_DATA_BIFCNUM 0x1 -#endif -// bAlternateSetting <0x00-0xFF> -// usb_cdcd_acm_data_baltset -#ifndef CONF_USB_CDCD_ACM_DATA_BALTSET -#define CONF_USB_CDCD_ACM_DATA_BALTSET 0x0 +// Unicode string of iInterface +// usb_dufd_iinterface_str +#ifndef CONF_USB_DFUD_IINTERFAGE_STR +#define CONF_USB_DFUD_IINTERFACE_STR "SAM D5x/E5x DFU bootloader (DFU mode)" #endif -// iInterface <0x00-0xFF> -// usb_cdcd_acm_data_iifc -#ifndef CONF_USB_CDCD_ACM_DATA_IIFC -#define CONF_USB_CDCD_ACM_DATA_IIFC 0x0 +#ifndef CONF_USB_DFUD_IINTERFACE_STR_DESC +#define CONF_USB_DFUD_IINTERFACE_STR_DESC 76, 0x03, 'S', 0x00, 'A', 0x00, 'M', 0x00, ' ', 0x00, 'D', 0x00, '5', 0x00, 'x', 0x00, '/', 0x00, 'E', 0x00, '5', 0x00, 'x', 0x00, ' ', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, ' ', 0x00, 'b', 0x00, 'o', 0x00, 'o', 0x00, 't', 0x00, 'l', 0x00, 'o', 0x00, 'a', 0x00, 'd', 0x00, 'e', 0x00, 'r', 0x00, ' ', 0x00, '(', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, ' ', 0x00, 'm', 0x00, 'o', 0x00, 'd', 0x00, 'e', 0x00, ')', 0x00, #endif -// BULK IN Endpoint Address -// <0x81=> EndpointAddress = 0x81 -// <0x82=> EndpointAddress = 0x82 -// <0x83=> EndpointAddress = 0x83 -// <0x84=> EndpointAddress = 0x84 -// <0x85=> EndpointAddress = 0x85 -// <0x86=> EndpointAddress = 0x86 -// <0x87=> EndpointAddress = 0x87 -// usb_cdcd_acm_data_bulkin_epaddr -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR -#define CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR 0x81 -#endif - -// BULK IN Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_data_builin_maxpksz -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ -#define CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ 0x40 -#endif - -// BULK IN Endpoint wMaxPacketSize for High Speed -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// <0x0080=> 128 bytes -// <0x0100=> 256 bytes -// <0x0200=> 512 bytes -// usb_cdcd_acm_data_builin_maxpksz_hs -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS -#define CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS 0x200 -#endif - -// BULK OUT Endpoint Address -// <0x01=> EndpointAddress = 0x01 -// <0x02=> EndpointAddress = 0x02 -// <0x03=> EndpointAddress = 0x03 -// <0x04=> EndpointAddress = 0x04 -// <0x05=> EndpointAddress = 0x05 -// <0x06=> EndpointAddress = 0x06 -// <0x07=> EndpointAddress = 0x07 -// usb_cdcd_acm_data_bulkout_epaddr -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR 0x1 -#endif - -// BULK OUT Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_data_buckout_maxpksz -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ 0x40 -#endif - -// BULK OUT Endpoint wMaxPacketSize for High Speed -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// <0x0080=> 128 bytes -// <0x0100=> 256 bytes -// <0x0200=> 512 bytes -// usb_cdcd_acm_data_buckout_maxpksz_hs -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS 0x200 -#endif +// // // <<< end of configuration section >>> diff --git a/gcc/Makefile b/gcc/Makefile index 6542661..231ed39 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -31,7 +31,7 @@ hpl/osc32kctrl \ hpl/ramecc \ hpl/dmac \ -usb/class/cdc/device \ +usb/class/dfu/device \ hal/src \ hpl/mclk \ usb \ @@ -49,7 +49,7 @@ OBJS += \ hal/src/hal_io.o \ hpl/core/hpl_core_m4.o \ -usb/class/cdc/device/cdcdf_acm.o \ +usb/class/dfu/device/dfudf.o \ hal/utils/src/utils_syscalls.o \ hpl/dmac/hpl_dmac.o \ gcc/system_same54.o \ @@ -77,14 +77,14 @@ hal/src/hal_cache.o \ hpl/cmcc/hpl_cmcc.o \ atmel_start.o \ -usb_cdc_echo_main.o \ +usb_dfu_main.o \ usb/device/usbdc.o \ hal/src/hal_atomic.o OBJS_AS_ARGS += \ "hal/src/hal_io.o" \ "hpl/core/hpl_core_m4.o" \ -"usb/class/cdc/device/cdcdf_acm.o" \ +"usb/class/dfu/device/dfudf.o" \ "hal/utils/src/utils_syscalls.o" \ "hpl/dmac/hpl_dmac.o" \ "gcc/system_same54.o" \ @@ -112,7 +112,7 @@ "hal/src/hal_cache.o" \ "hpl/cmcc/hpl_cmcc.o" \ "atmel_start.o" \ -"usb_cdc_echo_main.o" \ +"usb_dfu_main.o" \ "usb/device/usbdc.o" \ "hal/src/hal_atomic.o" @@ -125,7 +125,7 @@ "hpl/ramecc/hpl_ramecc.d" \ "hpl/core/hpl_core_m4.d" \ "hal/utils/src/utils_syscalls.d" \ -"usb/class/cdc/device/cdcdf_acm.d" \ +"usb/class/dfu/device/dfudf.d" \ "gcc/gcc/startup_same54.d" \ "hpl/usb/hpl_usb.d" \ "hal/utils/src/utils_list.d" \ @@ -140,7 +140,7 @@ "hal/src/hal_usb_device.d" \ "hpl/dmac/hpl_dmac.d" \ "hal/src/hal_init.d" \ -"usb_cdc_echo_main.d" \ +"usb_dfu_main.d" \ "hpl/mclk/hpl_mclk.d" \ "driver_init.d" \ "hpl/osc32kctrl/hpl_osc32kctrl.d" \ @@ -199,7 +199,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -208,7 +208,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -217,7 +217,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -237,4 +237,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 \ No newline at end of file + $(OUTPUT_FILE_NAME).srec diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c new file mode 100644 index 0000000..227202e --- /dev/null +++ b/usb/class/dfu/device/dfudf.c @@ -0,0 +1,198 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Implementation. + * + * 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 + * + */ + +#include "dfudf.h" +#include "usb_protocol_dfu.h" + +/** USB Device DFU Fucntion 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; + +/** + * \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; + uint8_t i; + + ifc = desc->sod; + for (i = 0; i < 2; i++) { + 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 CDC class request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to 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)) { + // we don't verify the bmRequestType + switch (req->bRequest) { + default: + return ERR_UNSUPPORTED_OP; + } + } else { + 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 Deinitialize 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/usb_cdc_echo_main.c b/usb/class/dfu/device/dfudf.h similarity index 62% copy from usb_cdc_echo_main.c copy to usb/class/dfu/device/dfudf.h index fe02810..ba5cdd5 100644 --- a/usb_cdc_echo_main.c +++ b/usb/class/dfu/device/dfudf.h @@ -1,9 +1,10 @@ /** * \file * - * \brief Application implement + * \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 * @@ -15,7 +16,7 @@ * 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, + * 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 @@ -28,17 +29,31 @@ * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. * * \asf_license_stop - * - */ -/* - * Support and FAQ: visit Microchip Support */ -#include "atmel_start.h" -#include "atmel_start_pins.h" +#ifndef USBDF_DFU_H_ +#define USBDF_DFU_H_ -int main(void) -{ - atmel_start_init(); - cdcd_acm_example(); -} +#include "usbdc.h" + +/** + * \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/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h new file mode 100644 index 0000000..f9eca38 --- /dev/null +++ b/usb/class/dfu/device/dfudf_desc.h @@ -0,0 +1,112 @@ +/** + * \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_OCTSIM_IDVENDOR, \ + CONF_USB_OCTSIM_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_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), \ + USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ + 200, /* maximum time in milliseconds to detach (and reboot) */ \ + 1024, /* maximum transfer size */ \ + 0x0110 /*< DFU specification version 1.1 used */ ) + +#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/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h new file mode 100644 index 0000000..24ec78f --- /dev/null +++ b/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 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 + */ +#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; + uint8_t bDescriptorType; + uint8_t bmAttributes; + le16_t wDetachTimeOut; + le16_t wTransferSize; + le16_t bcdDFUVersion; +} usb_dfu_func_desc_t; + +#define USB_DFU_FUNC_DESC_LEN 0x09 +#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/usb_cdc_echo_main.c b/usb_dfu_main.c similarity index 93% rename from usb_cdc_echo_main.c rename to usb_dfu_main.c index fe02810..2535475 100644 --- a/usb_cdc_echo_main.c +++ b/usb_dfu_main.c @@ -4,6 +4,7 @@ * \brief Application implement * * 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 * @@ -40,5 +41,5 @@ int main(void) { atmel_start_init(); - cdcd_acm_example(); + usb_dfu(); } diff --git a/usb_start.c b/usb_start.c index de86172..af10c38 100644 --- a/usb_start.c +++ b/usb_start.c @@ -1,9 +1,19 @@ /* - * Code generated from Atmel Start. + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file or main.c - * to avoid loosing it when reconfiguring. + * 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 "atmel_start.h" #include "usb_start.h" @@ -11,16 +21,14 @@ #if CONF_USBD_HS_SP static uint8_t single_desc_bytes[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_HS_DESCES_LS_FS}; + DFUD_HS_DESCES_LS_FS}; static uint8_t single_desc_bytes_hs[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_HS_DESCES_HS}; -#define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS + DFUD_HS_DESCES_HS}; #else static uint8_t single_desc_bytes[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_DESCES_LS_FS}; -#define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ + DFUD_DESCES_LS_FS}; #endif static struct usbd_descriptors single_desc[] @@ -31,62 +39,19 @@ #endif }; -/** Buffers to receive and echo the communication bytes. */ -static uint32_t usbd_cdc_buffer[CDCD_ECHO_BUF_SIZ / 4]; - /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; /** - * \brief Callback invoked when bulk OUT data received + * \brief USB DFU Init */ -static bool usb_device_cb_bulk_out(const uint8_t ep, const enum usb_xfer_code rc, const uint32_t count) -{ - cdcdf_acm_write((uint8_t *)usbd_cdc_buffer, count); - - /* No error. */ - return false; -} - -/** - * \brief Callback invoked when bulk IN data received - */ -static bool usb_device_cb_bulk_in(const uint8_t ep, const enum usb_xfer_code rc, const uint32_t count) -{ - /* Echo data. */ - cdcdf_acm_read((uint8_t *)usbd_cdc_buffer, sizeof(usbd_cdc_buffer)); - - /* No error. */ - return false; -} - -/** - * \brief Callback invoked when Line State Change - */ -static bool usb_device_cb_state_c(usb_cdc_control_signal_t state) -{ - if (state.rs232.DTR) { - /* Callbacks must be registered after endpoint allocation */ - cdcdf_acm_register_callback(CDCDF_ACM_CB_READ, (FUNC_PTR)usb_device_cb_bulk_out); - cdcdf_acm_register_callback(CDCDF_ACM_CB_WRITE, (FUNC_PTR)usb_device_cb_bulk_in); - /* Start Rx */ - cdcdf_acm_read((uint8_t *)usbd_cdc_buffer, sizeof(usbd_cdc_buffer)); - } - - /* No error. */ - return false; -} - -/** - * \brief CDC ACM Init - */ -void cdc_device_acm_init(void) +void usb_dfu_init(void) { /* usb stack init */ usbdc_init(ctrl_buffer); /* usbdc_register_funcion inside */ - cdcdf_acm_init(); + dfudf_init(); usbdc_start(single_desc); usbdc_attach(); @@ -102,14 +67,12 @@ * - Open a HyperTerminal or other COM tools in PC side. * - Send out a character or string and it will echo the content received. */ -void cdcd_acm_example(void) +void usb_dfu(void) { - while (!cdcdf_acm_is_enabled()) { - // wait cdc acm to be installed + while (!dfudf_is_enabled()) { + // wait DFU to be installed }; - cdcdf_acm_register_callback(CDCDF_ACM_CB_STATE_C, (FUNC_PTR)usb_device_cb_state_c); - while (1) { } } @@ -117,5 +80,5 @@ void usb_init(void) { - cdc_device_acm_init(); + usb_dfu_init(); } diff --git a/usb_start.h b/usb_start.h index 48b2735..4e0593a 100644 --- a/usb_start.h +++ b/usb_start.h @@ -1,9 +1,19 @@ /* - * Code generated from Atmel Start. + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file or main.c - * to avoid loosing it when reconfiguring. + * 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 */ #ifndef USB_DEVICE_MAIN_H #define USB_DEVICE_MAIN_H @@ -12,11 +22,11 @@ extern "C" { #endif // __cplusplus -#include "cdcdf_acm.h" -#include "cdcdf_acm_desc.h" +#include "dfudf.h" +#include "dfudf_desc.h" -void cdcd_acm_example(void); -void cdc_device_acm_init(void); +void usb_dfu(void); +void usb_dfu_init(void); /** * \berif Initialize USB -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:15 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:15 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore gdb history file Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12497 Change subject: ignore gdb history file ...................................................................... ignore gdb history file Change-Id: Ie3acf07ad7404fa3981baf65dab2a3ef416f9938 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/97/12497/1 diff --git a/.gitignore b/.gitignore index 4608957..ad0fce7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ *.hex *.lss *.map +.gdb_history NOTES -- To view, visit https://gerrit.osmocom.org/12497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3acf07ad7404fa3981baf65dab2a3ef416f9938 Gerrit-Change-Number: 12497 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:15 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:15 +0000 Subject: Change in osmo-asf4-dfu[master]: fix USB enabling Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12498 Change subject: fix USB enabling ...................................................................... fix USB enabling Change-Id: I22cdd77648ac21490909423bf529fb31f30d6af0 --- M usb/class/dfu/device/dfudf.c 1 file changed, 22 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/98/12498/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 227202e..a146024 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -58,33 +58,31 @@ usb_iface_desc_t ifc_desc; uint8_t * ifc; - uint8_t i; ifc = desc->sod; - for (i = 0; i < 2; i++) { - 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); + 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; -- To view, visit https://gerrit.osmocom.org/12498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22cdd77648ac21490909423bf529fb31f30d6af0 Gerrit-Change-Number: 12498 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:16 +0000 Subject: Change in osmo-asf4-dfu[master]: add documentation and fix timeout value Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12499 Change subject: add documentation and fix timeout value ...................................................................... add documentation and fix timeout value Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8 --- M usb/class/dfu/device/dfudf_desc.h M usb/class/dfu/usb_protocol_dfu.h 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/99/12499/1 diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index f9eca38..5590e16 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -84,9 +84,9 @@ USB_DFU_PROTOCOL_DFU, \ CONF_USB_DFUD_IINTERFACE), \ USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ - 200, /* maximum time in milliseconds to detach (and reboot) */ \ - 1024, /* maximum transfer size */ \ - 0x0110 /*< DFU specification version 1.1 used */ ) + 0, /**< detaching makes only sense in run-time mode */ \ + 1024, /**< transfer size corresponds to page size for optimal flash writing */ \ + 0x0110 /**< DFU specification version 1.1 used */ ) #define DFUD_STR_DESCES \ CONF_USB_DFUD_LANGID_DESC \ diff --git a/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h index 24ec78f..9d5ba17 100644 --- a/usb/class/dfu/usb_protocol_dfu.h +++ b/usb/class/dfu/usb_protocol_dfu.h @@ -79,15 +79,15 @@ //! DFU Functional Descriptor typedef struct usb_dfu_func_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bmAttributes; - le16_t wDetachTimeOut; - le16_t wTransferSize; - le16_t bcdDFUVersion; + 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 0x09 +#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 */ \ -- To view, visit https://gerrit.osmocom.org/12499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8 Gerrit-Change-Number: 12499 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:16 +0000 Subject: Change in osmo-asf4-dfu[master]: add initial DFU class request handling Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12500 Change subject: add initial DFU class request handling ...................................................................... add initial DFU class request handling downloading is not supported yet, but the rest works Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf --- M usb/class/dfu/device/dfudf.c 1 file changed, 49 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/00/12500/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index a146024..c58d101 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -46,6 +46,9 @@ static struct usbdf_driver _dfudf; static struct dfudf_func_data _dfudf_funcd; +static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU state */ +static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU status */ + /** * \brief Enable DFU Function * \param[in] drv Pointer to USB device function driver @@ -149,15 +152,55 @@ if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request return ERR_NOT_FOUND; } + + int32_t to_return = ERR_NONE; + uint8_t response[6]; // buffer for the response to this request if ((req->wIndex == _dfudf_funcd.func_iface)) { // we don't verify the bmRequestType switch (req->bRequest) { - default: - return ERR_UNSUPPORTED_OP; + case USB_DFU_GETSTATUS: // get status + response[0] = dfu_status; // set status + response[1] = 100; // 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) { + dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state + } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode + dfu_state = USB_DFU_STATE_APP_DETACH; + } + 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, true); // send ACK + 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; + case USB_DFU_ABORT: // abort current operation + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK + //flash_pointer = (uint32_t)&__application_beginning; // reset download location + break; + case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode + case USB_DFU_UPLOAD: // upload firmware from flash not supported + case USB_DFU_DNLOAD: // download firmware on flash TODO implement + default: // all other DFU class request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) + break; } } else { - return ERR_NOT_FOUND; + to_return = ERR_NOT_FOUND; } + return to_return; } /** USB Device DFU Handler Struct */ @@ -177,11 +220,13 @@ 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; } /** - * \brief Deinitialize the USB DFU Function Driver + * \brief De-initialize the USB DFU Function Driver */ void dfudf_deinit(void) { -- To view, visit https://gerrit.osmocom.org/12500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf Gerrit-Change-Number: 12500 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:16 +0000 Subject: Change in osmo-asf4-dfu[master]: add flash ASF4 driver Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12501 Change subject: add flash ASF4 driver ...................................................................... add flash ASF4 driver this is imported from the Atmel Start website Change-Id: I5eccb37da64c7def7b99418773d09b6d98664432 --- A config/hpl_nvmctrl_config.h M gcc/Makefile A hal/documentation/flash.rst A hal/include/hal_flash.h A hal/include/hpl_flash.h A hal/include/hpl_user_area.h A hal/src/hal_flash.c A hpl/nvmctrl/hpl_nvmctrl.c 8 files changed, 1,705 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/01/12501/1 diff --git a/config/hpl_nvmctrl_config.h b/config/hpl_nvmctrl_config.h new file mode 100644 index 0000000..daaba85 --- /dev/null +++ b/config/hpl_nvmctrl_config.h @@ -0,0 +1,36 @@ +/* Auto-generated config file hpl_nvmctrl_config.h */ +#ifndef HPL_NVMCTRL_CONFIG_H +#define HPL_NVMCTRL_CONFIG_H + +// <<< Use Configuration Wizard in Context Menu >>> + +// Basic Settings + +// Power Reduction Mode During Sleep +// <0x00=> Wake On Access +// <0x01=> Wake Up Instant +// <0x03=> Disabled +// nvm_arch_sleepprm +#ifndef CONF_NVM_SLEEPPRM +#define CONF_NVM_SLEEPPRM 0 +#endif + +// AHB0 Cache Disable +// Indicate whether AHB0 cache is disable or not +// nvm_arch_cache0 +#ifndef CONF_NVM_CACHE0 +#define CONF_NVM_CACHE0 0 +#endif + +// AHB1 Cache Disable +// Indicate whether AHB1 cache is disable or not +// nvm_arch_cache1 +#ifndef CONF_NVM_CACHE1 +#define CONF_NVM_CACHE1 0 +#endif + +// + +// <<< end of configuration section >>> + +#endif // HPL_NVMCTRL_CONFIG_H diff --git a/gcc/Makefile b/gcc/Makefile index 231ed39..f7c5b65 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -41,6 +41,7 @@ usb/device \ hpl/oscctrl \ gcc/gcc \ +hpl/nvmctrl \ hpl/usb \ hpl/core \ hpl/cmcc @@ -52,6 +53,7 @@ usb/class/dfu/device/dfudf.o \ hal/utils/src/utils_syscalls.o \ hpl/dmac/hpl_dmac.o \ +hpl/nvmctrl/hpl_nvmctrl.o \ gcc/system_same54.o \ hpl/usb/hpl_usb.o \ hal/src/hal_delay.o \ @@ -65,6 +67,7 @@ hpl/mclk/hpl_mclk.o \ hpl/ramecc/hpl_ramecc.o \ usb/usb_protocol.o \ +hal/src/hal_flash.o \ hal/src/hal_init.o \ gcc/gcc/startup_same54.o \ hal/src/hal_usb_device.o \ @@ -81,12 +84,14 @@ usb/device/usbdc.o \ hal/src/hal_atomic.o + OBJS_AS_ARGS += \ "hal/src/hal_io.o" \ "hpl/core/hpl_core_m4.o" \ "usb/class/dfu/device/dfudf.o" \ "hal/utils/src/utils_syscalls.o" \ "hpl/dmac/hpl_dmac.o" \ +"hpl/nvmctrl/hpl_nvmctrl.o" \ "gcc/system_same54.o" \ "hpl/usb/hpl_usb.o" \ "hal/src/hal_delay.o" \ @@ -100,6 +105,7 @@ "hpl/mclk/hpl_mclk.o" \ "hpl/ramecc/hpl_ramecc.o" \ "usb/usb_protocol.o" \ +"hal/src/hal_flash.o" \ "hal/src/hal_init.o" \ "gcc/gcc/startup_same54.o" \ "hal/src/hal_usb_device.o" \ @@ -125,6 +131,7 @@ "hpl/ramecc/hpl_ramecc.d" \ "hpl/core/hpl_core_m4.d" \ "hal/utils/src/utils_syscalls.d" \ +"hpl/nvmctrl/hpl_nvmctrl.d" \ "usb/class/dfu/device/dfudf.d" \ "gcc/gcc/startup_same54.d" \ "hpl/usb/hpl_usb.d" \ @@ -136,6 +143,7 @@ "hpl/core/hpl_init.d" \ "hpl/pm/hpl_pm.d" \ "usb/usb_protocol.d" \ +"hal/src/hal_flash.d" \ "hpl/gclk/hpl_gclk.d" \ "hal/src/hal_usb_device.d" \ "hpl/dmac/hpl_dmac.d" \ @@ -199,7 +207,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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: $< @@ -208,7 +216,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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: $< @@ -217,7 +225,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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/hal/documentation/flash.rst b/hal/documentation/flash.rst new file mode 100644 index 0000000..fcc86e6 --- /dev/null +++ b/hal/documentation/flash.rst @@ -0,0 +1,52 @@ +The Flash Driver +================ + +Flash is a re-programmable memory that retains program and data +storage even with power off. + +User can write or read several bytes from any valid address in a flash. + +As to the erase/lock/unlock command, the input parameter of address should +be a bytes address aligned with the page start, otherwise, the command will fail +to be executed. At the meantime, the number of pages that can be locked or unlocked +at once depends on region size of the flash. User can get the real number +from the function return value which could be different for the different devices. + +Features +-------- + +* Initialization/de-initialization +* Writing/Reading bytes +* Locking/Unlocking/Erasing pages +* Notifications about errors or being ready for a new command + +Applications +------------ + +* Mini disk which can retain program and data storage +* Boot loader +* Non volatile storage + +Dependencies +------------ + +The peripheral which controls a re-programmable flash memory. + +Concurrency +----------- + +N/A + +Limitations +----------- + +User should pay attention to set a proper stack size in their application, +since the driver manages a temporary buffer in stack to cache unchanged data +when calling flash write and erase function. +Due to flash memory architecture of SAMD21/D20/L21/L22/C20/C21/D09/D10/D11/R21, +write operation erazes row content before each write. + +Known issues and workarounds +---------------------------- + +N/A diff --git a/hal/include/hal_flash.h b/hal/include/hal_flash.h new file mode 100644 index 0000000..8216afd --- /dev/null +++ b/hal/include/hal_flash.h @@ -0,0 +1,209 @@ +/** + * \file + * + * \brief Flash related functionality declaration. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HAL_FLASH_H_INCLUDED +#define _HAL_FLASH_H_INCLUDED + +#include + +/** + * \addtogroup doc_driver_hal_flash + * + * @{ + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Forward declaration of flash_descriptor. */ +struct flash_descriptor; + +/** The callback types */ +enum flash_cb_type { + /** Callback type for ready to accept a new command */ + FLASH_CB_READY, + /** Callback type for error */ + FLASH_CB_ERROR, + FLASH_CB_N +}; + +/** \brief Prototype of callback on FLASH + * + */ +typedef void (*flash_cb_t)(struct flash_descriptor *const descr); + +/** \brief FLASH HAL callbacks + * + */ +struct flash_callbacks { + /** Callback invoked when ready to accept a new command */ + flash_cb_t cb_ready; + /** Callback invoked when error occurs */ + flash_cb_t cb_error; +}; + +/** \brief FLASH HAL driver struct for asynchronous access + */ +struct flash_descriptor { + /** Pointer to FLASH device instance */ + struct _flash_device dev; + /** Callbacks for asynchronous transfer */ + struct flash_callbacks callbacks; +}; + +/** \brief Initialize the FLASH HAL instance and hardware for callback mode + * + * Initialize FLASH HAL with interrupt mode (uses callbacks). + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] hw Pointer to the hardware base. + * \return Initialize status. + */ +int32_t flash_init(struct flash_descriptor *flash, void *const hw); + +/** \brief Deinitialize the FLASH HAL instance + * + * Abort transfer, disable and reset FLASH, and deinitialize software. + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \return Deinitialze status. + */ +int32_t flash_deinit(struct flash_descriptor *flash); + +/** \brief Writes a number of bytes to a page in the internal Flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to a buffer where the content + * will be written to the flash + * \param[in] length Number of bytes to write + * \return Write status. + */ +int32_t flash_write(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Appends a number of bytes to a page in the internal Flash + * + * This functions never erases the flash before writing. + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address to write to flash + * \param[in] buffer Pointer to a buffer with data to write to flash + * \param[in] length Number of bytes to append + * \return Append status. + */ +int32_t flash_append(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Reads a number of bytes to a page in the internal Flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read pages will be stored + * \param[in] length Number of bytes to read + * \return Read status. + */ +int32_t flash_read(struct flash_descriptor *flash, uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** \brief Register a function as FLASH transfer completion callback + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] type Callback type (\ref flash_cb_type). + * \param[in] func Pointer to callback function. + * \retval 0 Success + * \retval -1 Error + */ +int32_t flash_register_callback(struct flash_descriptor *flash, const enum flash_cb_type type, flash_cb_t func); + +/** \brief Execute lock in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be locked + * \param[in] page_nums Number of pages to be locked + * + * \return Real locked numbers of pages. + */ +int32_t flash_lock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** \brief Execute unlock in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be unlocked + * \param[in] page_nums Number of pages to be unlocked + * + * \return Real unlocked numbers of pages. + */ +int32_t flash_unlock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** \brief Execute erase in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be erased + * \param[in] page_nums Number of pages to be erased + * \retval 0 Success + * \retval -1 Error + */ +int32_t flash_erase(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** + * \brief Get the flash page size + * + * \param[in, out] flash Pointer to the HAL FLASH instance + * + * \return The flash page size + */ +uint32_t flash_get_page_size(struct flash_descriptor *flash); + +/** + * \brief Get the number of flash page + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * + * \return The flash total page numbers + */ +uint32_t flash_get_total_pages(struct flash_descriptor *flash); + +/** \brief Retrieve the current driver version + * + * \return Current driver version. + */ +uint32_t flash_get_version(void); + +#ifdef __cplusplus +} +#endif +/**@}*/ +#endif /* ifndef _HAL_FLASH_H_INCLUDED */ diff --git a/hal/include/hpl_flash.h b/hal/include/hpl_flash.h new file mode 100644 index 0000000..3a42c44 --- /dev/null +++ b/hal/include/hpl_flash.h @@ -0,0 +1,265 @@ +/** + * \file + * + * \brief FLASH related functionality declaration. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HPL_FLASH_H_INCLUDED +#define _HPL_FLASH_H_INCLUDED + +/** + * \addtogroup hpl__flash__group FLASH HPL APIs + * + */ + +/**@{*/ + +#include +#include "hpl_irq.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief FLASH device structure + * + * The FLASH device structure forward declaration. + */ +struct _flash_device; + +/** The callback types */ +enum _flash_cb_type { FLASH_DEVICE_CB_READY, FLASH_DEVICE_CB_ERROR, FLASH_DEVICE_CB_N }; + +/** + * \brief FLASH interrupt handlers structure + */ +struct _flash_callback { + /** Ready to accept new command handler */ + void (*ready_cb)(struct _flash_device *device); + /** Error handler */ + void (*error_cb)(struct _flash_device *device); +}; + +/** + * \brief FLASH descriptor device structure. + */ +struct _flash_device { + struct _flash_callback flash_cb; /*!< Interrupt handers */ + struct _irq_descriptor irq; /*!< Interrupt descriptor */ + void * hw; /*!< Hardware module instance handler */ +}; + +/** + * \brief Initialize FLASH. + * + * This function does low level FLASH configuration. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] hw The pointer to hardware instance + * + * \return Initialize status. + */ +int32_t _flash_init(struct _flash_device *const device, void *const hw); + +/** + * \brief Deinitialize FLASH. + * + * \param[in] device The pointer to FLASH device instance + */ +void _flash_deinit(struct _flash_device *const device); + +/** + * \brief Reads a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read page will be stored + * \param[in] length Number of bytes to read + */ +void _flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Writes a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] length Number of bytes to write + */ +void _flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Appends a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer with data to write to flash + * \param[in] length Number of bytes to write + */ +void _flash_append(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Execute lock in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be locked + * \param[in] page_nums Number of pages to be locked + * + * \return Real locked numbers of pages. + */ +int32_t _flash_lock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** \brief Execute unlock in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be unlocked + * \param[in] page_nums Number of pages to be unlocked + * + * \return Real unlocked numbers of pages. + */ +int32_t _flash_unlock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** \brief check whether the region which is pointed by address + * is locked + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to check + * + * \return The lock status of assigned address. + */ +bool _flash_is_locked(struct _flash_device *const device, const uint32_t dst_addr); + +/** \brief Execute erase in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be erased + * \param[in] page_nums Number of pages to be erased + */ +void _flash_erase(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** + * \brief Get the flash page size. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash page size + */ +uint32_t _flash_get_page_size(struct _flash_device *const device); + +/** + * \brief Get the numbers of flash page. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash total page numbers + */ +uint32_t _flash_get_total_pages(struct _flash_device *const device); + +/** + * \brief Get the number of wait states for read and write operations. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The number of wait states for read and write operations + */ +uint8_t _flash_get_wait_state(struct _flash_device *const device); + +/** + * \brief Set the number of wait states for read and write operations. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] state The number of wait states + * + */ +void _flash_set_wait_state(struct _flash_device *const device, uint8_t state); + +/** + * \brief Enable/disable Flash interrupt + * + * param[in] device The pointer to Flash device instance + * param[in] type The type of interrupt to disable/enable if applicable + * param[in] state Enable or disable + */ +void _flash_set_irq_state(struct _flash_device *const device, const enum _flash_cb_type type, const bool state); + +/* + * Below RWW flash APIs are only available for device which has RWWEE + * flash array, such as SAM C20/C21/D21/L21/L22/R30/DA1/HA1 etc. + */ +/** + * \brief Get the RWWEE flash page size. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash page size + */ +uint32_t _rww_flash_get_page_size(struct _flash_device *const device); + +/** + * \brief Get the total page numbers of RWWEE flash. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash total page numbers + */ +uint32_t _rww_flash_get_total_pages(struct _flash_device *const device); + +/** + * \brief Reads a number of bytes in the internal RWWEE Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read page will be stored + * \param[in] length Number of bytes to read + * + * \return Read status, ERR_NONE for successful read. + */ +int32_t _rww_flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Writes a number of bytes in the internal RWWEE Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] length Number of bytes to write + * + * \return Write status, ERR_NONE for successful write. + */ +int32_t _rww_flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); +#ifdef __cplusplus +} +#endif + +/**@}*/ + +#endif /* _HPL_FLASH_H_INCLUDED */ diff --git a/hal/include/hpl_user_area.h b/hal/include/hpl_user_area.h new file mode 100644 index 0000000..1f14098 --- /dev/null +++ b/hal/include/hpl_user_area.h @@ -0,0 +1,123 @@ +/** + * \file + * + * \brief Special user data area access + * + * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HPL_USER_DATA_H_INCLUDED +#define _HPL_USER_DATA_H_INCLUDED + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief Read data from user data area + * + * The user data area could be the area that stores user data that is not erased + * with the flash contents, e.g., + * - NVM Software Calibration Area of SAM D/L/C family + * - User Signature of SAM E/S/V 70 + * + * \param[in] base The base address of the user area + * \param[in] offset The byte offset of the data to be read inside the area + * \param[out] buf Pointer to buffer to place the read data + * \param[in] size Size of data in number of bytes + * + * \return Operation status or bytes read. + * \retval ERR_NONE Data read successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_read(const void *base, const uint32_t offset, uint8_t *buf, const uint32_t size); + +/** + * \brief Read no more than 32 bits data from user data area + * + * When reading bits, the bitfield can cross 32-bis boundaries. + * + * \param[in] base The base address of the user area + * \param[in] bit_offset Offset in number of bits + * \param[in] n_bits Number of bits to read + * \return data read, assert if anything wrong (address not in user area + * offset, size error, etc.). + */ +uint32_t _user_area_read_bits(const void *base, const uint32_t bit_offset, const uint8_t n_bits); + +/** + * \brief Write data to user data area + * + * The user data area could be the area that stores user data that is not erased + * with the flash contents, e.g., + * - NVM Software Calibration Area of SAM D/L/C family + * - User Signature of SAM E/S/V 70 + * + * When assigned offset and size exceeds the data area, error is reported. + * + * \param[out] base The base address of the user area + * \param[in] offset The offset of the data to be written inside the area + * \param[in] buf Pointer to buffer to place the written data + * \param[in] size Size of data in number of bytes + * + * \return Operation status or bytes writting. + * \retval ERR_NONE Data written successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_DENIED Security bit is set + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_write(void *base, const uint32_t offset, const uint8_t *buf, const uint32_t size); + +/** + * \brief Write no more than 32 bits data to user data area + * + * When writting bits, the bitfield can cross 32-bis boundaries. + * + * \param[out] base The base address of the user area + * \param[in] bit_offset Offset in number of bits + * \param[in] bits The data content + * \param[in] n_bits Number of bits to write + * \return Operation result + * \retval ERR_NONE Data written successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_DENIED Security bit is set + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_write_bits(void *base, const uint32_t bit_offset, const uint32_t bits, const uint8_t n_bits); + +#ifdef __cplusplus +} +#endif + +#endif /* _HPL_USER_DATA_H_INCLUDED */ diff --git a/hal/src/hal_flash.c b/hal/src/hal_flash.c new file mode 100644 index 0000000..b1a58b7 --- /dev/null +++ b/hal/src/hal_flash.c @@ -0,0 +1,314 @@ +/** + * \file + * + * \brief Flash functionality implementation. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 + * + */ + +#include "hal_flash.h" +#include +#include +#include + +/** + * \brief Driver version + */ +#define DRIVER_VERSION 0x00000001u + +static void flash_ready(struct _flash_device *device); +static void flash_error(struct _flash_device *device); + +static int32_t flash_is_address_aligned(struct flash_descriptor *flash, const uint32_t flash_addr); + +/** + * \brief Initialize the FLASH HAL instance and hardware for callback mode. + */ +int32_t flash_init(struct flash_descriptor *flash, void *const hw) +{ + int32_t rc; + + ASSERT(flash && hw); + + rc = _flash_init(&flash->dev, hw); + if (rc) { + return rc; + } + + flash->dev.flash_cb.ready_cb = flash_ready; + flash->dev.flash_cb.error_cb = flash_error; + + return ERR_NONE; +} + +/** + * \brief Deinitialize the FLASH HAL instance. + */ +int32_t flash_deinit(struct flash_descriptor *flash) +{ + ASSERT(flash); + + _flash_deinit(&flash->dev); + + return ERR_NONE; +} + +/** + * \brief Reads a number of bytes to a page in the internal Flash + */ +int32_t flash_read(struct flash_descriptor *flash, uint32_t src_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((src_addr > page_size * total_pages) || (src_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + _flash_read(&flash->dev, src_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Updates several bytes to the internal Flash + */ +int32_t flash_write(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((dst_addr > page_size * total_pages) || (dst_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + if (_flash_is_locked(&flash->dev, dst_addr)) { + return ERR_DENIED; + } + + _flash_write(&flash->dev, dst_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Appends a number of bytes to a page in the internal Flash + */ +int32_t flash_append(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((dst_addr > page_size * total_pages) || (dst_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + if (_flash_is_locked(&flash->dev, dst_addr)) { + return ERR_DENIED; + } + + _flash_append(&flash->dev, dst_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Execute erase in the internal flash + */ +int32_t flash_erase(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + _flash_erase(&flash->dev, dst_addr, page_nums); + + return ERR_NONE; +} + +/** + * \brief Register a function as FLASH transfer completion callback + */ +int32_t flash_register_callback(struct flash_descriptor *flash, const enum flash_cb_type type, flash_cb_t func) +{ + ASSERT(flash); + + switch (type) { + case FLASH_CB_READY: + flash->callbacks.cb_ready = func; + break; + + case FLASH_CB_ERROR: + flash->callbacks.cb_error = func; + break; + + default: + return ERR_INVALID_ARG; + } + + _flash_set_irq_state(&flash->dev, (enum _flash_cb_type)type, NULL != func); + + return ERR_NONE; +} + +/** + * \brief Execute lock in the internal flash + */ +int32_t flash_lock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + return _flash_lock(&flash->dev, dst_addr, page_nums); +} + +/** + * \brief Execute unlock in the internal flash + */ +int32_t flash_unlock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + return _flash_unlock(&flash->dev, dst_addr, page_nums); +} + +/** + * \brief Get the flash page size. + */ +uint32_t flash_get_page_size(struct flash_descriptor *flash) +{ + ASSERT(flash); + return _flash_get_page_size(&flash->dev); +} + +/** + * \brief Get the numbers of flash page. + */ +uint32_t flash_get_total_pages(struct flash_descriptor *flash) +{ + ASSERT(flash); + return _flash_get_total_pages(&flash->dev); +} + +/** + * \brief Retrieve the current driver version + */ +uint32_t flash_get_version(void) +{ + return DRIVER_VERSION; +} + +/** + * \internal check the address whether it is aligned + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] flash_addr address to be check in flash + * + * \return whether it is valid + * \retval 0 Valid. + * \retval -1 Error, invalid. + */ +static int32_t flash_is_address_aligned(struct flash_descriptor *flash, const uint32_t flash_addr) +{ + ASSERT(flash); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + + /* Check if the read address not aligned to the start of a page */ + if (flash_addr & (page_size - 1)) { + return ERR_BAD_ADDRESS; + } + return ERR_NONE; +} + +/** + * \internal Ready for a new flash command + * + * \param[in] device The pointer to flash device structure + */ +static void flash_ready(struct _flash_device *device) +{ + struct flash_descriptor *const descr = CONTAINER_OF(device, struct flash_descriptor, dev); + if (descr->callbacks.cb_ready) { + descr->callbacks.cb_ready(descr); + } +} + +/** + * \internal Error occurs in flash command + * + * \param[in] device The pointer to flash device structure + */ +static void flash_error(struct _flash_device *device) +{ + struct flash_descriptor *const descr = CONTAINER_OF(device, struct flash_descriptor, dev); + if (descr->callbacks.cb_error) { + descr->callbacks.cb_error(descr); + } +} diff --git a/hpl/nvmctrl/hpl_nvmctrl.c b/hpl/nvmctrl/hpl_nvmctrl.c new file mode 100644 index 0000000..63f6145 --- /dev/null +++ b/hpl/nvmctrl/hpl_nvmctrl.c @@ -0,0 +1,695 @@ + +/** + * \file + * + * \brief Non-Volatile Memory Controller + * + * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 + * + */ + +#include +#include +#include +#include +#include +#include + +#define NVM_MEMORY ((volatile uint32_t *)FLASH_ADDR) +#define NVMCTRL_BLOCK_PAGES (NVMCTRL_BLOCK_SIZE / NVMCTRL_PAGE_SIZE) +#define NVMCTRL_REGIONS_NUM 32 +#define NVMCTRL_INTFLAG_ERR \ + (NVMCTRL_INTFLAG_ADDRE | NVMCTRL_INTFLAG_PROGE | NVMCTRL_INTFLAG_LOCKE | NVMCTRL_INTFLAG_ECCSE \ + | NVMCTRL_INTFLAG_NVME | NVMCTRL_INTFLAG_SEESOVF) +/** + * \brief NVM configuration type + */ +struct nvm_configuration { + hri_nvmctrl_ctrlb_reg_t ctrla; /*!< Control B Register */ +}; + +/** + * \brief Array of NVM configurations + */ +static struct nvm_configuration _nvm + = {(CONF_NVM_CACHE0 << NVMCTRL_CTRLA_CACHEDIS0_Pos) | (CONF_NVM_CACHE1 << NVMCTRL_CTRLA_CACHEDIS1_Pos) + | (NVMCTRL_CTRLA_PRM(CONF_NVM_SLEEPPRM))}; + +/*!< Pointer to hpl device */ +static struct _flash_device *_nvm_dev = NULL; + +static void _flash_erase_block(void *const hw, const uint32_t dst_addr); +static void _flash_program(void *const hw, const uint32_t dst_addr, const uint8_t *buffer, const uint16_t size); + +/** + * \brief Initialize NVM + */ +int32_t _flash_init(struct _flash_device *const device, void *const hw) +{ + uint32_t ctrla; + + ASSERT(device && (hw == NVMCTRL)); + + device->hw = hw; + ctrla = hri_nvmctrl_read_CTRLA_reg(hw); + ctrla &= ~(NVMCTRL_CTRLA_CACHEDIS0 | NVMCTRL_CTRLA_CACHEDIS1 | NVMCTRL_CTRLA_PRM_Msk); + ctrla |= _nvm.ctrla; + hri_nvmctrl_write_CTRLA_reg(hw, ctrla); + + _nvm_dev = device; + NVIC_DisableIRQ(NVMCTRL_0_IRQn); + NVIC_DisableIRQ(NVMCTRL_1_IRQn); + NVIC_ClearPendingIRQ(NVMCTRL_0_IRQn); + NVIC_ClearPendingIRQ(NVMCTRL_1_IRQn); + NVIC_EnableIRQ(NVMCTRL_0_IRQn); + NVIC_EnableIRQ(NVMCTRL_1_IRQn); + + return ERR_NONE; +} + +/** + * \brief De-initialize NVM + */ +void _flash_deinit(struct _flash_device *const device) +{ + device->hw = NULL; + NVIC_DisableIRQ(NVMCTRL_0_IRQn); + NVIC_DisableIRQ(NVMCTRL_1_IRQn); +} + +/** + * \brief Get the flash page size. + */ +uint32_t _flash_get_page_size(struct _flash_device *const device) +{ + (void)device; + return (uint32_t)NVMCTRL_PAGE_SIZE; +} + +/** + * \brief Get the numbers of flash page. + */ +uint32_t _flash_get_total_pages(struct _flash_device *const device) +{ + (void)device; + return (uint32_t)hri_nvmctrl_read_PARAM_NVMP_bf(device->hw); +} + +/** + * \brief Get the number of wait states for read and write operations. + */ +uint8_t _flash_get_wait_state(struct _flash_device *const device) +{ + return hri_nvmctrl_get_CTRLA_reg(device->hw, NVMCTRL_CTRLA_RWS_Msk); +} + +/** + * \brief Set the number of wait states for read and write operations. + */ +void _flash_set_wait_state(struct _flash_device *const device, uint8_t state) +{ + hri_nvmctrl_write_CTRLA_RWS_bf(device->hw, state); +} + +/** + * \brief Reads a number of bytes to a page in the internal Flash. + */ +void _flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length) +{ + uint8_t *nvm_addr = (uint8_t *)NVM_MEMORY; + uint32_t i; + + /* Check if the module is busy */ + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + for (i = 0; i < length; i++) { + buffer[i] = nvm_addr[src_addr + i]; + } +} + +/** + * \brief Writes a number of bytes to a page in the internal Flash. + */ +void _flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + uint8_t tmp_buffer[NVMCTRL_BLOCK_PAGES][NVMCTRL_PAGE_SIZE]; + uint32_t block_start_addr, block_end_addr; + uint32_t i, j, k; + uint32_t wr_start_addr = dst_addr; + + do { + block_start_addr = wr_start_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + block_end_addr = block_start_addr + NVMCTRL_BLOCK_SIZE - 1; + + /* store the erase data into temp buffer before write */ + for (i = 0; i < NVMCTRL_BLOCK_PAGES; i++) { + _flash_read(device, block_start_addr + i * NVMCTRL_PAGE_SIZE, tmp_buffer[i], NVMCTRL_PAGE_SIZE); + } + + /* temp buffer update */ + j = (wr_start_addr - block_start_addr) / NVMCTRL_PAGE_SIZE; + k = wr_start_addr - block_start_addr - j * NVMCTRL_PAGE_SIZE; + while ((wr_start_addr <= block_end_addr) && (length > 0)) { + tmp_buffer[j][k] = *buffer; + k = (k + 1) % NVMCTRL_PAGE_SIZE; + + if (0 == k) { + j++; + } + + wr_start_addr++; + buffer++; + length--; + } + + /* erase row before write */ + _flash_erase_block(device->hw, block_start_addr); + + /* write buffer to flash */ + for (i = 0; i < NVMCTRL_BLOCK_PAGES; i++) { + _flash_program(device->hw, block_start_addr + i * NVMCTRL_PAGE_SIZE, tmp_buffer[i], NVMCTRL_PAGE_SIZE); + } + } while (block_end_addr < (wr_start_addr + length - 1)); +} + +/** + * \brief Appends a number of bytes in the internal Flash. + */ +void _flash_append(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + uint32_t page_start_addr = dst_addr & ~(NVMCTRL_PAGE_SIZE - 1); + uint32_t size; + uint32_t offset = 0; + + if (dst_addr != page_start_addr) { + /* Need to write some data to the end of a page */ + size = min(length, NVMCTRL_PAGE_SIZE - (dst_addr - page_start_addr)); + _flash_program(device->hw, dst_addr, buffer, size); + page_start_addr += NVMCTRL_PAGE_SIZE; + offset += size; + } + + while (offset < length) { + size = min(length - offset, NVMCTRL_PAGE_SIZE); + _flash_program(device->hw, page_start_addr, buffer + offset, size); + page_start_addr += NVMCTRL_PAGE_SIZE; + offset += size; + } +} + +/** + * \brief Execute erase in the internal flash + */ +void _flash_erase(struct _flash_device *const device, uint32_t dst_addr, uint32_t page_nums) +{ + uint8_t tmp_buffer[NVMCTRL_PAGE_SIZE]; + uint32_t block_start_addr; + uint32_t i; + + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + memset(tmp_buffer, 0xFF, NVMCTRL_PAGE_SIZE); + + /* when address is not aligned with block start address */ + if (dst_addr != block_start_addr) { + block_start_addr += NVMCTRL_BLOCK_SIZE; + for (i = 0; i < NVMCTRL_BLOCK_PAGES - 1; i++) { + _flash_write(device, dst_addr, tmp_buffer, NVMCTRL_PAGE_SIZE); + + if (--page_nums == 0) { + return; + } + + dst_addr += NVMCTRL_PAGE_SIZE; + + if (dst_addr == block_start_addr) { + break; + } + } + } + + while (page_nums >= NVMCTRL_BLOCK_PAGES) { + _flash_erase_block(device->hw, block_start_addr); + block_start_addr += NVMCTRL_BLOCK_SIZE; + page_nums -= NVMCTRL_BLOCK_PAGES; + } + + if (page_nums != 0) { + for (i = 0; i < page_nums; i++) { + _flash_write(device, block_start_addr, tmp_buffer, NVMCTRL_PAGE_SIZE); + block_start_addr += NVMCTRL_PAGE_SIZE; + } + } +} + +/** + * \brief Execute lock in the internal flash + */ +int32_t _flash_lock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums) +{ + uint32_t region_pages; + uint32_t block_start_addr; + + region_pages = (uint32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + if ((page_nums != region_pages) || (dst_addr != block_start_addr)) { + return ERR_INVALID_ARG; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(device->hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(device->hw, NVMCTRL_CTRLB_CMD_LR | NVMCTRL_CTRLB_CMDEX_KEY); + + return (int32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); +} + +/** + * \brief Execute unlock in the internal flash + */ +int32_t _flash_unlock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums) +{ + uint32_t region_pages; + uint32_t block_start_addr; + + region_pages = (uint32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + if ((page_nums != region_pages) || (dst_addr != block_start_addr)) { + return ERR_INVALID_ARG; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(device->hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(device->hw, NVMCTRL_CTRLB_CMD_UR | NVMCTRL_CTRLB_CMDEX_KEY); + + return (int32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); +} + +/** + * \brief check whether the region which is pointed by address + */ +bool _flash_is_locked(struct _flash_device *const device, const uint32_t dst_addr) +{ + uint16_t region_id; + + /* Get region for given page */ + region_id = dst_addr / (FLASH_SIZE / NVMCTRL_REGIONS_NUM); + + return !(hri_nvmctrl_get_RUNLOCK_reg(device->hw, 1 << region_id)); +} + +/** + * \brief Enable/disable Flash interrupt + */ +void _flash_set_irq_state(struct _flash_device *const device, const enum _flash_cb_type type, const bool state) +{ + ASSERT(device); + + if (FLASH_DEVICE_CB_READY == type) { + hri_nvmctrl_write_INTEN_DONE_bit(device->hw, state); + } else if (FLASH_DEVICE_CB_ERROR == type) { + if (state) { + hri_nvmctrl_write_INTEN_reg(device->hw, NVMCTRL_INTFLAG_ERR); + } else { + hri_nvmctrl_clear_INTEN_reg(device->hw, NVMCTRL_INTFLAG_ERR); + } + } +} + +/** + * \internal erase a row in flash + * \param[in] hw The pointer to hardware instance + * \param[in] dst_addr Destination page address to erase + */ +static void _flash_erase_block(void *const hw, const uint32_t dst_addr) +{ + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + /* Set address and command */ + hri_nvmctrl_write_ADDR_reg(hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_EB | NVMCTRL_CTRLB_CMDEX_KEY); +} + +/** + * \internal write a page in flash + * \param[in] hw The pointer to hardware instance + * \param[in] dst_addr Destination page address to write + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] size The size of data to write to a page + */ +static void _flash_program(void *const hw, const uint32_t dst_addr, const uint8_t *buffer, const uint16_t size) +{ + uint32_t *ptr_read = (uint32_t *)buffer; + uint32_t nvm_address = dst_addr / 4; + uint16_t i; + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_PBC | NVMCTRL_CTRLB_CMDEX_KEY); + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + /* Writes to the page buffer must be 32 bits, perform manual copy + * to ensure alignment */ + for (i = 0; i < size; i += 4) { + NVM_MEMORY[nvm_address++] = *ptr_read; + ptr_read++; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_WP | NVMCTRL_CTRLB_CMDEX_KEY); +} + +/** + * \internal NVM interrupt handler + * + * \param[in] p The pointer to interrupt parameter + */ +static void _nvm_interrupt_handler(struct _flash_device *device) +{ + void *const hw = device->hw; + + if (hri_nvmctrl_get_INTFLAG_DONE_bit(hw)) { + hri_nvmctrl_clear_INTFLAG_DONE_bit(hw); + + if (NULL != device->flash_cb.ready_cb) { + device->flash_cb.ready_cb(device); + } + } else if (hri_nvmctrl_read_INTFLAG_reg(hw) && ~NVMCTRL_INTFLAG_ERR) { + hri_nvmctrl_clear_INTFLAG_reg(hw, NVMCTRL_INTFLAG_ERR); + + if (NULL != device->flash_cb.error_cb) { + device->flash_cb.error_cb(device); + } + } +} + +/** + * \internal NVM 0 interrupt handler + */ +void NVMCTRL_0_Handler(void) +{ + _nvm_interrupt_handler(_nvm_dev); +} + +/** + * \internal NVM 1 interrupt handler + */ +void NVMCTRL_1_Handler(void) +{ + _nvm_interrupt_handler(_nvm_dev); +} + +/* + The NVM User Row contains calibration data that are automatically read at device + power on. + The NVM User Row can be read at address 0x804000. + + The first eight 32-bit words (32 Bytes) of the Non Volatile Memory (NVM) User + Page contain calibration data that are automatically read at device power-on. + The remaining 480 Bytes can be used for storing custom parameters. + */ +#ifndef _NVM_USER_ROW_BASE +#define _NVM_USER_ROW_BASE 0x804000 +#endif +#define _NVM_USER_ROW_N_BITS 4096 +#define _NVM_USER_ROW_N_BYTES (_NVM_USER_ROW_N_BITS / 8) +#define _NVM_USER_ROW_END (((uint8_t *)_NVM_USER_ROW_BASE) + _NVM_USER_ROW_N_BYTES - 1) +#define _IS_NVM_USER_ROW(b) \ + (((uint8_t *)(b) >= (uint8_t *)(_NVM_USER_ROW_BASE)) && ((uint8_t *)(b) <= (uint8_t *)(_NVM_USER_ROW_END))) +#define _IN_NVM_USER_ROW(b, o) (((uint8_t *)(b) + (o)) <= (uint8_t *)(_NVM_USER_ROW_END)) + +/* + The NVM Software Calibration Area can be read at address 0x00800080. + The NVM Software Calibration Area can not be written. + */ +#ifndef _NVM_SW_CALIB_AREA_BASE +#define _NVM_SW_CALIB_AREA_BASE 0x00800080 +#endif +#define _NVM_SW_CALIB_AREA_N_BITS 45 +#define _NVM_SW_CALIB_AREA_N_BYTES (_NVM_SW_CALIB_AREA_N_BITS / 8) +#define _NVM_SW_CALIB_AREA_END (((uint8_t *)_NVM_SW_CALIB_AREA_BASE) + _NVM_SW_CALIB_AREA_N_BYTES - 1) +#define _IS_NVM_SW_CALIB_AREA(b) \ + (((uint8_t *)(b) >= (uint8_t *)_NVM_SW_CALIB_AREA_BASE) && ((uint8_t *)(b) <= (uint8_t *)_NVM_SW_CALIB_AREA_END)) +#define _IN_NVM_SW_CALIB_AREA(b, o) (((uint8_t *)(b) + (o)) <= (uint8_t *)(_NVM_SW_CALIB_AREA_END)) + +/** + * \internal Read left aligned data bits + * \param[in] base Base address for the data + * \param[in] bit_offset Offset for the bitfield start + * \param[in] n_bits Number of bits in the bitfield + */ +static inline uint32_t _user_area_read_l32_bits(const volatile uint32_t *base, const uint32_t bit_offset, + const uint8_t n_bits) +{ + return base[bit_offset >> 5] & ((1 << n_bits) - 1); +} + +/** + * \internal Read right aligned data bits + * \param[in] base Base address for the data + * \param[in] bit_offset Offset for the bitfield start + * \param[in] n_bits Number of bits in the bitfield + */ +static inline uint32_t _user_area_read_r32_bits(const volatile uint32_t *base, const uint32_t bit_offset, + const uint8_t n_bits) +{ + return (base[bit_offset >> 5] >> (bit_offset & 0x1F)) & ((1 << n_bits) - 1); +} + +int32_t _user_area_read(const void *base, const uint32_t offset, uint8_t *buf, uint32_t size) +{ + ASSERT(buf); + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, offset)) { + return ERR_BAD_ADDRESS; + } + + /* Cut off if request too many bytes */ + if (!_IN_NVM_USER_ROW(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + if (!_IN_NVM_SW_CALIB_AREA(base, offset)) { + return ERR_BAD_ADDRESS; + } + + /* Cut off if request too many bytes */ + if (!_IN_NVM_SW_CALIB_AREA(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else { + return ERR_UNSUPPORTED_OP; + } + + /* Copy data */ + memcpy(buf, ((uint8_t *)base) + offset, size); + return ERR_NONE; +} + +uint32_t _user_area_read_bits(const void *base, const uint32_t bit_offset, const uint8_t n_bits) +{ + volatile uint32_t *mem_base = (volatile uint32_t *)base; + uint32_t l_off, l_bits; + uint32_t r_off, r_bits; + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + ASSERT(_IN_NVM_USER_ROW(base, bit_offset >> 3) && _IN_NVM_USER_ROW(base, (bit_offset + n_bits - 1) >> 3)); + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + ASSERT(_IN_NVM_SW_CALIB_AREA(base, bit_offset >> 3) + && _IN_NVM_SW_CALIB_AREA(base, (bit_offset + n_bits - 1) >> 3)); + } else { + ASSERT(false); + } + + /* Since the bitfield can cross 32-bits boundaries, + * left and right bits are read from 32-bit aligned address + * and then combined together. */ + l_off = bit_offset & (~(32 - 1)); + r_off = l_off + 32; + l_bits = 32 - (bit_offset & (32 - 1)); + + if (n_bits > l_bits) { + r_bits = n_bits - l_bits; + } else { + l_bits = n_bits; + r_bits = 0; + } + + return _user_area_read_r32_bits(mem_base, bit_offset, l_bits) + + (_user_area_read_l32_bits(mem_base, r_off, r_bits) << l_bits); +} + +/** \internal Write 4096-bit user row + * \param[in] _row Pointer to 4096-bit user row data. + */ +static int32_t _user_row_write_exec(const uint32_t *_row) +{ + Nvmctrl *hw = NVMCTRL; + uint32_t ctrla = hri_nvmctrl_read_CTRLA_reg(NVMCTRL); + uint32_t i; + + /* Denied if Security Bit is set */ + if (DSU->STATUSB.bit.PROT) { + return ERR_DENIED; + } + + /* Do Save */ + + /* - Prepare. */ + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + hri_nvmctrl_clear_CTRLA_WMODE_bf(NVMCTRL, NVMCTRL_CTRLA_WMODE_Msk); + + /* - Erase AUX row. */ + hri_nvmctrl_write_ADDR_reg(hw, (hri_nvmctrl_addr_reg_t)_NVM_USER_ROW_BASE); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_EP | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + for (i = 0; i < 32; i++) { /* 32 Quad words for User row: 32 * (4 bytes * 4) = 512 bytes */ + /* - Page buffer clear & write. */ + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_PBC | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + *(((uint32_t *)NVMCTRL_USER) + i * 4) = _row[i * 4]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 1) = _row[i * 4 + 1]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 2) = _row[i * 4 + 2]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 3) = _row[i * 4 + 3]; + + /* - Write AUX row. */ + hri_nvmctrl_write_ADDR_reg(hw, (hri_nvmctrl_addr_reg_t)(_NVM_USER_ROW_BASE + i * 16)); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_WQW | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + } + + /* Restore CTRLA */ + hri_nvmctrl_write_CTRLA_reg(NVMCTRL, ctrla); + + return ERR_NONE; +} + +int32_t _user_area_write(void *base, const uint32_t offset, const uint8_t *buf, const uint32_t size) +{ + uint32_t _row[NVMCTRL_PAGE_SIZE / 4]; /* Copy of user row. */ + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, offset)) { + return ERR_BAD_ADDRESS; + } else if (!_IN_NVM_USER_ROW(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + return ERR_DENIED; + } else { + return ERR_UNSUPPORTED_OP; + } + + memcpy(_row, base, NVMCTRL_PAGE_SIZE); /* Store previous data. */ + memcpy((uint8_t *)_row + offset, buf, size); /* Modify with buf data. */ + + return _user_row_write_exec(_row); +} + +int32_t _user_area_write_bits(void *base, const uint32_t bit_offset, const uint32_t bits, const uint8_t n_bits) +{ + uint32_t _row[NVMCTRL_PAGE_SIZE / 4]; /* Copy of user row. */ + uint32_t l_off, l_bits; + uint32_t r_off, r_bits; + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, bit_offset >> 3)) { + return ERR_BAD_ADDRESS; + } else if (!_IN_NVM_USER_ROW(base, (bit_offset + n_bits - 1) >> 3)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + return ERR_DENIED; + } else { + return ERR_UNSUPPORTED_OP; + } + + /* Since the bitfield can cross 32-bits boundaries, + * left and right bits are splitted for 32-bit aligned address + * and then saved. */ + l_off = bit_offset & (~(32 - 1)); + r_off = l_off + 32; + l_bits = 32 - (bit_offset & (32 - 1)); + + if (n_bits > l_bits) { + r_bits = n_bits - l_bits; + } else { + l_bits = n_bits; + r_bits = 0; + } + + memcpy(_row, base, NVMCTRL_PAGE_SIZE); /* Store previous data. */ + + if (l_bits) { + uint32_t l_mask = ((1 << l_bits) - 1) << (bit_offset & (32 - 1)); + _row[bit_offset >> 5] &= ~l_mask; + _row[bit_offset >> 5] |= (bits << (bit_offset & (32 - 1))) & l_mask; + } + + if (r_bits) { + uint32_t r_mask = (1 << r_bits) - 1; + _row[r_off >> 5] &= ~r_mask; + _row[r_off >> 5] |= bits >> l_bits; + } + + return _user_row_write_exec(_row); +} -- To view, visit https://gerrit.osmocom.org/12501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5eccb37da64c7def7b99418773d09b6d98664432 Gerrit-Change-Number: 12501 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:17 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:17 +0000 Subject: Change in osmo-asf4-dfu[master]: add code to initialize flash Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12502 Change subject: add code to initialize flash ...................................................................... add code to initialize flash Change-Id: I2a208abb39a9da8796e2a4bcb803ce32686cb95f --- M driver_init.c M driver_init.h 2 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/02/12502/1 diff --git a/driver_init.c b/driver_init.c index 920593a..b324be8 100644 --- a/driver_init.c +++ b/driver_init.c @@ -126,9 +126,23 @@ USB_DEVICE_INSTANCE_PORT_init(); } +struct flash_descriptor FLASH_0; + +void FLASH_0_CLOCK_init(void) +{ + hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK); +} + +void FLASH_0_init(void) +{ + FLASH_0_CLOCK_init(); + flash_init(&FLASH_0, NVMCTRL); +} + void system_init(void) { init_mcu(); USB_DEVICE_INSTANCE_init(); + FLASH_0_init(); } diff --git a/driver_init.h b/driver_init.h index 5c029a4..0d440d4 100644 --- a/driver_init.h +++ b/driver_init.h @@ -26,6 +26,13 @@ void USB_DEVICE_INSTANCE_CLOCK_init(void); void USB_DEVICE_INSTANCE_init(void); +#include + +extern struct flash_descriptor FLASH_0; + +void FLASH_0_init(void); +void FLASH_0_CLOCK_init(void); + /** * \brief Perform system initialization, initialize pins and clocks for * peripherals -- To view, visit https://gerrit.osmocom.org/12502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2a208abb39a9da8796e2a4bcb803ce32686cb95f Gerrit-Change-Number: 12502 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:17 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:17 +0000 Subject: Change in osmo-asf4-dfu[master]: add system LED initialisation Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12503 Change subject: add system LED initialisation ...................................................................... add system LED initialisation Change-Id: I79f1b769fc9dd7e1a972bacf0928ff46988f0e36 --- M atmel_start_pins.h M driver_init.c 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/03/12503/1 diff --git a/atmel_start_pins.h b/atmel_start_pins.h index dbf9891..23b8d33 100644 --- a/atmel_start_pins.h +++ b/atmel_start_pins.h @@ -27,6 +27,10 @@ #define GPIO_PIN_FUNCTION_M 12 #define GPIO_PIN_FUNCTION_N 13 +/** LED pin to indicate system state (pull low to switch on */ +#define LED_SYSTEM GPIO(GPIO_PORTC, 18) + +/** USB D+/D- pins */ #define PA24 GPIO(GPIO_PORTA, 24) #define PA25 GPIO(GPIO_PORTA, 25) diff --git a/driver_init.c b/driver_init.c index b324be8..0b07cc1 100644 --- a/driver_init.c +++ b/driver_init.c @@ -143,6 +143,11 @@ { init_mcu(); + // configure system LED + gpio_set_pin_level(LED_SYSTEM, true); // switch off LED + gpio_set_pin_direction(LED_SYSTEM, GPIO_DIRECTION_OUT); + gpio_set_pin_function(LED_SYSTEM, GPIO_PIN_FUNCTION_OFF); + USB_DEVICE_INSTANCE_init(); FLASH_0_init(); } -- To view, visit https://gerrit.osmocom.org/12503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79f1b769fc9dd7e1a972bacf0928ff46988f0e36 Gerrit-Change-Number: 12503 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:17 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:17 +0000 Subject: Change in osmo-asf4-dfu[master]: switch to LGPLv2 license Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12504 Change subject: switch to LGPLv2 license ...................................................................... switch to LGPLv2 license this should remove any possible conflict with the ASF license Change-Id: I235997ff9f4e597300697d1bd5a18caefd49c314 --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/usb_protocol_dfu.h M usb_start.c M usb_start.h 4 files changed, 41 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/04/12504/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index c58d101..f3286a1 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -3,33 +3,21 @@ * * \brief USB Device Stack DFU Function Implementation. * - * 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 + * 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. * - * \page License + * 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. * - * 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 - * + * 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" diff --git a/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h index 9d5ba17..7f82743 100644 --- a/usb/class/dfu/usb_protocol_dfu.h +++ b/usb/class/dfu/usb_protocol_dfu.h @@ -5,19 +5,19 @@ * * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * 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 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 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 + * 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_ diff --git a/usb_start.c b/usb_start.c index af10c38..4f9f875 100644 --- a/usb_start.c +++ b/usb_start.c @@ -1,19 +1,19 @@ /* * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * 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 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 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 + * 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 "atmel_start.h" #include "usb_start.h" diff --git a/usb_start.h b/usb_start.h index 4e0593a..37502b4 100644 --- a/usb_start.h +++ b/usb_start.h @@ -1,19 +1,19 @@ /* * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * 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 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 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 + * 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_DEVICE_MAIN_H #define USB_DEVICE_MAIN_H -- To view, visit https://gerrit.osmocom.org/12504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I235997ff9f4e597300697d1bd5a18caefd49c314 Gerrit-Change-Number: 12504 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:17 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:17 +0000 Subject: Change in osmo-asf4-dfu[master]: declare variables so the main loop can read the data to be flashed pr... Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12505 Change subject: declare variables so the main loop can read the data to be flashed provided by the USB stack ...................................................................... declare variables so the main loop can read the data to be flashed provided by the USB stack Change-Id: I092357aad95abef1a781be1ea77944f2ea523dab --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf.h 2 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/05/12505/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index f3286a1..15a89fc 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -34,8 +34,13 @@ static struct usbdf_driver _dfudf; static struct dfudf_func_data _dfudf_funcd; -static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU state */ -static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU status */ +enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_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_progress = 0; +bool dfu_manifestation_complete = false; /** * \brief Enable DFU Function diff --git a/usb/class/dfu/device/dfudf.h b/usb/class/dfu/device/dfudf.h index ba5cdd5..a19b569 100644 --- a/usb/class/dfu/device/dfudf.h +++ b/usb/class/dfu/device/dfudf.h @@ -35,6 +35,24 @@ #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; +/** Progress of the already downloaded data in bytes */ +extern size_t dfu_download_progress; +/** If manifestation (firmware flash and check) is complete */ +extern bool dfu_manifestation_complete; /** * \brief Initialize the USB DFU Function Driver -- To view, visit https://gerrit.osmocom.org/12505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I092357aad95abef1a781be1ea77944f2ea523dab Gerrit-Change-Number: 12505 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:18 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:18 +0000 Subject: Change in osmo-asf4-dfu[master]: make USB descriptor available for the two state machines Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12506 Change subject: make USB descriptor available for the two state machines ...................................................................... make USB descriptor available for the two state machines this is required to know the DFU bmAttributes since they affect the state machine Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf_desc.h M usb_start.c 3 files changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/06/12506/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 15a89fc..42b708b 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -22,8 +22,9 @@ #include "dfudf.h" #include "usb_protocol_dfu.h" +#include "dfudf_desc.h" -/** USB Device DFU Fucntion Specific Data */ +/** USB Device DFU Function Specific Data */ struct dfudf_func_data { /** DFU Interface information */ uint8_t func_iface; @@ -34,6 +35,10 @@ 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_DFU_IDLE; enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index 5590e16..cd6ba41 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -75,6 +75,11 @@ 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, \ @@ -83,10 +88,7 @@ USB_DFU_SUBCLASS, \ USB_DFU_PROTOCOL_DFU, \ CONF_USB_DFUD_IINTERFACE), \ - USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ - 0, /**< detaching makes only sense in run-time mode */ \ - 1024, /**< transfer size corresponds to page size for optimal flash writing */ \ - 0x0110 /**< DFU specification version 1.1 used */ ) + DFUD_IFACE_DESCB #define DFUD_STR_DESCES \ CONF_USB_DFUD_LANGID_DESC \ diff --git a/usb_start.c b/usb_start.c index 4f9f875..d911db4 100644 --- a/usb_start.c +++ b/usb_start.c @@ -39,6 +39,9 @@ #endif }; +/** 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; /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; -- To view, visit https://gerrit.osmocom.org/12506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e Gerrit-Change-Number: 12506 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:18 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:18 +0000 Subject: Change in osmo-asf4-dfu[master]: restructure and complete the USB-side DFU state machine Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12507 Change subject: restructure and complete the USB-side DFU state machine ...................................................................... restructure and complete the USB-side DFU state machine the USB control request are now handled in separate function depending on the direction (IN or OUT). download and manifestation are handled. numerous additional state machine fixes are included. Change-Id: I5237393c2789fdeddca2182da25ef417a2e71216 --- M usb/class/dfu/device/dfudf.c 1 file changed, 133 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/07/12507/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 42b708b..aefcab4 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -140,9 +140,136 @@ } /** + * \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 + 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_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_progress = 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; + case USB_DFU_DNLOAD: // download firmware on flash + if (!(usb_dfu_func_desc->bmAttributes & USB_REQ_DFU_DNLOAD)) { // download is not enabled + 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 if (USB_DFU_STATE_DFU_IDLE != dfu_state && USB_DFU_STATE_DFU_DNLOAD_IDLE != dfu_state) { // wrong state to request download + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else if (USB_DFU_STATE_DFU_IDLE == dfu_state && (0 == req->wLength)) { // download request should not start empty + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else if (USB_DFU_STATE_DFU_DNLOAD_IDLE == dfu_state && (0 == req->wLength)) { // download completed + dfu_manifestation_complete = false; // clear manifestation status + dfu_state = USB_DFU_STATE_DFU_MANIFEST_SYNC; // prepare for manifestation phase + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + } else if (req->wLength > sizeof(dfu_download_data)) { // there is more data to be flash then our buffer (the USB control buffer size should be less or equal) + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else { // there is data to be flash + if (USB_SETUP_STAGE == stage) { // there will be data to be flash + to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data + //to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + } else { // now there is data to be flashed + dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash + dfu_download_length = 0; + //dfu_download_length = req->wLength; // remember the data size to be flash + dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state + to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data + // we let the main application flash the data because this can be long and would stall the USB ISR + } + } + 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) @@ -151,54 +278,16 @@ return ERR_NOT_FOUND; } - int32_t to_return = ERR_NONE; - uint8_t response[6]; // buffer for the response to this request if ((req->wIndex == _dfudf_funcd.func_iface)) { - // we don't verify the bmRequestType - switch (req->bRequest) { - case USB_DFU_GETSTATUS: // get status - response[0] = dfu_status; // set status - response[1] = 100; // 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) { - dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state - } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { - dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode - dfu_state = USB_DFU_STATE_APP_DETACH; - } - 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, true); // send ACK - 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; - case USB_DFU_ABORT: // abort current operation - dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) - to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK - //flash_pointer = (uint32_t)&__application_beginning; // reset download location - break; - case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode - case USB_DFU_UPLOAD: // upload firmware from flash not supported - case USB_DFU_DNLOAD: // download firmware on flash TODO implement - default: // all other DFU class request - dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request - to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) - break; + if (req->bmRequestType & USB_EP_DIR_IN) { + return dfudf_in_req(ep, req, stage); + } else { + return dfudf_out_req(ep, req, stage); } } else { - to_return = ERR_NOT_FOUND; + return ERR_NOT_FOUND; } - return to_return; + return ERR_NOT_FOUND; } /** USB Device DFU Handler Struct */ -- To view, visit https://gerrit.osmocom.org/12507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5237393c2789fdeddca2182da25ef417a2e71216 Gerrit-Change-Number: 12507 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:18 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:18 +0000 Subject: Change in osmo-asf4-dfu[master]: implement flashing-side of the DFU state machine Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12508 Change subject: implement flashing-side of the DFU state machine ...................................................................... implement flashing-side of the DFU state machine the USB-side state machine currently sets the length to 0, preventing the actual flashing to be tested Change-Id: I5ed9cc2a22ed5e41bb59a3ce3f21ab098cec48e7 --- M usb_start.c 1 file changed, 69 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/08/12508/1 diff --git a/usb_start.c b/usb_start.c index d911db4..0ce8aba 100644 --- a/usb_start.c +++ b/usb_start.c @@ -45,15 +45,20 @@ /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; +/** Application address in the flash + ( + * It comes after the bootloader. + * The NVMCTRL allows to reserve space at the beginning of the flash for the bootloader, but only in multiples of 8192 bytes. + * The binary just with the USB stack already uses 8 kB, we reserve 16 kB for the bootloader (giving use a bit of margin for future fixes). + */ +#define APPLICATION_ADDR (8192*2) + /** * \brief USB DFU Init */ void usb_dfu_init(void) { - /* usb stack init */ usbdc_init(ctrl_buffer); - - /* usbdc_register_funcion inside */ dfudf_init(); usbdc_start(single_desc); @@ -61,27 +66,74 @@ } /** - * Example of using CDC ACM Function. - * \note - * In this example, we will use a PC as a USB host: - * - Connect the DEBUG USB on XPLAINED board to PC for program download. - * - Connect the TARGET USB on XPLAINED board to PC for running program. - * The application will behave as a virtual COM. - * - Open a HyperTerminal or other COM tools in PC side. - * - Send out a character or string and it will echo the content received. + * \brief reset device + */ +static void usb_dfu_reset(const enum usb_event ev, const uint32_t param) +{ + (void)param; // not used + switch (ev) { + case USB_EV_RESET: + usbdc_detach(); // make sure we are detached + NVIC_SystemReset(); // initiate a system reset + break; + default: + break; + } + +} + +/** + * \brief Enter USB DFU runtime */ void usb_dfu(void) { - while (!dfudf_is_enabled()) { - // wait DFU to be installed - }; - - while (1) { + 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 + 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 + if (dfu_download_length > 0) { // there is some data to be flashed + int32_t rc = flash_write(&FLASH_0, APPLICATION_ADDR + dfu_download_progress, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + if (ERR_NONE == rc) { + dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed + } else { // there has been a programming error + dfu_state = USB_DFU_STATE_DFU_ERROR; + if (ERR_BAD_ADDRESS == rc) { + dfu_status = USB_DFU_STATUS_ERR_ADDRESS; + } else if (ERR_DENIED == rc) { + dfu_status = USB_DFU_STATUS_ERR_WRITE; + } else { + dfu_status = USB_DFU_STATUS_ERR_PROG; + } + } + } else { // there was no data to flash + // 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 + } + 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 + // in practice most downloaded files are just the raw binary with DFU suffix + dfu_manifestation_complete = true; // we completed flashing and all checks + if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST_SYNC; + } else { + dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; + } + } + if (USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET == dfu_state) { + if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_WILL_DETACH) { + usb_dfu_reset(USB_EV_RESET, 0); // immediately reset + } else { // wait for USB reset + usb_d_register_callback(USB_D_CB_EVENT, (FUNC_PTR)usb_dfu_reset); // register new USB reset event handler + } + } } } void usb_init(void) { - usb_dfu_init(); } -- To view, visit https://gerrit.osmocom.org/12508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ed9cc2a22ed5e41bb59a3ce3f21ab098cec48e7 Gerrit-Change-Number: 12508 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:18 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:18 +0000 Subject: Change in osmo-asf4-dfu[master]: removed unused USB CDC stack Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12509 Change subject: removed unused USB CDC stack ...................................................................... removed unused USB CDC stack Change-Id: Ib1735ad4add9278be9a1fb730752377de99c4f4b --- D documentation/usb_cdc_echo.rst D documentation/usb_device_cdc.rst D usb/class/cdc/device/atmel_devices_cdc.cat D usb/class/cdc/device/atmel_devices_cdc.inf D usb/class/cdc/device/cdcdf_acm.c D usb/class/cdc/device/cdcdf_acm.h D usb/class/cdc/device/cdcdf_acm_desc.h D usb/class/cdc/usb_protocol_cdc.h 8 files changed, 0 insertions(+), 1,317 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/09/12509/1 diff --git a/documentation/usb_cdc_echo.rst b/documentation/usb_cdc_echo.rst deleted file mode 100644 index 5e4100d..0000000 --- a/documentation/usb_cdc_echo.rst +++ /dev/null @@ -1,45 +0,0 @@ -============ -USB CDC ECHO -============ - -This demo behaves like a virtual COM port based on USD device CDC. It echoes -back bytes received from the console. - -Drivers -------- -* USB Device - -Supported Evaluation Kit ------------------------- -* SAM D21 Xplained Pro -* SAM DA1 Xplained Pro -* SAM R21 Xplained Pro -* SAM D11 Xplained Pro -* SAM L21 Xplained Pro -* SAM L22 Xplained Pro -* SAM V71 Xplained Ultra -* SAM E70 Xplained -* SAM G55 Xplained Pro -* SAM E54 Xplained Pro - -Interface Settings ------------------- -* No extra board or wire connection is needed. -* The enumerated serial port does not bridge to any specific USRT hardware but - simply loopback data, so whatever serial port setting works. - -Running the Demo ----------------- - -1. Download the selected example, or export the example to save the .atzip file. -2. Import .atzip file into Atmel Studio 7, File->Import->Atmel Start Project. -3. Build and flash into supported evaluation board. -4. Connect PC host and TARGET USB plug with a USB cable. -5. Press the RESET button. -6. The serial port is detected by host PC. On Linux the driver will be installed - automatically. On Windows The INF and CAT file required can be extracted from - .atzip or found in generated Atmel Studio 7 project folder, relatively at - ./usb/class/cdc/device. -7. Open the detected/enumerated serial port using a serial port monitor - (e.g., TeraTerm). -8. Whatever sent from the serial port monitor will be echoed back then. diff --git a/documentation/usb_device_cdc.rst b/documentation/usb_device_cdc.rst deleted file mode 100644 index 305ff8f..0000000 --- a/documentation/usb_device_cdc.rst +++ /dev/null @@ -1,46 +0,0 @@ -============== -USB Device CDC -============== - -USB Device CDC (Communication Device Class)is a part of the USB Device Stack library. -It provides support for Abstract Control Model, which is one of the USB PSTN Device -Models. The device uses both a Data Class interface and a Communication Class interface -for it. For more detailed definition and description about this model, user can refer to -the related chapter in - -Features --------- - -* Initialization/de-initialization. -* Data transfer. -* Callbacks management on: - - * Transmission done - * Reception done - * Setting a new Line coding - * Line state changing - -Applications ------------- - -* Used as a vritual serial. - - -Dependencies ------------- - -* USB Device Driver -* USB Device Stack Core -* USB Protocol CDC - - -Limitations ------------ - -* Only single instance can be supported, not applied for multiple case. -* The INF and CAT file would be packed in atzip file. User can extract - them from "./usb/class/cdc/device". -* If user wants to combine CDC with other classes into one device, USB - Device Stack Composite component should be added from the web page - rather than USB Device Stack CDC ACM. diff --git a/usb/class/cdc/device/atmel_devices_cdc.cat b/usb/class/cdc/device/atmel_devices_cdc.cat deleted file mode 100644 index 09a0673..0000000 --- a/usb/class/cdc/device/atmel_devices_cdc.cat +++ /dev/null Binary files differ diff --git a/usb/class/cdc/device/atmel_devices_cdc.inf b/usb/class/cdc/device/atmel_devices_cdc.inf deleted file mode 100644 index d2df608..0000000 --- a/usb/class/cdc/device/atmel_devices_cdc.inf +++ /dev/null @@ -1,182 +0,0 @@ -; Windows 2000, XP, Vista, 7 and 8 (x32 and x64) setup file for Atmel CDC Devices -; Copyright (c) 2000-2013 ATMEL, Inc. - -[Version] -Signature = "$Windows NT$" -Class = Ports -ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318} - -Provider = %Manufacturer% -LayoutFile = layout.inf -CatalogFile = atmel_devices_cdc.cat -DriverVer = 01/08/2013,6.0.0.0 - -;---------------------------------------------------------- -; Targets -;---------------------------------------------------------- -[Manufacturer] -%Manufacturer%=DeviceList, NTAMD64, NTIA64, NT - -[DeviceList] -%ATMEL_CDC_XPLAINED%=DriverInstall, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NTAMD64] -%ATMEL_CDC_XPLAINED%=DriverInstall.NTamd64, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NTamd64, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NTamd64, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NTamd64, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NTIA64] -%ATMEL_CDC_XPLAINED%=DriverInstall.NTamd64, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NTamd64, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NTamd64, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NTamd64, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NT] -%ATMEL_CDC_XPLAINED%=DriverInstall.NT, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NT, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NT, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NT, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NT, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NT, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NT, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NT, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NT, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NT, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_0C - -;---------------------------------------------------------- -; Windows 2000, XP, Vista, Windows 7, Windows 8 - 32bit -;---------------------------------------------------------- -[Reader_Install.NTx86] - - -[DestinationDirs] -DefaultDestDir=12 -DriverInstall.NT.Copy=12 - -[DriverInstall.NT] -include=mdmcpq.inf -CopyFiles=DriverInstall.NT.Copy -AddReg=DriverInstall.NT.AddReg - -[DriverInstall.NT.Copy] -usbser.sys - -[DriverInstall.NT.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.NT.Services] -AddService = usbser, 0x00000002, DriverService.NT - -[DriverService.NT] -DisplayName = %Serial.SvcDesc% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\usbser.sys -LoadOrderGroup = Base - -;---------------------------------------------------------- -; Windows XP, Vista, Windows 7, Windows 8 - 64bit -;---------------------------------------------------------- - -[DriverInstall.NTamd64] -include=mdmcpq.inf -CopyFiles=DriverCopyFiles.NTamd64 -AddReg=DriverInstall.NTamd64.AddReg - -[DriverCopyFiles.NTamd64] -usbser.sys,,,0x20 - -[DriverInstall.NTamd64.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.NTamd64.Services] -AddService=usbser, 0x00000002, DriverService.NTamd64 - -[DriverService.NTamd64] -DisplayName=%Serial.SvcDesc% -ServiceType=1 -StartType=3 -ErrorControl=1 -ServiceBinary=%12%\usbser.sys - -;---------------------------------------------------------- -; String -;---------------------------------------------------------- - -[Strings] -Manufacturer = "ATMEL, Inc." -ATMEL_CDC_XPLAINED = "XPLAINED Virtual Com Port" -ATMEL_CDC_USB_ZIGBIT_Sub = "ZigBit SubGHz USBstick Com Port" -ATMEL_CDC_USB_ZIGBIT_2_4 = "ZigBit 2.4GHz USBstick Com Port" -ATMEL_CDC_SFW_EXAMPLE = "Communication Device Class SFW example" -ATMEL_CDC_EVK1XXX = "EVK1XXX Virtual Com Port" -ATMEL_CDC_ASF_EXAMPLE = "Communication Device Class ASF example" -ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2 = "Communication Device Class ASF composite example 2" -ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4 = "Communication Device Class ASF composite example 4" -ATMEL_CDC_ASF_EXAMPLE2_COM1 = "Communication Device Class ASF example2, COM1" -ATMEL_CDC_ASF_EXAMPLE2_COM2 = "Communication Device Class ASF example2, COM2" -ATMEL_CDC_ASF_EXAMPLE3_COM1 = "Communication Device Class ASF example3, COM1" -ATMEL_CDC_ASF_EXAMPLE3_COM2 = "Communication Device Class ASF example3, COM2" -ATMEL_CDC_ASF_EXAMPLE3_COM3 = "Communication Device Class ASF example3, COM3" -ATMEL_CDC_ASF_EXAMPLE3_COM4 = "Communication Device Class ASF example3, COM4" -ATMEL_CDC_ASF_EXAMPLE3_COM5 = "Communication Device Class ASF example3, COM5" -ATMEL_CDC_ASF_EXAMPLE3_COM6 = "Communication Device Class ASF example3, COM6" -ATMEL_CDC_ASF_EXAMPLE3_COM7 = "Communication Device Class ASF example3, COM7" - -Serial.SvcDesc = "USB Serial emulation driver" - diff --git a/usb/class/cdc/device/cdcdf_acm.c b/usb/class/cdc/device/cdcdf_acm.c deleted file mode 100644 index 2691cc8..0000000 --- a/usb/class/cdc/device/cdcdf_acm.c +++ /dev/null @@ -1,379 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Implementation. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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 - * - */ - -#include "cdcdf_acm.h" - -#define CDCDF_ACM_VERSION 0x00000001u -#define CDCDF_ACM_COMM_EP_INDEX 0 -#define CDCDF_ACM_DATA_EP_INDEX 1 - -/** USB Device CDC ACM Fucntion Specific Data */ -struct cdcdf_acm_func_data { - /** CDC Device ACM Interface information */ - uint8_t func_iface[2]; - /** CDC Device ACM IN Endpoint */ - uint8_t func_ep_in[2]; - /** CDC Device ACM OUT Endpoint */ - uint8_t func_ep_out; - /** CDC Device ACM Enable Flag */ - bool enabled; -}; - -static struct usbdf_driver _cdcdf_acm; -static struct cdcdf_acm_func_data _cdcdf_acm_funcd; -static struct usb_cdc_line_coding usbd_cdc_line_coding; - -static cdcdf_acm_notify_state_t cdcdf_acm_notify_state = NULL; -static cdcdf_acm_set_line_coding_t cdcdf_acm_set_line_coding = NULL; - -/** - * \brief Enable CDC ACM Function - * \param[in] drv Pointer to USB device function driver - * \param[in] desc Pointer to USB interface descriptor - * \return Operation status. - */ -static int32_t cdcdf_acm_enable(struct usbdf_driver *drv, struct usbd_descriptors *desc) -{ - struct cdcdf_acm_func_data *func_data = (struct cdcdf_acm_func_data *)(drv->func_data); - - usb_ep_desc_t ep_desc; - usb_iface_desc_t ifc_desc; - uint8_t * ifc, *ep; - uint8_t i; - - ifc = desc->sod; - for (i = 0; i < 2; i++) { - if (NULL == ifc) { - return ERR_NOT_FOUND; - } - - ifc_desc.bInterfaceNumber = ifc[2]; - ifc_desc.bInterfaceClass = ifc[5]; - - if ((CDC_CLASS_COMM == ifc_desc.bInterfaceClass) || (CDC_CLASS_DATA == ifc_desc.bInterfaceClass)) { - if (func_data->func_iface[i] == ifc_desc.bInterfaceNumber) { // Initialized - return ERR_ALREADY_INITIALIZED; - } else if (func_data->func_iface[i] != 0xFF) { // Occupied - return ERR_NO_RESOURCE; - } else { - func_data->func_iface[i] = ifc_desc.bInterfaceNumber; - } - } else { // Not supported by this function driver - return ERR_NOT_FOUND; - } - - // Install endpoints - ep = usb_find_desc(ifc, desc->eod, USB_DT_ENDPOINT); - while (NULL != ep) { - ep_desc.bEndpointAddress = ep[2]; - ep_desc.bmAttributes = ep[3]; - ep_desc.wMaxPacketSize = usb_get_u16(ep + 4); - if (usb_d_ep_init(ep_desc.bEndpointAddress, ep_desc.bmAttributes, ep_desc.wMaxPacketSize)) { - return ERR_NOT_INITIALIZED; - } - if (ep_desc.bEndpointAddress & USB_EP_DIR_IN) { - func_data->func_ep_in[i] = ep_desc.bEndpointAddress; - usb_d_ep_enable(func_data->func_ep_in[i]); - } else { - func_data->func_ep_out = ep_desc.bEndpointAddress; - usb_d_ep_enable(func_data->func_ep_out); - } - desc->sod = ep; - ep = usb_find_ep_desc(usb_desc_next(desc->sod), desc->eod); - } - ifc = usb_find_desc(usb_desc_next(desc->sod), desc->eod, USB_DT_INTERFACE); - } - // Installed - _cdcdf_acm_funcd.enabled = true; - return ERR_NONE; -} - -/** - * \brief Disable CDC ACM Function - * \param[in] drv Pointer to USB device function driver - * \param[in] desc Pointer to USB device descriptor - * \return Operation status. - */ -static int32_t cdcdf_acm_disable(struct usbdf_driver *drv, struct usbd_descriptors *desc) -{ - struct cdcdf_acm_func_data *func_data = (struct cdcdf_acm_func_data *)(drv->func_data); - - usb_iface_desc_t ifc_desc; - uint8_t i; - - if (desc) { - ifc_desc.bInterfaceClass = desc->sod[5]; - // Check interface - if ((ifc_desc.bInterfaceClass != CDC_CLASS_COMM) && (ifc_desc.bInterfaceClass != CDC_CLASS_DATA)) { - return ERR_NOT_FOUND; - } - } - - for (i = 0; i < 2; i++) { - if (func_data->func_iface[i] == 0xFF) { - continue; - } else { - func_data->func_iface[i] = 0xFF; - if (func_data->func_ep_in[i] != 0xFF) { - usb_d_ep_deinit(func_data->func_ep_in[i]); - func_data->func_ep_in[i] = 0xFF; - } - } - } - - if (func_data->func_ep_out != 0xFF) { - usb_d_ep_deinit(func_data->func_ep_out); - func_data->func_ep_out = 0xFF; - } - - _cdcdf_acm_funcd.enabled = false; - return ERR_NONE; -} - -/** - * \brief CDC ACM 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 cdcdf_acm_ctrl(struct usbdf_driver *drv, enum usbdf_control ctrl, void *param) -{ - switch (ctrl) { - case USBDF_ENABLE: - return cdcdf_acm_enable(drv, (struct usbd_descriptors *)param); - - case USBDF_DISABLE: - return cdcdf_acm_disable(drv, (struct usbd_descriptors *)param); - - case USBDF_GET_IFACE: - return ERR_UNSUPPORTED_OP; - - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class set request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_set_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) -{ - struct usb_cdc_line_coding line_coding_tmp; - uint16_t len = req->wLength; - uint8_t * ctrl_buf = usbdc_get_ctrl_buffer(); - - switch (req->bRequest) { - case USB_REQ_CDC_SET_LINE_CODING: - if (sizeof(struct usb_cdc_line_coding) != len) { - return ERR_INVALID_DATA; - } - if (USB_SETUP_STAGE == stage) { - return usbdc_xfer(ep, ctrl_buf, len, false); - } else { - memcpy(&line_coding_tmp, ctrl_buf, sizeof(struct usb_cdc_line_coding)); - if ((NULL == cdcdf_acm_set_line_coding) || (true == cdcdf_acm_set_line_coding(&line_coding_tmp))) { - usbd_cdc_line_coding = line_coding_tmp; - } - return ERR_NONE; - } - case USB_REQ_CDC_SET_CONTROL_LINE_STATE: - usbdc_xfer(0, NULL, 0, 0); - if (NULL != cdcdf_acm_notify_state) { - cdcdf_acm_notify_state(req->wValue); - } - return ERR_NONE; - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class get request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_get_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) -{ - uint16_t len = req->wLength; - - if (USB_DATA_STAGE == stage) { - return ERR_NONE; - } - - switch (req->bRequest) { - case USB_REQ_CDC_GET_LINE_CODING: - if (sizeof(struct usb_cdc_line_coding) != len) { - return ERR_INVALID_DATA; - } - return usbdc_xfer(ep, (uint8_t *)&usbd_cdc_line_coding, len, false); - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_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 == _cdcdf_acm_funcd.func_iface[0]) || (req->wIndex == _cdcdf_acm_funcd.func_iface[1])) { - if (req->bmRequestType & USB_EP_DIR_IN) { - return cdcdf_acm_get_req(ep, req, stage); - } else { - return cdcdf_acm_set_req(ep, req, stage); - } - } else { - return ERR_NOT_FOUND; - } -} - -/** USB Device CDC ACM Handler Struct */ -static struct usbdc_handler cdcdf_acm_req_h = {NULL, (FUNC_PTR)cdcdf_acm_req}; - -/** - * \brief Initialize the USB CDC ACM Function Driver - */ -int32_t cdcdf_acm_init(void) -{ - if (usbdc_get_state() > USBD_S_POWER) { - return ERR_DENIED; - } - - _cdcdf_acm.ctrl = cdcdf_acm_ctrl; - _cdcdf_acm.func_data = &_cdcdf_acm_funcd; - - usbdc_register_function(&_cdcdf_acm); - usbdc_register_handler(USBDC_HDL_REQ, &cdcdf_acm_req_h); - return ERR_NONE; -} - -/** - * \brief Deinitialize the USB CDC ACM Function Driver - */ -void cdcdf_acm_deinit(void) -{ - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_COMM_EP_INDEX]); - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX]); - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_out); -} - -/** - * \brief USB CDC ACM Function Read Data - */ -int32_t cdcdf_acm_read(uint8_t *buf, uint32_t size) -{ - if (!cdcdf_acm_is_enabled()) { - return ERR_DENIED; - } - return usbdc_xfer(_cdcdf_acm_funcd.func_ep_out, buf, size, false); -} - -/** - * \brief USB CDC ACM Function Write Data - */ -int32_t cdcdf_acm_write(uint8_t *buf, uint32_t size) -{ - if (!cdcdf_acm_is_enabled()) { - return ERR_DENIED; - } - return usbdc_xfer(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX], buf, size, true); -} - -/** - * \brief USB CDC ACM Stop the data transfer - */ -void cdcdf_acm_stop_xfer(void) -{ - /* Stop transfer. */ - usb_d_ep_abort(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX]); - usb_d_ep_abort(_cdcdf_acm_funcd.func_ep_out); -} - -/** - * \brief USB CDC ACM Function Register Callback - */ -int32_t cdcdf_acm_register_callback(enum cdcdf_acm_cb_type cb_type, FUNC_PTR func) -{ - switch (cb_type) { - case CDCDF_ACM_CB_READ: - usb_d_ep_register_callback(_cdcdf_acm_funcd.func_ep_out, USB_D_EP_CB_XFER, func); - break; - case CDCDF_ACM_CB_WRITE: - usb_d_ep_register_callback(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX], USB_D_EP_CB_XFER, func); - break; - case CDCDF_ACM_CB_LINE_CODING_C: - cdcdf_acm_set_line_coding = (cdcdf_acm_set_line_coding_t)func; - break; - case CDCDF_ACM_CB_STATE_C: - cdcdf_acm_notify_state = (cdcdf_acm_notify_state_t)func; - break; - default: - return ERR_INVALID_ARG; - } - return ERR_NONE; -} - -/** - * \brief Check whether CDC ACM Function is enabled - */ -bool cdcdf_acm_is_enabled(void) -{ - return _cdcdf_acm_funcd.enabled; -} - -/** - * \brief Return the CDC ACM line coding structure start address - */ -const struct usb_cdc_line_coding *cdcdf_acm_get_line_coding(void) -{ - return (const struct usb_cdc_line_coding *)&usbd_cdc_line_coding; -} - -/** - * \brief Return version - */ -uint32_t cdcdf_acm_get_version(void) -{ - return CDCDF_ACM_VERSION; -} diff --git a/usb/class/cdc/device/cdcdf_acm.h b/usb/class/cdc/device/cdcdf_acm.h deleted file mode 100644 index ad060bc..0000000 --- a/usb/class/cdc/device/cdcdf_acm.h +++ /dev/null @@ -1,108 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Definition. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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_CDC_ACM_SER_H_ -#define USBDF_CDC_ACM_SER_H_ - -#include "usbdc.h" -#include "usb_protocol_cdc.h" - -/** CDC ACM Class Callback Type */ -enum cdcdf_acm_cb_type { CDCDF_ACM_CB_READ, CDCDF_ACM_CB_WRITE, CDCDF_ACM_CB_LINE_CODING_C, CDCDF_ACM_CB_STATE_C }; - -/** CDC ACM Notify Line State Callback. */ -typedef void (*cdcdf_acm_notify_state_t)(uint16_t); - -/** CDC ACM Set Line Coding Callback. */ -typedef bool (*cdcdf_acm_set_line_coding_t)(struct usb_cdc_line_coding *); - -/** - * \brief Initialize the USB CDC ACM Function Driver - * \return Operation status. - */ -int32_t cdcdf_acm_init(void); - -/** - * \brief Deinitialize the USB CDC ACM Function Driver - * \return Operation status. - */ -void cdcdf_acm_deinit(void); - -/** - * \brief USB CDC ACM Function Read Data - * \param[in] buf Pointer to the buffer which receives data - * \param[in] size the size of data to be received - * \return Operation status. - */ -int32_t cdcdf_acm_read(uint8_t *buf, uint32_t size); - -/** - * \brief USB CDC ACM Function Write Data - * \param[in] buf Pointer to the buffer which stores data - * \param[in] size the size of data to be sent - * \return Operation status. - */ -int32_t cdcdf_acm_write(uint8_t *buf, uint32_t size); - -/** - * \brief USB CDC ACM Stop the currnet data transfer - */ -void cdcdf_acm_stop_xfer(void); - -/** - * \brief USB CDC ACM Function Register Callback - * \param[in] cb_type Callback type of CDC ACM Function - * \param[in] func Pointer to callback function - * \return Operation status. - */ -int32_t cdcdf_acm_register_callback(enum cdcdf_acm_cb_type cb_type, FUNC_PTR func); - -/** - * \brief Check whether CDC ACM Function is enabled - * \return Operation status. - * \return true CDC ACM Function is enabled - * \return false CDC ACM Function is disabled - */ -bool cdcdf_acm_is_enabled(void); - -/** - * \brief Return the CDC ACM line coding structure start address - * \return Pointer to USB CDC ACM line coding data. - */ -const struct usb_cdc_line_coding *cdcdf_acm_get_line_coding(void); - -/** - * \brief Return version - */ -uint32_t cdcdf_acm_get_version(void); - -#endif /* USBDF_CDC_ACM_SER_H_ */ diff --git a/usb/class/cdc/device/cdcdf_acm_desc.h b/usb/class/cdc/device/cdcdf_acm_desc.h deleted file mode 100644 index ca29d33..0000000 --- a/usb/class/cdc/device/cdcdf_acm_desc.h +++ /dev/null @@ -1,131 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Descriptor Setting. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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_CDC_ACM_DESC_H_ -#define USBDF_CDC_ACM_DESC_H_ - -#include "usb_protocol.h" -#include "usb_protocol_cdc.h" -#include "usbd_config.h" - -#define CDCD_ACM_DEV_DESC \ - USB_DEV_DESC_BYTES(CONF_USB_CDCD_ACM_BCDUSB, \ - 0x02, \ - 0x00, \ - 0x00, \ - CONF_USB_CDCD_ACM_BMAXPKSZ0, \ - CONF_USB_CDCD_ACM_IDVENDER, \ - CONF_USB_CDCD_ACM_IDPRODUCT, \ - CONF_USB_CDCD_ACM_BCDDEVICE, \ - CONF_USB_CDCD_ACM_IMANUFACT, \ - CONF_USB_CDCD_ACM_IPRODUCT, \ - CONF_USB_CDCD_ACM_ISERIALNUM, \ - CONF_USB_CDCD_ACM_BNUMCONFIG) - -#define CDCD_ACM_DEV_QUAL_DESC \ - USB_DEV_QUAL_DESC_BYTES( \ - CONF_USB_CDCD_ACM_BCDUSB, 0x02, 0x00, 0x00, CONF_USB_CDCD_ACM_BMAXPKSZ0, CONF_USB_CDCD_ACM_BNUMCONFIG) - -#define CDCD_ACM_CFG_DESC \ - USB_CONFIG_DESC_BYTES(67, \ - 2, \ - CONF_USB_CDCD_ACM_BCONFIGVAL, \ - CONF_USB_CDCD_ACM_ICONFIG, \ - CONF_USB_CDCD_ACM_BMATTRI, \ - CONF_USB_CDCD_ACM_BMAXPOWER) - -#define CDCD_ACM_OTH_SPD_CFG_DESC \ - USB_OTH_SPD_CFG_DESC_BYTES(67, \ - 2, \ - CONF_USB_CDCD_ACM_BCONFIGVAL, \ - CONF_USB_CDCD_ACM_ICONFIG, \ - CONF_USB_CDCD_ACM_BMATTRI, \ - CONF_USB_CDCD_ACM_BMAXPOWER) - -#define CDCD_ACM_COMM_IFACE_DESCES \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_BIFCNUM, \ - CONF_USB_CDCD_ACM_COMM_BALTSET, \ - 1, \ - 0x2, \ - 0x2, \ - 0x0, \ - CONF_USB_CDCD_ACM_COMM_IIFC), \ - USB_CDC_HDR_DESC_BYTES(0x1001), USB_CDC_CALL_MGMT_DESC_BYTES(0x01, 0x00), USB_CDC_ACM_DESC_BYTES(0x02), \ - USB_CDC_UNION_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_BIFCNUM, 0x01), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_INT_EPADDR, \ - 3, \ - CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ, \ - CONF_USB_CDCD_ACM_COMM_INT_INTERVAL) - -#define CDCD_ACM_DATA_IFACE_DESCES \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BIFCNUM, \ - CONF_USB_CDCD_ACM_DATA_BALTSET, \ - 2, \ - 0x0A, \ - 0x0, \ - 0x0, \ - CONF_USB_CDCD_ACM_DATA_IIFC), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ, 0), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ, 0) - -#define CDCD_ACM_DATA_IFACE_DESCES_HS \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BIFCNUM, \ - CONF_USB_CDCD_ACM_DATA_BALTSET, \ - 2, \ - 0x0A, \ - 0x0, \ - 0x0, \ - CONF_USB_CDCD_ACM_DATA_IIFC), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS, 0), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS, 0) - -#define CDCD_ACM_STR_DESCES \ - CONF_USB_CDCD_ACM_LANGID_DESC \ - CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \ - CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC \ - CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC \ - CONF_USB_CDCD_ACM_ICONFIG_STR_DESC - -/** USB Device descriptors and configuration descriptors */ -#define CDCD_ACM_DESCES_LS_FS \ - CDCD_ACM_DEV_DESC, CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES, CDCD_ACM_STR_DESCES - -#define CDCD_ACM_HS_DESCES_LS_FS \ - CDCD_ACM_DEV_DESC, CDCD_ACM_DEV_QUAL_DESC, CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, \ - CDCD_ACM_DATA_IFACE_DESCES, CDCD_ACM_OTH_SPD_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, \ - CDCD_ACM_DATA_IFACE_DESCES_HS, CDCD_ACM_STR_DESCES - -#define CDCD_ACM_HS_DESCES_HS \ - CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES_HS, CDCD_ACM_OTH_SPD_CFG_DESC, \ - CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES - -#endif /* USBDF_CDC_ACM_DESC_H_ */ diff --git a/usb/class/cdc/usb_protocol_cdc.h b/usb/class/cdc/usb_protocol_cdc.h deleted file mode 100644 index 29d882a..0000000 --- a/usb/class/cdc/usb_protocol_cdc.h +++ /dev/null @@ -1,426 +0,0 @@ -/** - * \file - * - * \brief USB Communication Device Class (CDC) protocol definitions - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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 - * - */ -/* - * Support and FAQ: visit Microchip Support - */ -#ifndef _USB_PROTOCOL_CDC_H_ -#define _USB_PROTOCOL_CDC_H_ - -#include "usb_includes.h" - -/** - * \ingroup usb_protocol_group - * \defgroup cdc_protocol_group Communication Device Class Definitions - * @{ - */ - -/** - * \name Possible values of class - */ -//@{ -#define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class -#define CDC_CLASS_COMM 0x02 //!< CDC Communication Class Interface -#define CDC_CLASS_DATA 0x0A //!< CDC Data Class Interface -//@} - -//! \name USB CDC Subclass IDs -//@{ -#define CDC_SUBCLASS_DLCM 0x01 //!< Direct Line Control Model -#define CDC_SUBCLASS_ACM 0x02 //!< Abstract Control Model -#define CDC_SUBCLASS_TCM 0x03 //!< Telephone Control Model -#define CDC_SUBCLASS_MCCM 0x04 //!< Multi-Channel Control Model -#define CDC_SUBCLASS_CCM 0x05 //!< CAPI Control Model -#define CDC_SUBCLASS_ETH 0x06 //!< Ethernet Networking Control Model -#define CDC_SUBCLASS_ATM 0x07 //!< ATM Networking Control Model -//@} - -//! \name USB CDC Communication Interface Protocol IDs -//@{ -#define CDC_PROTOCOL_V25TER 0x01 //!< Common AT commands -//@} - -//! \name USB CDC Data Interface Protocol IDs -//@{ -#define CDC_PROTOCOL_I430 0x30 //!< ISDN BRI -#define CDC_PROTOCOL_HDLC 0x31 //!< HDLC -#define CDC_PROTOCOL_TRANS 0x32 //!< Transparent -#define CDC_PROTOCOL_Q921M 0x50 //!< Q.921 management protocol -#define CDC_PROTOCOL_Q921 0x51 //!< Q.931 [sic] Data link protocol -#define CDC_PROTOCOL_Q921TM 0x52 //!< Q.921 TEI-multiplexor -#define CDC_PROTOCOL_V42BIS 0x90 //!< Data compression procedures -#define CDC_PROTOCOL_Q931 0x91 //!< Euro-ISDN protocol control -#define CDC_PROTOCOL_V120 0x92 //!< V.24 rate adaption to ISDN -#define CDC_PROTOCOL_CAPI20 0x93 //!< CAPI Commands -#define CDC_PROTOCOL_HOST 0xFD //!< Host based driver -/** - * \brief Describes the Protocol Unit Functional Descriptors [sic] - * on Communication Class Interface - */ -#define CDC_PROTOCOL_PUFD 0xFE -//@} - -//! \name USB CDC Functional Descriptor Types -//@{ -#define CDC_CS_INTERFACE 0x24 //!< Interface Functional Descriptor -#define CDC_CS_ENDPOINT 0x25 //!< Endpoint Functional Descriptor -//@} - -//! \name USB CDC Functional Descriptor Subtypes -//@{ -#define CDC_SCS_HEADER 0x00 //!< Header Functional Descriptor -#define CDC_SCS_CALL_MGMT 0x01 //!< Call Management -#define CDC_SCS_ACM 0x02 //!< Abstract Control Management -#define CDC_SCS_UNION 0x06 //!< Union Functional Descriptor -//@} - -//! \name USB CDC Request IDs -//@{ -#define USB_REQ_CDC_SEND_ENCAPSULATED_COMMAND 0x00 -#define USB_REQ_CDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define USB_REQ_CDC_SET_COMM_FEATURE 0x02 -#define USB_REQ_CDC_GET_COMM_FEATURE 0x03 -#define USB_REQ_CDC_CLEAR_COMM_FEATURE 0x04 -#define USB_REQ_CDC_SET_AUX_LINE_STATE 0x10 -#define USB_REQ_CDC_SET_HOOK_STATE 0x11 -#define USB_REQ_CDC_PULSE_SETUP 0x12 -#define USB_REQ_CDC_SEND_PULSE 0x13 -#define USB_REQ_CDC_SET_PULSE_TIME 0x14 -#define USB_REQ_CDC_RING_AUX_JACK 0x15 -#define USB_REQ_CDC_SET_LINE_CODING 0x20 -#define USB_REQ_CDC_GET_LINE_CODING 0x21 -#define USB_REQ_CDC_SET_CONTROL_LINE_STATE 0x22 -#define USB_REQ_CDC_SEND_BREAK 0x23 -#define USB_REQ_CDC_SET_RINGER_PARMS 0x30 -#define USB_REQ_CDC_GET_RINGER_PARMS 0x31 -#define USB_REQ_CDC_SET_OPERATION_PARMS 0x32 -#define USB_REQ_CDC_GET_OPERATION_PARMS 0x33 -#define USB_REQ_CDC_SET_LINE_PARMS 0x34 -#define USB_REQ_CDC_GET_LINE_PARMS 0x35 -#define USB_REQ_CDC_DIAL_DIGITS 0x36 -#define USB_REQ_CDC_SET_UNIT_PARAMETER 0x37 -#define USB_REQ_CDC_GET_UNIT_PARAMETER 0x38 -#define USB_REQ_CDC_CLEAR_UNIT_PARAMETER 0x39 -#define USB_REQ_CDC_GET_PROFILE 0x3A -#define USB_REQ_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 -#define USB_REQ_CDC_SET_ETHERNET_POWER_MANAGEMENT_PATTERNFILTER 0x41 -#define USB_REQ_CDC_GET_ETHERNET_POWER_MANAGEMENT_PATTERNFILTER 0x42 -#define USB_REQ_CDC_SET_ETHERNET_PACKET_FILTER 0x43 -#define USB_REQ_CDC_GET_ETHERNET_STATISTIC 0x44 -#define USB_REQ_CDC_SET_ATM_DATA_FORMAT 0x50 -#define USB_REQ_CDC_GET_ATM_DEVICE_STATISTICS 0x51 -#define USB_REQ_CDC_SET_ATM_DEFAULT_VC 0x52 -#define USB_REQ_CDC_GET_ATM_VC_STATISTICS 0x53 -// Added bNotification codes according cdc spec 1.1 chapter 6.3 -#define USB_REQ_CDC_NOTIFY_RING_DETECT 0x09 -#define USB_REQ_CDC_NOTIFY_SERIAL_STATE 0x20 -#define USB_REQ_CDC_NOTIFY_CALL_STATE_CHANGE 0x28 -#define USB_REQ_CDC_NOTIFY_LINE_STATE_CHANGE 0x29 -//@} - -/* - * Need to pack structures tightly, or the compiler might insert padding - * and violate the spec-mandated layout. - */ -COMPILER_PACK_SET(1) - -//! \name USB CDC Descriptors -//@{ - -//! CDC Header Functional Descriptor -typedef struct usb_cdc_hdr_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - le16_t bcdCDC; -} usb_cdc_hdr_desc_t; - -#define USB_CDC_HDR_DESC_LEN 5 -#define USB_CDC_HDR_DESC_BYTES(bcdCDC) \ - USB_CDC_HDR_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_HEADER, /* bDescriptorSubtype */ \ - LE_BYTE0(bcdCDC), LE_BYTE1(bcdCDC) /* bcdCDC */ - -//! CDC Call Management Functional Descriptor -typedef struct usb_cdc_call_mgmt_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bmCapabilities; - uint8_t bDataInterface; -} usb_cdc_call_mgmt_desc_t; - -#define USB_CDC_CALL_MGMT_DESC_LEN 5 -#define USB_CDC_CALL_MGMT_DESC_BYTES(bmCapabilities, bDataInterface) \ - USB_CDC_CALL_MGMT_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_CALL_MGMT, /* bDescriptorSubtype */ \ - bmCapabilities, bDataInterface - -//! CDC ACM Functional Descriptor -typedef struct usb_cdc_acm_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bmCapabilities; -} usb_cdc_acm_desc_t; - -#define USB_CDC_ACM_DESC_LEN 4 -#define USB_CDC_ACM_DESC_BYTES(bmCapabilities) \ - USB_CDC_ACM_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_ACM, /* bDescriptorSubType */ \ - bmCapabilities - -//! CDC Union Functional Descriptor -typedef struct usb_cdc_union_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bMasterInterface; - uint8_t bSlaveInterface0; -} usb_cdc_union_desc_t; - -#define USB_CDC_UNION_DESC_LEN 5 -#define USB_CDC_UNION_DESC_BYTES(bMasterInterface, bSlaveInterface) \ - USB_CDC_UNION_DESC_LEN, CDC_CS_INTERFACE, CDC_SCS_UNION, bMasterInterface, bSlaveInterface - -//! \name USB CDC Call Management Capabilities -//@{ -//! Device handles call management itself -#define CDC_CALL_MGMT_SUPPORTED (1 << 0) -//! Device can send/receive call management info over a Data Class interface -#define CDC_CALL_MGMT_OVER_DCI (1 << 1) -//@} - -//! \name USB CDC ACM Capabilities -//@{ -//! Device supports the request combination of -//! Set_Comm_Feature, Clear_Comm_Feature, and Get_Comm_Feature. -#define CDC_ACM_SUPPORT_FEATURE_REQUESTS (1 << 0) -//! Device supports the request combination of -//! Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, -//! and the notification Serial_State. -#define CDC_ACM_SUPPORT_LINE_REQUESTS (1 << 1) -//! Device supports the request Send_Break -#define CDC_ACM_SUPPORT_SENDBREAK_REQUESTS (1 << 2) -//! Device supports the notification Network_Connection. -#define CDC_ACM_SUPPORT_NOTIFY_REQUESTS (1 << 3) -//@} -//@} - -//! \name USB CDC line control -//@{ - -//! \name USB CDC line coding -//@{ - -//! Line Coding structure -typedef struct usb_cdc_line_coding { - le32_t dwDTERate; //!< Data rate, bits per second - uint8_t bCharFormat; //!< 0-1 Stop bit,1-1.5 Stop bits,2-2 Stop bits - uint8_t bParityType; //!< 0-None,1-Odd,2-Even,3-Mark,4-Space - uint8_t bDataBits; //!< 5,6,7,8 or 16 -} usb_cdc_line_coding_t; - -//! Possible values of bCharFormat -enum cdc_char_format { - CDC_STOP_BITS_1 = 0, //!< 1 stop bit - CDC_STOP_BITS_1_5 = 1, //!< 1.5 stop bits - CDC_STOP_BITS_2 = 2 //!< 2 stop bits -}; - -//! Possible values of bParityType -enum cdc_parity { - CDC_PAR_NONE = 0, //!< No parity - CDC_PAR_ODD = 1, //!< Odd parity - CDC_PAR_EVEN = 2, //!< Even parity - CDC_PAR_MARK = 3, //!< Parity forced to 1 (mark) - CDC_PAR_SPACE = 4 //!< Parity forced to 0 (space) -}; -//@} - -//! \name USB CDC control signals -//! spec 1.1 chapter 6.2.14 -//@{ - -//! Control signal structure -typedef struct usb_cdc_control_signal { - union { - le16_t value; - struct { - uint8_t dte_present; - uint8_t carrier_ctrl; - } modem; - struct { - uint8_t DTR : 1; //!< Data Terminal Ready - uint8_t RTS : 1; //!< Request To Send - } rs232; - struct { - uint8_t s108_2 : 1; //!< V.24 signal 108/2 - uint8_t s105 : 1; //!< V.24 signal 105 - } v24; - }; -} usb_cdc_control_signal_t; - -//! \name Possible values in usb_cdc_control_signal_t -//@{ -//! Carrier control for half duplex modems. -//! This signal corresponds to V.24 signal 105 and RS-232 signal RTS. -//! The device ignores the value of this bit -//! when operating in full duplex mode. -#define CDC_CTRL_SIGNAL_ACTIVATE_CARRIER (1 << 1) -//! Indicates to DCE if DTE is present or not. -//! This signal corresponds to V.24 signal 108/2 and RS-232 signal DTR. -#define CDC_CTRL_SIGNAL_DTE_PRESENT (1 << 0) -//@} -//@} - -//! \name USB CDC notification message -//@{ - -typedef struct usb_cdc_notify_msg { - uint8_t bmRequestType; - uint8_t bNotification; - union { - le16_t wValue; - struct { - uint8_t low; - uint8_t high; - } wValueBytes; - }; - union { - le16_t wIndex; - struct { - uint8_t low; - uint8_t high; - } wIndexBytes; - }; - union { - le16_t wLength; - struct { - uint8_t low; - uint8_t high; - } wLengthBytes; - }; -} usb_cdc_notify_msg_t; - -//! \name USB CDC serial state -//@{* - -//! UART State Bitmap (cdc spec 1.1 chapter 6.3.5) -typedef union usb_cdc_uart_state { - le16_t value; - struct { - uint8_t bRxCarrier : 1; - uint8_t bTxCarrier : 1; - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } bitmap; - struct { - uint8_t bDCD : 1; - uint8_t bDSR : 1; - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } rs232; - struct { - uint8_t bS109 : 1; //!< V.24 signal 109 - uint8_t bS106 : 1; //!< V.24 signal 106 - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } v24; -} usb_cdc_uart_state_t; - -//! Hardware handshake support (cdc spec 1.1 chapter 6.3.5) -typedef struct usb_cdc_notify_serial_state { - usb_cdc_notify_msg_t header; - union usb_cdc_uart_state state; -} usb_cdc_notify_serial_state_t; - -//! \name Possible values in usb_cdc_notify_serial_state_t -//@{ -#define CDC_SERIAL_STATE_DCD CPU_TO_LE16((1 << 0)) -#define CDC_SERIAL_STATE_DSR CPU_TO_LE16((1 << 1)) -#define CDC_SERIAL_STATE_BREAK CPU_TO_LE16((1 << 2)) -#define CDC_SERIAL_STATE_RING CPU_TO_LE16((1 << 3)) -#define CDC_SERIAL_STATE_FRAMING CPU_TO_LE16((1 << 4)) -#define CDC_SERIAL_STATE_PARITY CPU_TO_LE16((1 << 5)) -#define CDC_SERIAL_STATE_OVERRUN CPU_TO_LE16((1 << 6)) -//@} -//! @} - -//! @} - -COMPILER_PACK_RESET() - -//! @} - -/** - * \brief Fill a CDC SetLineCoding request - * \param[out] req Pointer to the request to fill - * \param[in] iface Interface Number - */ -static inline void usb_fill_SetLineCoding_req(struct usb_req *req, uint8_t iface) -{ - req->bmRequestType = 0x21; - req->bRequest = USB_REQ_CDC_SET_LINE_CODING; - req->wValue = 0; - req->wIndex = iface; - req->wLength = sizeof(usb_cdc_line_coding_t); -} - -/** - * \brief Fill a CDC SetControlLineState request - * \param[out] req Pointer to the request to fill - * \param[in] iface Interface Number - * \param[in] ctrl Control Signal Bitmap - */ -static inline void usb_fill_SetControlLineState_req(struct usb_req *req, uint8_t iface, uint16_t ctrl) -{ - req->bmRequestType = 0x21; - req->bRequest = USB_REQ_CDC_SET_CONTROL_LINE_STATE; - req->wValue = ctrl; - req->wIndex = iface; - req->wLength = 0; -} - -#endif // _USB_PROTOCOL_CDC_H_ -- To view, visit https://gerrit.osmocom.org/12509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1735ad4add9278be9a1fb730752377de99c4f4b Gerrit-Change-Number: 12509 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:19 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:19 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused ARMCC Makefile Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12510 Change subject: remove unused ARMCC Makefile ...................................................................... remove unused ARMCC Makefile Change-Id: I232502798d71c97d0e7b4adf6bb6af3fa0940bd1 --- D armcc/Makefile D armcc/arm_addon/armcc/arm/startup_same54.s D armcc/arm_addon/armcc/system_same54.c 3 files changed, 0 insertions(+), 884 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/10/12510/1 diff --git a/armcc/Makefile b/armcc/Makefile deleted file mode 100644 index a131e45..0000000 --- a/armcc/Makefile +++ /dev/null @@ -1,226 +0,0 @@ - -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -ifdef SystemRoot - SHELL = cmd.exe - MK_DIR = mkdir -else - ifeq ($(shell uname), Linux) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), CYGWIN) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW32) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW64) - MK_DIR = mkdir -p - endif -endif - -# List the subdirectories for creating object files -SUB_DIRS += \ - \ -hpl/pm \ -hpl/osc32kctrl \ -hpl/ramecc \ -hpl/dmac \ -usb/class/cdc/device \ -hal/src \ -hpl/mclk \ -usb \ -armcc/arm_addon/armcc/arm \ -hal/utils/src \ -armcc/arm_addon/armcc \ -examples \ -hpl/gclk \ -usb/device \ -hpl/oscctrl \ -hpl/usb \ -hpl/core \ -hpl/cmcc - -# List the object files -OBJS += \ -hal/src/hal_io.o \ -armcc/arm_addon/armcc/system_same54.o \ -hpl/core/hpl_core_m4.o \ -usb/class/cdc/device/cdcdf_acm.o \ -hpl/dmac/hpl_dmac.o \ -hpl/usb/hpl_usb.o \ -hal/src/hal_delay.o \ -hpl/pm/hpl_pm.o \ -hpl/core/hpl_init.o \ -hpl/gclk/hpl_gclk.o \ -hal/utils/src/utils_list.o \ -hal/utils/src/utils_assert.o \ -usb_start.o \ -hpl/oscctrl/hpl_oscctrl.o \ -hpl/mclk/hpl_mclk.o \ -hpl/ramecc/hpl_ramecc.o \ -usb/usb_protocol.o \ -hal/src/hal_init.o \ -hal/src/hal_usb_device.o \ -hpl/osc32kctrl/hpl_osc32kctrl.o \ -examples/driver_examples.o \ -driver_init.o \ -hal/src/hal_gpio.o \ -hal/utils/src/utils_event.o \ -hal/src/hal_sleep.o \ -hal/src/hal_cache.o \ -hpl/cmcc/hpl_cmcc.o \ -atmel_start.o \ -usb_cdc_echo_main.o \ -usb/device/usbdc.o \ -hal/src/hal_atomic.o \ -armcc/arm_addon/armcc/arm/startup_same54.o - -OBJS_AS_ARGS += \ -"hal/src/hal_io.o" \ -"armcc/arm_addon/armcc/system_same54.o" \ -"hpl/core/hpl_core_m4.o" \ -"usb/class/cdc/device/cdcdf_acm.o" \ -"hpl/dmac/hpl_dmac.o" \ -"hpl/usb/hpl_usb.o" \ -"hal/src/hal_delay.o" \ -"hpl/pm/hpl_pm.o" \ -"hpl/core/hpl_init.o" \ -"hpl/gclk/hpl_gclk.o" \ -"hal/utils/src/utils_list.o" \ -"hal/utils/src/utils_assert.o" \ -"usb_start.o" \ -"hpl/oscctrl/hpl_oscctrl.o" \ -"hpl/mclk/hpl_mclk.o" \ -"hpl/ramecc/hpl_ramecc.o" \ -"usb/usb_protocol.o" \ -"hal/src/hal_init.o" \ -"hal/src/hal_usb_device.o" \ -"hpl/osc32kctrl/hpl_osc32kctrl.o" \ -"examples/driver_examples.o" \ -"driver_init.o" \ -"hal/src/hal_gpio.o" \ -"hal/utils/src/utils_event.o" \ -"hal/src/hal_sleep.o" \ -"hal/src/hal_cache.o" \ -"hpl/cmcc/hpl_cmcc.o" \ -"atmel_start.o" \ -"usb_cdc_echo_main.o" \ -"usb/device/usbdc.o" \ -"hal/src/hal_atomic.o" \ -"armcc/arm_addon/armcc/arm/startup_same54.o" - -# List the dependency files -DEPS := $(OBJS:%.o=%.d) - -DEPS_AS_ARGS += \ -"hal/utils/src/utils_event.d" \ -"hal/src/hal_io.d" \ -"armcc/arm_addon/armcc/system_same54.d" \ -"hpl/ramecc/hpl_ramecc.d" \ -"hpl/core/hpl_core_m4.d" \ -"usb/class/cdc/device/cdcdf_acm.d" \ -"hpl/usb/hpl_usb.d" \ -"hal/utils/src/utils_list.d" \ -"hpl/cmcc/hpl_cmcc.d" \ -"usb_start.d" \ -"hal/utils/src/utils_assert.d" \ -"hal/src/hal_delay.d" \ -"hpl/core/hpl_init.d" \ -"hpl/pm/hpl_pm.d" \ -"usb/usb_protocol.d" \ -"hpl/gclk/hpl_gclk.d" \ -"hal/src/hal_usb_device.d" \ -"hpl/dmac/hpl_dmac.d" \ -"hal/src/hal_init.d" \ -"usb_cdc_echo_main.d" \ -"hpl/mclk/hpl_mclk.d" \ -"driver_init.d" \ -"hpl/osc32kctrl/hpl_osc32kctrl.d" \ -"examples/driver_examples.d" \ -"hal/src/hal_cache.d" \ -"hal/src/hal_sleep.d" \ -"hal/src/hal_gpio.d" \ -"hal/src/hal_atomic.d" \ -"usb/device/usbdc.d" \ -"hpl/oscctrl/hpl_oscctrl.d" \ -"armcc/arm_addon/armcc/arm/startup_same54.d" \ -"atmel_start.d" - -OUTPUT_FILE_NAME :=AtmelStart -QUOTE := " -OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf -OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf - -vpath %.c ../ -vpath %.s ../ -vpath %.S ../ - -# All Target -all: $(SUB_DIRS) $(OUTPUT_FILE_PATH) - -# Linker target - -$(OUTPUT_FILE_PATH): $(OBJS) - @echo Building target: $@ - @echo Invoking: ARMCC Linker - $(QUOTE)armlink$(QUOTE) --ro-base 0x00000000 --entry 0x00000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors \ ---strict --summary_stderr --info summarysizes --map --xref --callgraph --symbols \ ---info sizes --info totals --info unused --info veneers --list $(OUTPUT_FILE_NAME).map \ --o $(OUTPUT_FILE_NAME).elf --cpu Cortex-M4 \ -$(OBJS_AS_ARGS) - - @echo Finished building target: $@ - -# Compiler target(s) - - - - -%.o: %.c - @echo Building file: $< - @echo ARMCC Compiler - $(QUOTE)armcc$(QUOTE) --c99 -c -DDEBUG -O1 -g --apcs=interwork --split_sections --cpu Cortex-M4 -D__SAME54P20A__ \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$@" -o "$@" "$<" - - @echo Finished building: $< - -%.o: %.s - @echo Building file: $< - @echo ARMCC Assembler - $(QUOTE)armasm$(QUOTE) -g --apcs=interwork --cpu Cortex-M4 --pd "D__SAME54P20A__ SETA 1" \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$(@:%.o=%.d)" -o "$@" "$<" - - @echo Finished building: $< - -%.o: %.S - @echo Building file: $< - @echo ARMCC Preprocessing Assembler - $(QUOTE)armcc$(QUOTE) --c99 -c -DDEBUG -O1 -g --apcs=interwork --split_sections --cpu Cortex-M4 -D__SAME54P20A__ \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$@" -o "$@" "$<" - - @echo Finished building: $< - -# Detect changes in the dependent files and recompile the respective object files. -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(DEPS)),) --include $(DEPS) -endif -endif - -$(SUB_DIRS): - $(MK_DIR) "$@" - -clean: - rm -f $(OBJS_AS_ARGS) - rm -f $(OUTPUT_FILE_PATH) - rm -f $(DEPS_AS_ARGS) - rm -f $(OUTPUT_FILE_NAME).map $(OUTPUT_FILE_NAME).elf diff --git a/armcc/arm_addon/armcc/arm/startup_same54.s b/armcc/arm_addon/armcc/arm/startup_same54.s deleted file mode 100644 index 3cd00bc..0000000 --- a/armcc/arm_addon/armcc/arm/startup_same54.s +++ /dev/null @@ -1,588 +0,0 @@ -;/***************************************************************************** -; * @file startup_SAME54.s -; * @brief CMSIS Cortex-M4 Core Device Startup File for -; * Atmel SAME54 Device Series -; * @version V1.0.0 -; * @date 16. January 2017 -; * -; * @note -; * Copyright (C) 2017 ARM Limited. All rights reserved. -; * -; * @par -; * ARM Limited (ARM) is supplying this software for use with Cortex-M -; * processor based microcontrollers. This file can be freely distributed -; * within development tools that are supporting such ARM based processors. -; * -; * @par -; * THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -; * OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -; * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -; * ARM SHALL NOT, IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR -; * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. -; * -; ******************************************************************************/ -;/* -;//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------ -;*/ - - -; Stack Configuration -; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Stack_Size EQU 0x00000200 - - AREA STACK, NOINIT, READWRITE, ALIGN=3 -Stack_Mem SPACE Stack_Size -__initial_sp - - -; Heap Configuration -; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Heap_Size EQU 0x00000000 - - AREA HEAP, NOINIT, READWRITE, ALIGN=3 -__heap_base -Heap_Mem SPACE Heap_Size -__heap_limit - - - PRESERVE8 - THUMB - - -; Vector Table Mapped to Address 0 at Reset - - AREA RESET, DATA, READONLY - EXPORT __Vectors - EXPORT __Vectors_End - EXPORT __Vectors_Size - -__Vectors DCD __initial_sp ; Top of Stack - DCD Reset_Handler ; Reset Handler - DCD NMI_Handler ; NMI Handler - DCD HardFault_Handler ; Hard Fault Handler - DCD MemManage_Handler ; MPU Fault Handler - DCD BusFault_Handler ; Bus Fault Handler - DCD UsageFault_Handler ; Usage Fault Handler - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler - DCD DebugMon_Handler ; Debug Monitor Handler - DCD 0 ; Reserved - DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler - - ; External Interrupts - DCD PM_Handler ; 0 Power Manager - DCD MCLK_Handler ; 1 Main Clock - DCD OSCCTRL_0_Handler ; 2 OSCCTRL_XOSCFAIL_0, OSCCTRL_XOSCRDY_0 - DCD OSCCTRL_1_Handler ; 3 OSCCTRL_XOSCFAIL_1, OSCCTRL_XOSCRDY_1 - DCD OSCCTRL_2_Handler ; 4 OSCCTRL_DFLLLOCKC, OSCCTRL_DFLLLOCKF, OSCCTRL_DFLLOOB, OSCCTRL_DFLLRCS, OSCCTRL_DFLLRDY - DCD OSCCTRL_3_Handler ; 5 OSCCTRL_DPLLLCKF_0, OSCCTRL_DPLLLCKR_0, OSCCTRL_DPLLLDRTO_0, OSCCTRL_DPLLLTO_0 - DCD OSCCTRL_4_Handler ; 6 OSCCTRL_DPLLLCKF_1, OSCCTRL_DPLLLCKR_1, OSCCTRL_DPLLLDRTO_1, OSCCTRL_DPLLLTO_1 - DCD OSC32KCTRL_Handler ; 7 32kHz Oscillators Control - DCD SUPC_0_Handler ; 8 SUPC_B12SRDY, SUPC_B33SRDY, SUPC_BOD12RDY, SUPC_BOD33RDY, SUPC_VCORERDY, SUPC_VREGRDY - DCD SUPC_1_Handler ; 9 SUPC_BOD12DET, SUPC_BOD33DET - DCD WDT_Handler ; 10 Watchdog Timer - DCD RTC_Handler ; 11 Real-Time Counter - DCD EIC_0_Handler ; 12 EIC_EXTINT_0 - DCD EIC_1_Handler ; 13 EIC_EXTINT_1 - DCD EIC_2_Handler ; 14 EIC_EXTINT_2 - DCD EIC_3_Handler ; 15 EIC_EXTINT_3 - DCD EIC_4_Handler ; 16 EIC_EXTINT_4 - DCD EIC_5_Handler ; 17 EIC_EXTINT_5 - DCD EIC_6_Handler ; 18 EIC_EXTINT_6 - DCD EIC_7_Handler ; 19 EIC_EXTINT_7 - DCD EIC_8_Handler ; 20 EIC_EXTINT_8 - DCD EIC_9_Handler ; 21 EIC_EXTINT_9 - DCD EIC_10_Handler ; 22 EIC_EXTINT_10 - DCD EIC_11_Handler ; 23 EIC_EXTINT_11 - DCD EIC_12_Handler ; 24 EIC_EXTINT_12 - DCD EIC_13_Handler ; 25 EIC_EXTINT_13 - DCD EIC_14_Handler ; 26 EIC_EXTINT_14 - DCD EIC_15_Handler ; 27 EIC_EXTINT_15 - DCD FREQM_Handler ; 28 Frequency Meter - DCD NVMCTRL_0_Handler ; 29 NVMCTRL_0, NVMCTRL_1, NVMCTRL_2, NVMCTRL_3, NVMCTRL_4, NVMCTRL_5, NVMCTRL_6, NVMCTRL_7 - DCD NVMCTRL_1_Handler ; 30 NVMCTRL_10, NVMCTRL_8, NVMCTRL_9 - DCD DMAC_0_Handler ; 31 DMAC_SUSP_0, DMAC_TCMPL_0, DMAC_TERR_0 - DCD DMAC_1_Handler ; 32 DMAC_SUSP_1, DMAC_TCMPL_1, DMAC_TERR_1 - DCD DMAC_2_Handler ; 33 DMAC_SUSP_2, DMAC_TCMPL_2, DMAC_TERR_2 - DCD DMAC_3_Handler ; 34 DMAC_SUSP_3, DMAC_TCMPL_3, DMAC_TERR_3 - DCD DMAC_4_Handler ; 35 DMAC_SUSP_10, DMAC_SUSP_11, DMAC_SUSP_12, DMAC_SUSP_13, DMAC_SUSP_14, DMAC_SUSP_15, DMAC_SUSP_16, DMAC_SUSP_17, DMAC_SUSP_18, DMAC_SUSP_19, DMAC_SUSP_20, DMAC_SUSP_21, DMAC_SUSP_22, DMAC_SUSP_23, DMAC_SUSP_24, DMAC_SUSP_25, DMAC_SUSP_26, DMAC_SUSP_27, DMAC_SUSP_28, DMAC_SUSP_29, DMAC_SUSP_30, DMAC_SUSP_31, DMAC_SUSP_4, DMAC_SUSP_5, DMAC_SUSP_6, DMAC_SUSP_7, DMAC_SUSP_8, DMAC_SUSP_9, DMAC_TCMPL_10, DMAC_TCMPL_11, DMAC_TCMPL_12, DMAC_TCMPL_13, DMAC_TCMPL_14, DMAC_TCMPL_15, DMAC_TCMPL_16, DMAC_TCMPL_17, DMAC_TCMPL_18, DMAC_TCMPL_19, DMAC_TCMPL_20, DMAC_TCMPL_21, DMAC_TCMPL_22, DMAC_TCMPL_23, DMAC_TCMPL_24, DMAC_TCMPL_25, DMAC_TCMPL_26, DMAC_TCMPL_27, DMAC_TCMPL_28, DMAC_TCMPL_29, DMAC_TCMPL_30, DMAC_TCMPL_31, DMAC_TCMPL_4, DMAC_TCMPL_5, DMAC_TCMPL_6, DMAC_TCMPL_7, DMAC_TCMPL_8, DMAC_TCMPL_9, DMAC_TERR_10, DMAC_TERR_11, DMAC_TERR_12, DMAC_TERR_13, DMAC_TERR_14, DMAC_TERR_15, DMAC_TERR_16, DMAC_TERR_17, DMAC_TERR_18, DMAC_TERR_19, DMAC_TERR_20, DMAC_TERR_21, DMAC_TERR_22, DMAC_TERR_23, DMAC_TERR_24, DMAC_TERR_25, DMAC_TERR_26, DMAC_TERR_27, DMAC_TERR_28, DMAC_TERR_29, DMAC_TERR_30, DMAC_TERR_31, DMAC_TERR_4, DMAC_TERR_5, DMAC_TERR_6, DMAC_TERR_7, DMAC_TERR_8, DMAC_TERR_9 - DCD EVSYS_0_Handler ; 36 EVSYS_EVD_0, EVSYS_OVR_0 - DCD EVSYS_1_Handler ; 37 EVSYS_EVD_1, EVSYS_OVR_1 - DCD EVSYS_2_Handler ; 38 EVSYS_EVD_2, EVSYS_OVR_2 - DCD EVSYS_3_Handler ; 39 EVSYS_EVD_3, EVSYS_OVR_3 - DCD EVSYS_4_Handler ; 40 EVSYS_EVD_10, EVSYS_EVD_11, EVSYS_EVD_4, EVSYS_EVD_5, EVSYS_EVD_6, EVSYS_EVD_7, EVSYS_EVD_8, EVSYS_EVD_9, EVSYS_OVR_10, EVSYS_OVR_11, EVSYS_OVR_4, EVSYS_OVR_5, EVSYS_OVR_6, EVSYS_OVR_7, EVSYS_OVR_8, EVSYS_OVR_9 - DCD PAC_Handler ; 41 Peripheral Access Controller - DCD TAL_0_Handler ; 42 TAL_BRK - DCD TAL_1_Handler ; 43 TAL_IPS_0, TAL_IPS_1 - DCD 0 ; 44 Reserved - DCD RAMECC_Handler ; 45 RAM ECC - DCD SERCOM0_0_Handler ; 46 SERCOM0_0 - DCD SERCOM0_1_Handler ; 47 SERCOM0_1 - DCD SERCOM0_2_Handler ; 48 SERCOM0_2 - DCD SERCOM0_3_Handler ; 49 SERCOM0_3, SERCOM0_4, SERCOM0_5, SERCOM0_6 - DCD SERCOM1_0_Handler ; 50 SERCOM1_0 - DCD SERCOM1_1_Handler ; 51 SERCOM1_1 - DCD SERCOM1_2_Handler ; 52 SERCOM1_2 - DCD SERCOM1_3_Handler ; 53 SERCOM1_3, SERCOM1_4, SERCOM1_5, SERCOM1_6 - DCD SERCOM2_0_Handler ; 54 SERCOM2_0 - DCD SERCOM2_1_Handler ; 55 SERCOM2_1 - DCD SERCOM2_2_Handler ; 56 SERCOM2_2 - DCD SERCOM2_3_Handler ; 57 SERCOM2_3, SERCOM2_4, SERCOM2_5, SERCOM2_6 - DCD SERCOM3_0_Handler ; 58 SERCOM3_0 - DCD SERCOM3_1_Handler ; 59 SERCOM3_1 - DCD SERCOM3_2_Handler ; 60 SERCOM3_2 - DCD SERCOM3_3_Handler ; 61 SERCOM3_3, SERCOM3_4, SERCOM3_5, SERCOM3_6 - DCD SERCOM4_0_Handler ; 62 SERCOM4_0 - DCD SERCOM4_1_Handler ; 63 SERCOM4_1 - DCD SERCOM4_2_Handler ; 64 SERCOM4_2 - DCD SERCOM4_3_Handler ; 65 SERCOM4_3, SERCOM4_4, SERCOM4_5, SERCOM4_6 - DCD SERCOM5_0_Handler ; 66 SERCOM5_0 - DCD SERCOM5_1_Handler ; 67 SERCOM5_1 - DCD SERCOM5_2_Handler ; 68 SERCOM5_2 - DCD SERCOM5_3_Handler ; 69 SERCOM5_3, SERCOM5_4, SERCOM5_5, SERCOM5_6 - DCD SERCOM6_0_Handler ; 70 SERCOM6_0 - DCD SERCOM6_1_Handler ; 71 SERCOM6_1 - DCD SERCOM6_2_Handler ; 72 SERCOM6_2 - DCD SERCOM6_3_Handler ; 73 SERCOM6_3, SERCOM6_4, SERCOM6_5, SERCOM6_6 - DCD SERCOM7_0_Handler ; 74 SERCOM7_0 - DCD SERCOM7_1_Handler ; 75 SERCOM7_1 - DCD SERCOM7_2_Handler ; 76 SERCOM7_2 - DCD SERCOM7_3_Handler ; 77 SERCOM7_3, SERCOM7_4, SERCOM7_5, SERCOM7_6 - DCD CAN0_Handler ; 78 Control Area Network 0 - DCD CAN1_Handler ; 79 Control Area Network 1 - DCD USB_0_Handler ; 80 USB_EORSM_DNRSM, USB_EORST_RST, USB_LPMSUSP_DDISC, USB_LPM_DCONN, USB_MSOF, USB_RAMACER, USB_RXSTP_TXSTP_0, USB_RXSTP_TXSTP_1, USB_RXSTP_TXSTP_2, USB_RXSTP_TXSTP_3, USB_RXSTP_TXSTP_4, USB_RXSTP_TXSTP_5, USB_RXSTP_TXSTP_6, USB_RXSTP_TXSTP_7, USB_STALL0_STALL_0, USB_STALL0_STALL_1, USB_STALL0_STALL_2, USB_STALL0_STALL_3, USB_STALL0_STALL_4, USB_STALL0_STALL_5, USB_STALL0_STALL_6, USB_STALL0_STALL_7, USB_STALL1_0, USB_STALL1_1, USB_STALL1_2, USB_STALL1_3, USB_STALL1_4, USB_STALL1_5, USB_STALL1_6, USB_STALL1_7, USB_SUSPEND, USB_TRFAIL0_TRFAIL_0, USB_TRFAIL0_TRFAIL_1, USB_TRFAIL0_TRFAIL_2, USB_TRFAIL0_TRFAIL_3, USB_TRFAIL0_TRFAIL_4, USB_TRFAIL0_TRFAIL_5, USB_TRFAIL0_TRFAIL_6, USB_TRFAIL0_TRFAIL_7, USB_TRFAIL1_PERR_0, USB_TRFAIL1_PERR_1, USB_TRFAIL1_PERR_2, USB_TRFAIL1_PERR_3, USB_TRFAIL1_PERR_4, USB_TRFAIL1_PERR_5, USB_TRFAIL1_PERR_6, USB_TRFAIL1_PERR_7, USB_UPRSM, USB_WAKEUP - DCD USB_1_Handler ; 81 USB_SOF_HSOF - DCD USB_2_Handler ; 82 USB_TRCPT0_0, USB_TRCPT0_1, USB_TRCPT0_2, USB_TRCPT0_3, USB_TRCPT0_4, USB_TRCPT0_5, USB_TRCPT0_6, USB_TRCPT0_7 - DCD USB_3_Handler ; 83 USB_TRCPT1_0, USB_TRCPT1_1, USB_TRCPT1_2, USB_TRCPT1_3, USB_TRCPT1_4, USB_TRCPT1_5, USB_TRCPT1_6, USB_TRCPT1_7 - DCD GMAC_Handler ; 84 Ethernet MAC - DCD TCC0_0_Handler ; 85 TCC0_CNT_A, TCC0_DFS_A, TCC0_ERR_A, TCC0_FAULT0_A, TCC0_FAULT1_A, TCC0_FAULTA_A, TCC0_FAULTB_A, TCC0_OVF, TCC0_TRG, TCC0_UFS_A - DCD TCC0_1_Handler ; 86 TCC0_MC_0 - DCD TCC0_2_Handler ; 87 TCC0_MC_1 - DCD TCC0_3_Handler ; 88 TCC0_MC_2 - DCD TCC0_4_Handler ; 89 TCC0_MC_3 - DCD TCC0_5_Handler ; 90 TCC0_MC_4 - DCD TCC0_6_Handler ; 91 TCC0_MC_5 - DCD TCC1_0_Handler ; 92 TCC1_CNT_A, TCC1_DFS_A, TCC1_ERR_A, TCC1_FAULT0_A, TCC1_FAULT1_A, TCC1_FAULTA_A, TCC1_FAULTB_A, TCC1_OVF, TCC1_TRG, TCC1_UFS_A - DCD TCC1_1_Handler ; 93 TCC1_MC_0 - DCD TCC1_2_Handler ; 94 TCC1_MC_1 - DCD TCC1_3_Handler ; 95 TCC1_MC_2 - DCD TCC1_4_Handler ; 96 TCC1_MC_3 - DCD TCC2_0_Handler ; 97 TCC2_CNT_A, TCC2_DFS_A, TCC2_ERR_A, TCC2_FAULT0_A, TCC2_FAULT1_A, TCC2_FAULTA_A, TCC2_FAULTB_A, TCC2_OVF, TCC2_TRG, TCC2_UFS_A - DCD TCC2_1_Handler ; 98 TCC2_MC_0 - DCD TCC2_2_Handler ; 99 TCC2_MC_1 - DCD TCC2_3_Handler ; 100 TCC2_MC_2 - DCD TCC3_0_Handler ; 101 TCC3_CNT_A, TCC3_DFS_A, TCC3_ERR_A, TCC3_FAULT0_A, TCC3_FAULT1_A, TCC3_FAULTA_A, TCC3_FAULTB_A, TCC3_OVF, TCC3_TRG, TCC3_UFS_A - DCD TCC3_1_Handler ; 102 TCC3_MC_0 - DCD TCC3_2_Handler ; 103 TCC3_MC_1 - DCD TCC4_0_Handler ; 104 TCC4_CNT_A, TCC4_DFS_A, TCC4_ERR_A, TCC4_FAULT0_A, TCC4_FAULT1_A, TCC4_FAULTA_A, TCC4_FAULTB_A, TCC4_OVF, TCC4_TRG, TCC4_UFS_A - DCD TCC4_1_Handler ; 105 TCC4_MC_0 - DCD TCC4_2_Handler ; 106 TCC4_MC_1 - DCD TC0_Handler ; 107 Basic Timer Counter 0 - DCD TC1_Handler ; 108 Basic Timer Counter 1 - DCD TC2_Handler ; 109 Basic Timer Counter 2 - DCD TC3_Handler ; 110 Basic Timer Counter 3 - DCD TC4_Handler ; 111 Basic Timer Counter 4 - DCD TC5_Handler ; 112 Basic Timer Counter 5 - DCD TC6_Handler ; 113 Basic Timer Counter 6 - DCD TC7_Handler ; 114 Basic Timer Counter 7 - DCD PDEC_0_Handler ; 115 PDEC_DIR_A, PDEC_ERR_A, PDEC_OVF, PDEC_VLC_A - DCD PDEC_1_Handler ; 116 PDEC_MC_0 - DCD PDEC_2_Handler ; 117 PDEC_MC_1 - DCD ADC0_0_Handler ; 118 ADC0_OVERRUN, ADC0_WINMON - DCD ADC0_1_Handler ; 119 ADC0_RESRDY - DCD ADC1_0_Handler ; 120 ADC1_OVERRUN, ADC1_WINMON - DCD ADC1_1_Handler ; 121 ADC1_RESRDY - DCD AC_Handler ; 122 Analog Comparators - DCD DAC_0_Handler ; 123 DAC_OVERRUN_A_0, DAC_OVERRUN_A_1, DAC_UNDERRUN_A_0, DAC_UNDERRUN_A_1 - DCD DAC_1_Handler ; 124 DAC_EMPTY_0 - DCD DAC_2_Handler ; 125 DAC_EMPTY_1 - DCD DAC_3_Handler ; 126 DAC_RESRDY_0 - DCD DAC_4_Handler ; 127 DAC_RESRDY_1 - DCD I2S_Handler ; 128 Inter-IC Sound Interface - DCD PCC_Handler ; 129 Parallel Capture Controller - DCD AES_Handler ; 130 Advanced Encryption Standard - DCD TRNG_Handler ; 131 True Random Generator - DCD ICM_Handler ; 132 Integrity Check Monitor - DCD PUKCC_Handler ; 133 PUblic-Key Cryptography Controller - DCD QSPI_Handler ; 134 Quad SPI interface - DCD SDHC0_Handler ; 135 SD/MMC Host Controller 0 - DCD SDHC1_Handler ; 136 SD/MMC Host Controller 1 -__Vectors_End - -__Vectors_Size EQU __Vectors_End - __Vectors - - AREA |.text|, CODE, READONLY - - -; Reset Handler - -Reset_Handler PROC - EXPORT Reset_Handler [WEAK] - IMPORT SystemInit - IMPORT __main - LDR R0, =SystemInit - BLX R0 - LDR R0, =__main - BX R0 - ENDP - - -; Dummy Exception Handlers (infinite loops which can be modified) - -NMI_Handler PROC - EXPORT NMI_Handler [WEAK] - B . - ENDP -HardFault_Handler\ - PROC - EXPORT HardFault_Handler [WEAK] - B . - ENDP -MemManage_Handler\ - PROC - EXPORT MemManage_Handler [WEAK] - B . - ENDP -BusFault_Handler\ - PROC - EXPORT BusFault_Handler [WEAK] - B . - ENDP -UsageFault_Handler\ - PROC - EXPORT UsageFault_Handler [WEAK] - B . - ENDP -SVC_Handler PROC - EXPORT SVC_Handler [WEAK] - B . - ENDP -DebugMon_Handler\ - PROC - EXPORT DebugMon_Handler [WEAK] - B . - ENDP -PendSV_Handler PROC - EXPORT PendSV_Handler [WEAK] - B . - ENDP -SysTick_Handler PROC - EXPORT SysTick_Handler [WEAK] - B . - ENDP - -Default_Handler PROC - EXPORT PM_Handler [WEAK] - EXPORT MCLK_Handler [WEAK] - EXPORT OSCCTRL_0_Handler [WEAK] - EXPORT OSCCTRL_1_Handler [WEAK] - EXPORT OSCCTRL_2_Handler [WEAK] - EXPORT OSCCTRL_3_Handler [WEAK] - EXPORT OSCCTRL_4_Handler [WEAK] - EXPORT OSC32KCTRL_Handler [WEAK] - EXPORT SUPC_0_Handler [WEAK] - EXPORT SUPC_1_Handler [WEAK] - EXPORT WDT_Handler [WEAK] - EXPORT RTC_Handler [WEAK] - EXPORT EIC_0_Handler [WEAK] - EXPORT EIC_1_Handler [WEAK] - EXPORT EIC_2_Handler [WEAK] - EXPORT EIC_3_Handler [WEAK] - EXPORT EIC_4_Handler [WEAK] - EXPORT EIC_5_Handler [WEAK] - EXPORT EIC_6_Handler [WEAK] - EXPORT EIC_7_Handler [WEAK] - EXPORT EIC_8_Handler [WEAK] - EXPORT EIC_9_Handler [WEAK] - EXPORT EIC_10_Handler [WEAK] - EXPORT EIC_11_Handler [WEAK] - EXPORT EIC_12_Handler [WEAK] - EXPORT EIC_13_Handler [WEAK] - EXPORT EIC_14_Handler [WEAK] - EXPORT EIC_15_Handler [WEAK] - EXPORT FREQM_Handler [WEAK] - EXPORT NVMCTRL_0_Handler [WEAK] - EXPORT NVMCTRL_1_Handler [WEAK] - EXPORT DMAC_0_Handler [WEAK] - EXPORT DMAC_1_Handler [WEAK] - EXPORT DMAC_2_Handler [WEAK] - EXPORT DMAC_3_Handler [WEAK] - EXPORT DMAC_4_Handler [WEAK] - EXPORT EVSYS_0_Handler [WEAK] - EXPORT EVSYS_1_Handler [WEAK] - EXPORT EVSYS_2_Handler [WEAK] - EXPORT EVSYS_3_Handler [WEAK] - EXPORT EVSYS_4_Handler [WEAK] - EXPORT PAC_Handler [WEAK] - EXPORT TAL_0_Handler [WEAK] - EXPORT TAL_1_Handler [WEAK] - EXPORT RAMECC_Handler [WEAK] - EXPORT SERCOM0_0_Handler [WEAK] - EXPORT SERCOM0_1_Handler [WEAK] - EXPORT SERCOM0_2_Handler [WEAK] - EXPORT SERCOM0_3_Handler [WEAK] - EXPORT SERCOM1_0_Handler [WEAK] - EXPORT SERCOM1_1_Handler [WEAK] - EXPORT SERCOM1_2_Handler [WEAK] - EXPORT SERCOM1_3_Handler [WEAK] - EXPORT SERCOM2_0_Handler [WEAK] - EXPORT SERCOM2_1_Handler [WEAK] - EXPORT SERCOM2_2_Handler [WEAK] - EXPORT SERCOM2_3_Handler [WEAK] - EXPORT SERCOM3_0_Handler [WEAK] - EXPORT SERCOM3_1_Handler [WEAK] - EXPORT SERCOM3_2_Handler [WEAK] - EXPORT SERCOM3_3_Handler [WEAK] - EXPORT SERCOM4_0_Handler [WEAK] - EXPORT SERCOM4_1_Handler [WEAK] - EXPORT SERCOM4_2_Handler [WEAK] - EXPORT SERCOM4_3_Handler [WEAK] - EXPORT SERCOM5_0_Handler [WEAK] - EXPORT SERCOM5_1_Handler [WEAK] - EXPORT SERCOM5_2_Handler [WEAK] - EXPORT SERCOM5_3_Handler [WEAK] - EXPORT SERCOM6_0_Handler [WEAK] - EXPORT SERCOM6_1_Handler [WEAK] - EXPORT SERCOM6_2_Handler [WEAK] - EXPORT SERCOM6_3_Handler [WEAK] - EXPORT SERCOM7_0_Handler [WEAK] - EXPORT SERCOM7_1_Handler [WEAK] - EXPORT SERCOM7_2_Handler [WEAK] - EXPORT SERCOM7_3_Handler [WEAK] - EXPORT CAN0_Handler [WEAK] - EXPORT CAN1_Handler [WEAK] - EXPORT USB_0_Handler [WEAK] - EXPORT USB_1_Handler [WEAK] - EXPORT USB_2_Handler [WEAK] - EXPORT USB_3_Handler [WEAK] - EXPORT GMAC_Handler [WEAK] - EXPORT TCC0_0_Handler [WEAK] - EXPORT TCC0_1_Handler [WEAK] - EXPORT TCC0_2_Handler [WEAK] - EXPORT TCC0_3_Handler [WEAK] - EXPORT TCC0_4_Handler [WEAK] - EXPORT TCC0_5_Handler [WEAK] - EXPORT TCC0_6_Handler [WEAK] - EXPORT TCC1_0_Handler [WEAK] - EXPORT TCC1_1_Handler [WEAK] - EXPORT TCC1_2_Handler [WEAK] - EXPORT TCC1_3_Handler [WEAK] - EXPORT TCC1_4_Handler [WEAK] - EXPORT TCC2_0_Handler [WEAK] - EXPORT TCC2_1_Handler [WEAK] - EXPORT TCC2_2_Handler [WEAK] - EXPORT TCC2_3_Handler [WEAK] - EXPORT TCC3_0_Handler [WEAK] - EXPORT TCC3_1_Handler [WEAK] - EXPORT TCC3_2_Handler [WEAK] - EXPORT TCC4_0_Handler [WEAK] - EXPORT TCC4_1_Handler [WEAK] - EXPORT TCC4_2_Handler [WEAK] - EXPORT TC0_Handler [WEAK] - EXPORT TC1_Handler [WEAK] - EXPORT TC2_Handler [WEAK] - EXPORT TC3_Handler [WEAK] - EXPORT TC4_Handler [WEAK] - EXPORT TC5_Handler [WEAK] - EXPORT TC6_Handler [WEAK] - EXPORT TC7_Handler [WEAK] - EXPORT PDEC_0_Handler [WEAK] - EXPORT PDEC_1_Handler [WEAK] - EXPORT PDEC_2_Handler [WEAK] - EXPORT ADC0_0_Handler [WEAK] - EXPORT ADC0_1_Handler [WEAK] - EXPORT ADC1_0_Handler [WEAK] - EXPORT ADC1_1_Handler [WEAK] - EXPORT AC_Handler [WEAK] - EXPORT DAC_0_Handler [WEAK] - EXPORT DAC_1_Handler [WEAK] - EXPORT DAC_2_Handler [WEAK] - EXPORT DAC_3_Handler [WEAK] - EXPORT DAC_4_Handler [WEAK] - EXPORT I2S_Handler [WEAK] - EXPORT PCC_Handler [WEAK] - EXPORT AES_Handler [WEAK] - EXPORT TRNG_Handler [WEAK] - EXPORT ICM_Handler [WEAK] - EXPORT PUKCC_Handler [WEAK] - EXPORT QSPI_Handler [WEAK] - EXPORT SDHC0_Handler [WEAK] - EXPORT SDHC1_Handler [WEAK] - -PM_Handler -MCLK_Handler -OSCCTRL_0_Handler -OSCCTRL_1_Handler -OSCCTRL_2_Handler -OSCCTRL_3_Handler -OSCCTRL_4_Handler -OSC32KCTRL_Handler -SUPC_0_Handler -SUPC_1_Handler -WDT_Handler -RTC_Handler -EIC_0_Handler -EIC_1_Handler -EIC_2_Handler -EIC_3_Handler -EIC_4_Handler -EIC_5_Handler -EIC_6_Handler -EIC_7_Handler -EIC_8_Handler -EIC_9_Handler -EIC_10_Handler -EIC_11_Handler -EIC_12_Handler -EIC_13_Handler -EIC_14_Handler -EIC_15_Handler -FREQM_Handler -NVMCTRL_0_Handler -NVMCTRL_1_Handler -DMAC_0_Handler -DMAC_1_Handler -DMAC_2_Handler -DMAC_3_Handler -DMAC_4_Handler -EVSYS_0_Handler -EVSYS_1_Handler -EVSYS_2_Handler -EVSYS_3_Handler -EVSYS_4_Handler -PAC_Handler -TAL_0_Handler -TAL_1_Handler -RAMECC_Handler -SERCOM0_0_Handler -SERCOM0_1_Handler -SERCOM0_2_Handler -SERCOM0_3_Handler -SERCOM1_0_Handler -SERCOM1_1_Handler -SERCOM1_2_Handler -SERCOM1_3_Handler -SERCOM2_0_Handler -SERCOM2_1_Handler -SERCOM2_2_Handler -SERCOM2_3_Handler -SERCOM3_0_Handler -SERCOM3_1_Handler -SERCOM3_2_Handler -SERCOM3_3_Handler -SERCOM4_0_Handler -SERCOM4_1_Handler -SERCOM4_2_Handler -SERCOM4_3_Handler -SERCOM5_0_Handler -SERCOM5_1_Handler -SERCOM5_2_Handler -SERCOM5_3_Handler -SERCOM6_0_Handler -SERCOM6_1_Handler -SERCOM6_2_Handler -SERCOM6_3_Handler -SERCOM7_0_Handler -SERCOM7_1_Handler -SERCOM7_2_Handler -SERCOM7_3_Handler -CAN0_Handler -CAN1_Handler -USB_0_Handler -USB_1_Handler -USB_2_Handler -USB_3_Handler -GMAC_Handler -TCC0_0_Handler -TCC0_1_Handler -TCC0_2_Handler -TCC0_3_Handler -TCC0_4_Handler -TCC0_5_Handler -TCC0_6_Handler -TCC1_0_Handler -TCC1_1_Handler -TCC1_2_Handler -TCC1_3_Handler -TCC1_4_Handler -TCC2_0_Handler -TCC2_1_Handler -TCC2_2_Handler -TCC2_3_Handler -TCC3_0_Handler -TCC3_1_Handler -TCC3_2_Handler -TCC4_0_Handler -TCC4_1_Handler -TCC4_2_Handler -TC0_Handler -TC1_Handler -TC2_Handler -TC3_Handler -TC4_Handler -TC5_Handler -TC6_Handler -TC7_Handler -PDEC_0_Handler -PDEC_1_Handler -PDEC_2_Handler -ADC0_0_Handler -ADC0_1_Handler -ADC1_0_Handler -ADC1_1_Handler -AC_Handler -DAC_0_Handler -DAC_1_Handler -DAC_2_Handler -DAC_3_Handler -DAC_4_Handler -I2S_Handler -PCC_Handler -AES_Handler -TRNG_Handler -ICM_Handler -PUKCC_Handler -QSPI_Handler -SDHC0_Handler -SDHC1_Handler - B . - ENDP - - - ALIGN - - -; User Initial Stack & Heap - - IF :DEF:__MICROLIB - - EXPORT __initial_sp - EXPORT __heap_base - EXPORT __heap_limit - - ELSE - - IMPORT __use_two_region_memory - EXPORT __user_initial_stackheap -__user_initial_stackheap - - LDR R0, = Heap_Mem - LDR R1, =(Stack_Mem + Stack_Size) - LDR R2, = (Heap_Mem + Heap_Size) - LDR R3, = Stack_Mem - BX LR - - ALIGN - - ENDIF - - - END diff --git a/armcc/arm_addon/armcc/system_same54.c b/armcc/arm_addon/armcc/system_same54.c deleted file mode 100644 index 95d3036..0000000 --- a/armcc/arm_addon/armcc/system_same54.c +++ /dev/null @@ -1,70 +0,0 @@ -/** - * \file - * - * \brief Low-level initialization functions called upon chip startup. - * - * Copyright (c) 2016 Atmel Corporation, - * a wholly owned subsidiary of Microchip Technology Inc. - * - * \asf_license_start - * - * \page License - * - * 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 - * - */ - -#include "same54.h" - -/** - * Initial system clock frequency. The System RC Oscillator (RCSYS) provides - * the source for the main clock at chip startup. - */ -#define __SYSTEM_CLOCK (48000000) - -uint32_t SystemCoreClock = __SYSTEM_CLOCK; /*!< System Clock Frequency (Core Clock)*/ - -/** - * Initialize the system - * - * @brief Setup the microcontroller system. - * Initialize the System and update the SystemCoreClock variable. - */ -void SystemInit(void) -{ -#if __FPU_USED - /* Enable FPU */ - SCB->CPACR |= (0xFu << 20); - __DSB(); - __ISB(); -#endif - - // Keep the default device state after reset - SystemCoreClock = __SYSTEM_CLOCK; - return; -} - -/** - * Update SystemCoreClock variable - * - * @brief Updates the SystemCoreClock with current core Clock - * retrieved from cpu registers. - */ -void SystemCoreClockUpdate(void) -{ - // Not implemented - SystemCoreClock = __SYSTEM_CLOCK; - return; -} -- To view, visit https://gerrit.osmocom.org/12510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I232502798d71c97d0e7b4adf6bb6af3fa0940bd1 Gerrit-Change-Number: 12510 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:20 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:20 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused example code Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12511 Change subject: remove unused example code ...................................................................... remove unused example code Change-Id: I205cd02f0c9a55d22bb78e84a88a29afe31224b0 --- D examples/driver_examples.c D examples/driver_examples.h M gcc/Makefile 3 files changed, 3 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/11/12511/1 diff --git a/examples/driver_examples.c b/examples/driver_examples.c deleted file mode 100644 index 69d50de..0000000 --- a/examples/driver_examples.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Code generated from Atmel Start. - * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file - * to avoid losing it when reconfiguring. - */ - -#include "driver_examples.h" -#include "driver_init.h" -#include "utils.h" diff --git a/examples/driver_examples.h b/examples/driver_examples.h deleted file mode 100644 index ef1c619..0000000 --- a/examples/driver_examples.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Code generated from Atmel Start. - * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file - * to avoid losing it when reconfiguring. - */ -#ifndef DRIVER_EXAMPLES_H_INCLUDED -#define DRIVER_EXAMPLES_H_INCLUDED - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif -#endif // DRIVER_EXAMPLES_H_INCLUDED diff --git a/gcc/Makefile b/gcc/Makefile index f7c5b65..16c7858 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -36,7 +36,6 @@ hpl/mclk \ usb \ hal/utils/src \ -examples \ hpl/gclk \ usb/device \ hpl/oscctrl \ @@ -72,7 +71,6 @@ gcc/gcc/startup_same54.o \ hal/src/hal_usb_device.o \ hpl/osc32kctrl/hpl_osc32kctrl.o \ -examples/driver_examples.o \ driver_init.o \ hal/src/hal_gpio.o \ hal/utils/src/utils_event.o \ @@ -110,7 +108,6 @@ "gcc/gcc/startup_same54.o" \ "hal/src/hal_usb_device.o" \ "hpl/osc32kctrl/hpl_osc32kctrl.o" \ -"examples/driver_examples.o" \ "driver_init.o" \ "hal/src/hal_gpio.o" \ "hal/utils/src/utils_event.o" \ @@ -152,7 +149,6 @@ "hpl/mclk/hpl_mclk.d" \ "driver_init.d" \ "hpl/osc32kctrl/hpl_osc32kctrl.d" \ -"examples/driver_examples.d" \ "hal/src/hal_cache.d" \ "hal/src/hal_sleep.d" \ "hal/src/hal_gpio.d" \ @@ -207,7 +203,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< @@ -216,7 +212,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< @@ -225,7 +221,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< -- To view, visit https://gerrit.osmocom.org/12511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I205cd02f0c9a55d22bb78e84a88a29afe31224b0 Gerrit-Change-Number: 12511 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:20 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:20 +0000 Subject: Change in osmo-asf4-dfu[master]: add license file Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12512 Change subject: add license file ...................................................................... add license file this include the LGPL v2.1 for the DFU stack, ASF for the ASFv4 library, and Apache 2.0 for the CMSIS. Change-Id: If7b127ddd23bd8c5d158a731d58d425cdf6330f4 --- A LICENSE 1 file changed, 666 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/12/12512/1 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d14c365 --- /dev/null +++ b/LICENSE @@ -0,0 +1,666 @@ +The USB DFU stack is under the LGPLv2.1 license. +This stack uses the Microchip ASFv4 library under the ASF license. +The CMSIS definitions are under the Apache-2.0 license +The header of each file indicates under which the includes source code is. +You can find the complete text of both licenses below. + += LGPLv2.1 + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + += ASF + +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. + += Apache-2.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS -- To view, visit https://gerrit.osmocom.org/12512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If7b127ddd23bd8c5d158a731d58d425cdf6330f4 Gerrit-Change-Number: 12512 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:20 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:20 +0000 Subject: Change in osmo-asf4-dfu[master]: set USB string to osmocom osmo-ASF4-DFU Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12513 Change subject: set USB string to osmocom osmo-ASF4-DFU ...................................................................... set USB string to osmocom osmo-ASF4-DFU Change-Id: I001a7b6f54b3aaab04d55e84cd9ada0daa423805 --- M config/usbd_config.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/13/12513/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index e33f4ba..96b3320 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -107,11 +107,11 @@ // Unicode string of iManufact // usb_dufd_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR -#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "osmocom" #endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC -#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 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif // @@ -130,11 +130,11 @@ // Unicode string of iProduct // usb_dufd_iproduct_str #ifndef CONF_USB_DFUD_IPRODUCT_STR -#define CONF_USB_DFUD_IPRODUCT_STR "sysmoOCTSIM" +#define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU" #endif #ifndef CONF_USB_DFUD_IPRODUCT_STR_DESC -#define CONF_USB_DFUD_IPRODUCT_STR_DESC 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', 0x00, 'M', 0x00, +#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 // -- To view, visit https://gerrit.osmocom.org/12513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I001a7b6f54b3aaab04d55e84cd9ada0daa423805 Gerrit-Change-Number: 12513 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:21 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:21 +0000 Subject: Change in osmo-asf4-dfu[master]: enable flashing by providing real downloaded data length Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12514 Change subject: enable flashing by providing real downloaded data length ...................................................................... enable flashing by providing real downloaded data length Change-Id: I6f16170a4b41a70d89954e2c4a841efc67a26786 --- M usb/class/dfu/device/dfudf.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/14/12514/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index aefcab4..41e235b 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -245,11 +245,9 @@ } else { // there is data to be flash if (USB_SETUP_STAGE == stage) { // there will be data to be flash to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data - //to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK } else { // now there is data to be flashed dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash - dfu_download_length = 0; - //dfu_download_length = req->wLength; // remember the data size to be flash + dfu_download_length = req->wLength; // remember the data size to be flash dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data // we let the main application flash the data because this can be long and would stall the USB ISR -- To view, visit https://gerrit.osmocom.org/12514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6f16170a4b41a70d89954e2c4a841efc67a26786 Gerrit-Change-Number: 12514 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:21 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:21 +0000 Subject: Change in osmo-asf4-dfu[master]: use reserved bootloader get application start Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12515 Change subject: use reserved bootloader get application start ...................................................................... use reserved bootloader get application start the reserved bootloader size is set in the NVM user configuration and allows to know the application start address (e.g. after the bootloader) Change-Id: I9dda27d6401caabb4a6470aa3fe9691f63097136 --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf.h M usb_start.c 3 files changed, 18 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/15/12515/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 41e235b..8232979 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -44,7 +44,7 @@ uint8_t dfu_download_data[512]; uint16_t dfu_download_length = 0; -size_t dfu_download_progress = 0; +size_t dfu_download_offset = 0; bool dfu_manifestation_complete = false; /** @@ -215,7 +215,7 @@ to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK break; case USB_DFU_ABORT: // abort current operation - dfu_download_progress = 0; // reset download progress + 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; @@ -246,7 +246,7 @@ if (USB_SETUP_STAGE == stage) { // there will be data to be flash to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data } else { // now there is data to be flashed - dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash + dfu_download_offset = req->wValue * sizeof(dfu_download_data); // remember which block to flash dfu_download_length = req->wLength; // remember the data size to be flash dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data diff --git a/usb/class/dfu/device/dfudf.h b/usb/class/dfu/device/dfudf.h index a19b569..cee5845 100644 --- a/usb/class/dfu/device/dfudf.h +++ b/usb/class/dfu/device/dfudf.h @@ -49,8 +49,8 @@ extern uint8_t dfu_download_data[512]; /** Length of downloaded data in bytes */ extern uint16_t dfu_download_length; -/** Progress of the already downloaded data in bytes */ -extern size_t dfu_download_progress; +/** 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; diff --git a/usb_start.c b/usb_start.c index 0ce8aba..7503094 100644 --- a/usb_start.c +++ b/usb_start.c @@ -45,14 +45,6 @@ /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; -/** Application address in the flash - ( - * It comes after the bootloader. - * The NVMCTRL allows to reserve space at the beginning of the flash for the bootloader, but only in multiples of 8192 bytes. - * The binary just with the USB stack already uses 8 kB, we reserve 16 kB for the bootloader (giving use a bit of margin for future fixes). - */ -#define APPLICATION_ADDR (8192*2) - /** * \brief USB DFU Init */ @@ -89,12 +81,24 @@ { 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 + + uint32_t application_start = hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw); // read BOOTPROT setting to get the bootloader size + ASSERT(application_start <= 15); + application_start = (15 - application_start) * 8192; // calculate bootloader size to know where we should write the application firmware + while (0 == application_start) { // no space has been reserved for the bootloader + // blink the LED to tell the user we don't know where the application starts + gpio_set_pin_level(LED_SYSTEM, false); + delay_ms(500); + gpio_set_pin_level(LED_SYSTEM, true); + delay_ms(500); + } + 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 if (dfu_download_length > 0) { // there is some data to be flashed - int32_t rc = flash_write(&FLASH_0, APPLICATION_ADDR + dfu_download_progress, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + int32_t rc = flash_write(&FLASH_0, application_start + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash if (ERR_NONE == rc) { dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed } else { // there has been a programming error -- To view, visit https://gerrit.osmocom.org/12515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9dda27d6401caabb4a6470aa3fe9691f63097136 Gerrit-Change-Number: 12515 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 15:05:21 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 9 Jan 2019 15:05:21 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12516 Change subject: add README file ...................................................................... add README file this describes the project, how to compile, and how to flash the USB DFU bootloader Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf --- A README 1 file changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/16/12516/1 diff --git a/README b/README new file mode 100644 index 0000000..031bc27 --- /dev/null +++ b/README @@ -0,0 +1,50 @@ +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. +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. + +USB DFU +======= + +This implementation support the following USB DFU capabilities: + +* can download: allowing to download the code over USB on the device (enabled per default) +* manifestation tolerant: allowing to download after a previous download (disabled per default) +* will detach: forcing the device the reset after a download, else it wit for a USB reset (enable per default) + +Set the corresponding attributes in the 'DFUD_IFACE_DESCB' macro definition in the 'usb/class/dfu/device/dfudf_desc.h' file. + +Compiling +========= + +Use the 'Makefile' script to compile the source code using the ARM none EABI GCC cross-cimpilig toolchain: +``` +cd gcc +make +``` + +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. +We need to reserve as least 2 pages of 8192 bytes for the bootloader since it is a bit larger than 10 KB (e.g. over 8 KB). +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 +---- + +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` -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:13:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:13:26 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 29: (10 comments) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 597 PS29, Line 597: if (type_ie[0] == SGSAP_ID_NONEPS_T_EXPLICIT_UE_NONEPS) (a switch() would be nicer here) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 624 PS29, Line 624: if (type_ie[0] == SGSAP_ID_EPS_T_NETWORK_INITIATED) (a switch() would be nicer here) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 650 PS29, Line 650: /* Subscriber must be known by the HLR */ VLR != HLR https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 655 PS29, Line 655: /* Inform the HLR */ AFAICT this is not sending anything to the HLR https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 708 PS29, Line 708: * is comparable to a paging response. The SGsAP SERVICE REQUEST must so an SGsAP Service Request is a reply to an earlier message from the 2G CN? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 772 PS29, Line 772: conn = connection_for_subscr(vsub); is it possible that we obtain a conn that was established on GSM and not via SGs? A subscriber could be active on 2G, lose that connection, and while that is in timeout, some LTE action starts. Not sure where that should happen, but would it make sense to make sure that when establishing SGs for a subscriber, that any previous 2G/3G connections are discarded? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1140 PS29, Line 1140: /*! This function expects a pointer to the related gsm subscriber inline comment rather without doxygen marker https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1212 PS29, Line 1212: osmo_fsm_register(&sgs_vlr_reset_fsm); register sgs_ue_fsm? https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 205 PS29, Line 205: /*! Perform an SGs TMSI reallocation complete. wrong comment https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 226 PS29, Line 226: /*! Notify that an SGs paging has been rejected by the MME. wrong comment -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 16:13:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:15:27 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:15:27 +0000 Subject: Change in osmo-bsc[master]: LCLS: use Status for HO-COMPLETE message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12379 ) Change subject: LCLS: use Status for HO-COMPLETE message ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12379/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12379/1//COMMIT_MSG at 9 PS1, Line 9: This requires Ib2958a8613627c4e54c004ffa3578c300ed0360b in libosmocore. "Depends: Ib2..." https://gerrit.osmocom.org/#/c/12379/1/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/12379/1/src/osmo-bsc/osmo_bsc_bssap.c at a1099 PS1, Line 1099: I don't understand... -- To view, visit https://gerrit.osmocom.org/12379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab Gerrit-Change-Number: 12379 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:15:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:16:12 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:16:12 +0000 Subject: Change in libosmocore[master]: LCLS: use proper types for value_string wrappers In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12367 ) Change subject: LCLS: use proper types for value_string wrappers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 09 Jan 2019 16:16:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:17:18 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 16:17:18 +0000 Subject: Change in libosmocore[master]: LCLS: use proper types for value_string wrappers In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12367 ) Change subject: LCLS: use proper types for value_string wrappers ...................................................................... LCLS: use proper types for value_string wrappers Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e --- M include/osmocom/gsm/gsm0808.h 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index ac88748..782f3ec 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -219,13 +219,13 @@ extern const struct value_string gsm0808_lcls_control_names[]; extern const struct value_string gsm0808_lcls_status_names[]; -static inline const char *gsm0808_lcls_config_name(uint8_t val) { +static inline const char *gsm0808_lcls_config_name(enum gsm0808_lcls_config val) { return get_value_string(gsm0808_lcls_config_names, val); } -static inline const char *gsm0808_lcls_control_name(uint8_t val) { +static inline const char *gsm0808_lcls_control_name(enum gsm0808_lcls_control val) { return get_value_string(gsm0808_lcls_control_names, val); } -static inline const char *gsm0808_lcls_status_name(uint8_t val) { +static inline const char *gsm0808_lcls_status_name(enum gsm0808_lcls_status val) { return get_value_string(gsm0808_lcls_status_names, val); } -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:22:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:22:54 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12375 ) Change subject: LCLS: don't encode incorrect values ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12375/3/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12375/3/src/gsm/gsm0808.c at 346 PS3, Line 346: return NULL; Have you seen a situation where these values were wrong / do they come from rx'ing packets? If these are directly called with enum constants from our code, I wouldn't bother to check them. If keeping the check: - enums can also have negative values. - what about the enum values in-between ST_LOCALLY_SWITCHED and _NA. -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 09 Jan 2019 16:22:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:27:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:27:52 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12483 ) Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... Patch Set 2: Code-Review-1 (3 comments) looks good except for minor tweaks... https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c at 522 PS2, Line 522: /*! Create BSSMAP Assignment Completed message as per 3GPP TS 48.008 ?3.2.1.2 (end with dot) https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c at 537 PS2, Line 537: enum gsm0808_lcls_status lcls_bss_status) looks like wrong indent on gerrit https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c at 577 PS2, Line 577: if (lcls_bss_status < GSM0808_LCLS_STS_NA) prefer '!= GSM0808_LCLS_STS_NA' to not make assumptions on enum value ordering. -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:27:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:32:27 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:32:27 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12485 ) Change subject: LCLS: constify helper parameters ...................................................................... Patch Set 1: Code-Review-1 (1 comment) looks good except that one const there https://gerrit.osmocom.org/#/c/12485/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/12485/1/src/osmo-bsc/osmo_bsc_lcls.c at 278 PS1, Line 278: static void lcls_break_local_switching(const struct gsm_subscriber_connection *conn) the function changes the switching of the conn, right? Isn't it confusing to say const then? -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:32:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:34:37 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:34:37 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 09 Jan 2019 16:34:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:35:42 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:35:42 +0000 Subject: Change in python/osmo-python-tests[master]: deb: fix wrong changelog date In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12487 ) Change subject: deb: fix wrong changelog date ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12487/1/debian/changelog File debian/changelog: https://gerrit.osmocom.org/#/c/12487/1/debian/changelog at 5 PS1, Line 5: -- Harald Welte Fri, 31 May 2019 10:33:31 +0100 we haven't reached May 2019 yet?? -- To view, visit https://gerrit.osmocom.org/12487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie73b1f29bd13e68e9b5e05896f1f048bc8108d17 Gerrit-Change-Number: 12487 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 09 Jan 2019 16:35:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:37:05 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:37:05 +0000 Subject: Change in libosmocore[master]: LCLS: add allocator function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12491 ) Change subject: LCLS: add allocator function ...................................................................... Patch Set 1: ok, but why? -- To view, visit https://gerrit.osmocom.org/12491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 Gerrit-Change-Number: 12491 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:37:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:39:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:39:31 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 5: it's good, but will soon be replaced by LOG_RAN_CONN() (if the patch is accepted) which will include the osmo_mi_name() from the FSM instance context. So if we merge this, there will be a merge conflict, and the end result will be the same. -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 16:39:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:40:40 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:40:40 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 5: see https://gerrit.osmocom.org/c/osmo-msc/+/12470/2/src/libmsc/gsm_04_08.c#800 -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 09 Jan 2019 16:40:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:42:42 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 9 Jan 2019 16:42:42 +0000 Subject: Change in python/osmo-python-tests[master]: Add initial version of asyncio trap2cgi script In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12476 ) Change subject: Add initial version of asyncio trap2cgi script ...................................................................... Add initial version of asyncio trap2cgi script It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399 --- M README A contrib/systemd/osmo-trap2cgi.service M debian/rules A scripts/osmo_trap2cgi.py M setup.py 5 files changed, 247 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/README b/README index e90e214..69eb764 100644 --- a/README +++ b/README @@ -9,7 +9,8 @@ There are currently following scripts in this package: osmotestconfig.py - test that apps start/write with example configs soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) -ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted +ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted (deprecated, unmaintained) +osmo_trap2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of asyncio and aiohttp osmo_rate_ctr2csv.py - rate counter dumper on top of osmo_ipa osmo_interact_vty.py - pipe stdin/stdout to a VTY session osmo_interact_ctrl.py - pipe stdin/stdout to a CTRL port diff --git a/contrib/systemd/osmo-trap2cgi.service b/contrib/systemd/osmo-trap2cgi.service new file mode 100644 index 0000000..7a90813 --- /dev/null +++ b/contrib/systemd/osmo-trap2cgi.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy between given GCI service and Osmocom CTRL protocol + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo_trap2cgi.py -d -c %E/osmocom/%N.ini +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index b33b599..04b59f6 100755 --- a/debian/rules +++ b/debian/rules @@ -17,3 +17,4 @@ # Install service file with different name than package name: # https://unix.stackexchange.com/questions/306234/is-it-possible-to-install-two-services-for-one-package-using-dh-installinit-how dh_installinit --name=osmo-ctrl2cgi + dh_installinit --name=osmo-trap2cgi diff --git a/scripts/osmo_trap2cgi.py b/scripts/osmo_trap2cgi.py new file mode 100755 index 0000000..ad66e7b --- /dev/null +++ b/scripts/osmo_trap2cgi.py @@ -0,0 +1,232 @@ +#!/usr/bin/python3 +# -*- mode: python-mode; py-indent-tabs-mode: nil -*- +""" +/* + * Copyright (C) 2019 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 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +""" + +__version__ = "0.0.1" # bump this on every non-trivial change + +from functools import partial +import configparser, argparse, time, os, asyncio, aiohttp +from osmopy.trap_helper import make_params, gen_hash, log_init, comm_proc +from osmopy.osmo_ipa import Ctrl + + +def log_bsc_time(l, rq, task, ts, bsc, msg, *args, **kwargs): + """ + Logging contextual wrapper. + FIXME: remove task parameter once we bump requirements to Python 3.7+ + """ + # FIXME: following function is deprecated and will be removed in Python 3.9 + # Use the asyncio.all_tasks() function instead when available (Python 3.7+). + num_tasks = len(task.all_tasks()) + num_req = len(rq) + delta = time.perf_counter() - ts + if delta < 1: + l('[%d/%d] BSC %s: ' + msg, num_req, num_tasks, bsc, *args, **kwargs) + else: + l('[%d/%d] BSC %s, %.2f sec: ' + msg, num_req, num_tasks, bsc, time.perf_counter() - ts, *args, **kwargs) + +def check_h_val(ctrl, h, v, t, exp): + """ + Check for header inconsistencies. + """ + if v != exp: + ctrl.log.error('Unexpected %s value %x (instead of %x) in |%s| header', t, v, exp, h.hex()) + +def get_ctrl_len(ctrl, header): + """ + Obtain expected message length. + """ + (dlen, p, e, _) = ctrl.del_header(header) + check_h_val(ctrl, header, p, "protocol", ctrl.PROTO['OSMO']) + check_h_val(ctrl, header, e, "extension", ctrl.EXT['CTRL']) + return dlen - 1 + + +class Proxy(Ctrl): + """ + Wrapper class to implement per-type message dispatch and keep BSC <-> http Task mapping. + N. B: keep async/await semantics out of it. + """ + def __init__(self, log): + super().__init__() + self.req = {} + self.log = log + self.conf = configparser.ConfigParser(interpolation = None) + self.conf.read(self.config_file) + self.timeout = self.conf['main'].getint('timeout', 30) + self.location = self.conf['main'].get('location') + self.ctrl_addr = self.conf['main'].get('addr_ctrl', 'localhost') + self.ctrl_port = self.conf['main'].getint('port_ctrl', 4250) + self.concurrency = self.conf['main'].getint('num_max_conn', 5) + # FIXME: use timeout parameter when available (aiohttp version 3.3) as follows + #self.http_client = aiohttp.ClientSession(connector = aiohttp.TCPConnector(limit = self.concurrency), timeout = self.timeout) + self.http_client = aiohttp.ClientSession(connector = aiohttp.TCPConnector(limit = self.concurrency)) + + def dispatch(self, w, data): + """ + Basic dispatcher: the expected entry point for CTRL messages. + """ + (cmd, _, v) = data.decode('utf-8').split(' ', 2) + method = getattr(self, cmd, lambda *_: self.log.info('CTRL %s is unhandled by dispatch: ignored.', cmd)) + method(w, v.split()) + + def ERROR(self, _, k): + """ + Handle CTRL ERROR messages. + """ + self.log_ignore('ERROR', k) + + def SET_REPLY(self, _, k): + """ + Handle CTRL SET_REPLY messages. + """ + self.log_ignore('SET_REPLY', k) + + def TRAP(self, w, k): + """ + Handle incoming TRAPs. + """ + p = k[0].split('.') + if p[-1] == 'location-state': + self.handle_locationstate(w, p[1], p[3], p[5], k[1]) + else: + self.log_ignore('TRAP', k[0]) + + def handle_locationstate(self, w, net, bsc, bts, data): + """ + Handle location-state TRAP: parse trap content, build HTTP request and setup async handlers. + """ + ts = time.perf_counter() + self.cleanup_task(bsc) + params = make_params(bsc, data) + params['h'] = gen_hash(params, self.conf['main'].get('secret_key')) + # FIXME: use asyncio.create_task() when available (Python 3.7+). + t = asyncio.ensure_future(self.http_client.post(self.location, data = params)) + log_bsc_time(self.log.info, self.req, t, ts, bsc, 'location-state@%s => %s', params['time_stamp'], data) + t.add_done_callback(partial(self.reply_callback, w, bsc, ts)) + self.req[bsc] = (t, ts) + log_bsc_time(self.log.info, self.req, t, ts, bsc, 'request added (net %s, BTS %s)', net, bts) + + def cleanup_task(self, bsc): + """ + It's ok to cancel() task which is done() + but if either of the checks above fires it means that Proxy() is in inconsistent state + which should never happen as long as we keep async/await semantics out of it. + """ + if bsc in self.req: + (task, ts) = self.req[bsc] + log_bsc = partial(log_bsc_time, self.log.error, self.req, task, ts, bsc) + if task.done(): + log_bsc('task is done but not removed') + if task.cancelled(): + log_bsc('task is cancelled without update') + task.cancel() + + def log_ignore(self, kind, m): + """ + Log ignored CTRL message. + """ + self.log.error('Ignoring CTRL %s: %s', kind, ' '.join(m) if type(m) is list else m) + + def reply_callback(self, w, bsc, ts, task): + """ + Process per-BSC response status and prepare async handler if necessary. + We don't have to delete cancel()ed task from self.req explicitly because it will be replaced by new one in handle_locationstate() + """ + log_bsc = partial(log_bsc_time, self.log.info, self.req, task, ts, bsc) + if task.cancelled(): + log_bsc('request cancelled') + else: + exp = task.exception() + if exp: + log_bsc('exception %s triggered', repr(exp)) + else: + resp = task.result() + if resp.status != 200: + log_bsc('unexpected HTTP response %d', resp.status) + else: + log_bsc('request completed') + # FIXME: use asyncio.create_task() when available (Python 3.7+). + asyncio.ensure_future(recv_response(self.log, w, bsc, resp.json())) + del self.req[bsc] + + +async def recv_response(log, w, bsc, resp): + """ + Process json response asynchronously. + """ + js = await resp + if js.get('error'): + log.info('BSC %s response error: %s', bsc, repr(js.get('error'))) + else: + comm_proc(js.get('commands'), bsc, w.write, log) + await w.drain() # Trigger Writer's flow control + +async def recon_reader(proxy, reader, num_bytes): + """ + Read requested amount of bytes, reconnect if necessary. + """ + try: + return await reader.readexactly(num_bytes) + except asyncio.IncompleteReadError: + proxy.log.info('Failed to read %d bytes reconnecting to %s:%d...', num_bytes, proxy.ctrl_addr, proxy.ctrl_port) + await conn_client(proxy) + +async def ctrl_client(proxy, rd, wr): + """ + Recursively read CTRL stream and handle selected messages. + """ + header = await recon_reader(proxy, rd, 4) + data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header)) + proxy.dispatch(wr, data) + await ctrl_client(proxy, rd, wr) + +async def conn_client(proxy): + """ + (Re)establish connection with CTRL server and pass Reader/Writer to CTRL handler. + """ + try: + reader, writer = await asyncio.open_connection(proxy.ctrl_addr, proxy.ctrl_port) + proxy.log.info('Connected to %s:%d', proxy.ctrl_addr, proxy.ctrl_port) + await ctrl_client(proxy, reader, writer) + except OSError as e: + proxy.log.info('%s: %d seconds delayed retrying...', e, proxy.timeout) + await asyncio.sleep(proxy.timeout) + await conn_client(proxy) + + +if __name__ == '__main__': + a = argparse.ArgumentParser(description = 'Proxy between given GCI service and Osmocom CTRL protocol.') + a.add_argument('-v', '--version', action = 'version', version = ("%(prog)s v" + __version__)) + a.add_argument('-d', '--debug', action = 'store_true', help = "Enable debug log") + a.add_argument('-c', '--config-file', required = True, help = "Path to mandatory config file (in INI format).") + + P = Proxy(log_init('TRAP2CGI', a.parse_args(namespace=Proxy).debug)) + + P.log.info('CGI proxy v%s starting with PID %d:', __version__, os.getpid()) + P.log.info('Destination %s (concurrency %d)', P.location, P.concurrency) + P.log.info('Connecting to TRAP source %s:%d...', P.ctrl_addr, P.ctrl_port) + + loop = asyncio.get_event_loop() + loop.run_until_complete(conn_client(P)) + # FIXME: use loop.run() function instead when available (Python 3.7+). diff --git a/setup.py b/setup.py index 061e5df..69e18b0 100755 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ "scripts/osmo_rate_ctr2csv.py", "scripts/soap.py", "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", "scripts/osmo_interact_vty.py", "scripts/osmo_interact_ctrl.py", "scripts/osmo_verify_transcript_vty.py", -- To view, visit https://gerrit.osmocom.org/12476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Gerrit-Change-Number: 12476 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:55:42 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:55:42 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12492 ) Change subject: LCLS: add string dump helper ...................................................................... Patch Set 7: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 614 PS7, Line 614: * \returns string representation of LCLS or NULL on error */ missing crucial information: a *talloc* allocated string that the caller must free. I've done this type of thing before, and most of the time it turns out to be impractical. Instead I'd suggest returning a static string buffer that doesn't need freeing. Drawback is the fixed length, but you avoid leaking strings and you can guarantee a non-NULL return arg. Hence can directly include in printf() args. https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 618 PS7, Line 618: #if (!EMBEDDED) Seeing this for the first time. The effect is that callers on embedded arch end up trying to print a NULL pointer? :P https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 624 PS7, Line 624: return talloc_asprintf_append(s, ", %s", osmo_gcr_dump(lcls->gcr)); you can do these two in one printf call: "...%s%s", ... , print_gcr? ", " : "", print_gcr ? osmo_gcr_dump() : "" (especially useful if you switch to snprintf) In this current form, this is leaking the talloc string from osmo_gcr_dump(). Of course will be cleaned up as soon as the struct osmo_lcls is deallocated, but not so nice nevertheless. https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm29205.c File src/gsm/gsm29205.c: https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm29205.c at 107 PS7, Line 107: osmo_talloc_asprintf(gcr, s, "Node 0x%x, CallRefID 0x%s", gcr->node, osmo_hexdump_nospc(gcr->cr, 5)); (maybe we can move _osmo_hexdump() to public API as osmo_hexdump_buf()?) https://gerrit.osmocom.org/#/c/12492/7/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12492/7/tests/gsm0808/gsm0808_test.c at 746 PS7, Line 746: printf("\t%s\n", osmo_gcr_dump(lcls_out->gcr)); should dealloc the strings. Some of our unit tests fail from the address sanitizer noticing non-deallocated buffers. Ah, in this case probably it gets cleaned from the lcls_out deallocation... -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:55:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 9 16:58:28 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 Jan 2019 16:58:28 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 1: Code-Review-1 (1 comment) good except https://gerrit.osmocom.org/#/c/12493/1/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12493/1/tests/gsm0808/gsm0808_test.c at 735 PS1, Line 735: } The two above seem to make sense, but they are functional changes unrelated to the comparison function. Please move to a separate patch. -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 09 Jan 2019 16:58:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 11:01:19 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 10 Jan 2019 11:01:19 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity in ran_conn ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 11:01:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 11:59:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 11:59:51 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 2: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 343 PS2, Line 343: (one of the reasons why this space-alignment sucks) Shouldn't this part be (re)aligned? Or should we just switch to a single tab? ;) https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 351 PS2, Line 351: same https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 360 PS2, Line 360: same https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 596 PS2, Line 596: Tx why should we change this in this change? https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 616 PS2, Line 616: Tx same https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 725 PS2, Line 725: message size same https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 726 PS2, Line 726: sizeof(struct gsm48_service_request*) Size of pointer?!? -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Thu, 10 Jan 2019 11:59:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 12:04:22 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12470/2/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/12470/2/include/osmocom/msc/ran_conn.h at 11 PS2, Line 11: LOG_RAN_CONN As far as I can see, all other logging macros are using 'LOGP' prefix. Why it isn't used here? -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Thu, 10 Jan 2019 12:04:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:10:56 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 12:10:56 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 2: (1 comment) Anyway, changing the logging messages is behind the scope of this change. This is the reason of my -1, sorry. https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 724 PS2, Line 724: sizeof(struct gsm48_service_request*) Oh, wow, it looks like your sizeof was copy-pasted from here. I think it should be fixed in a separate change, and changed to: sizeof(*req) or sizeof(struct gsm48_service_request) -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Thu, 10 Jan 2019 12:10:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:15:52 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 10 Jan 2019 12:15:52 +0000 Subject: Change in osmo-asf4-dfu[master]: Add .gitignore file Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12517 Change subject: Add .gitignore file ...................................................................... Add .gitignore file Change-Id: I6d853bc48d904c2567edb2103d590259877bbf87 --- A .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/17/12517/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5761abc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.o -- To view, visit https://gerrit.osmocom.org/12517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6d853bc48d904c2567edb2103d590259877bbf87 Gerrit-Change-Number: 12517 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:16:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 12:16:53 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12471 ) Change subject: rx CM Service Req: reject double use sooner ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12471/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12471/2/src/libmsc/gsm_04_08.c at 738 PS2, Line 738: LOG_RAN_CONN This could be done either in the previous patch, or in a separate one. https://gerrit.osmocom.org/#/c/12471/2/src/libmsc/gsm_04_08.c at 739 PS2, Line 739: Any reason of mixing tabs with spaces if this is not aligned anyway? Personally, I would prefer to see a line break with a single tab here: LOG_RAN_CONN(conn, LOGL_ERROR, "Cannot accept CM Service Request, " "conn already busy establishing authenticity\n"); -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 12:16:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:17:07 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 10 Jan 2019 12:17:07 +0000 Subject: Change in osmo-asf4-dfu[master]: Add git-review config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12518 Change subject: Add git-review config ...................................................................... Add git-review config Change-Id: If28c2f4908f8df96b627fd42b7e122e559d9382a --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/18/12518/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..8f5d81d --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-asf4-dfu -- To view, visit https://gerrit.osmocom.org/12518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If28c2f4908f8df96b627fd42b7e122e559d9382a Gerrit-Change-Number: 12518 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 12:42:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 10 Jan 2019 12:42:44 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 7: Thanks for the review! > maybe drop the FIXME from vlr_lu_fsm.c:506? I am not what it means, therefore I am not sure if it can be dropped: > /* FIXME: IMEI Check Fail to VLR Application (Detach IMSI VLR) */ (According to the git log, that FIXME is from the big "add libvlr implementation" commit from you and Harald.) -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 10 Jan 2019 12:42:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:05:30 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 14:05:30 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 9: Code-Review-1 (12 comments) https://gerrit.osmocom.org/#/c/12402/9/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/12402/9/include/osmocom/msc/ran_conn.h at 183 PS9, Line 183: const uint8_t mi[] Cosmetic: let's use 'const uint8_t *mi'. https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c at 304 PS9, Line 304: gsm48_mi_type_name(mi_type), mi_string This could be also changed to osmo_mi_name(...). https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c at 752 PS9, Line 752: req->cm_service_type Looks like a mistake to me. The message says "mi_type ..." by you're refering CM Service type? I think it should be: ... "MI type %s is not expected\n", gsm48_mi_type_name(mi_type)... https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c at 696 PS9, Line 696: _ran_conn_update_id TBH, this looks unreadable. Why not to keep using a function? https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c at 719 PS9, Line 719: const uint8_t mi[] same here https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c at 719 PS9, Line 719: uint8_t and here https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 82 PS9, Line 82: vlr_subscr_name I couldn't resist and wrote an alternative version using the Pointer arithmetic. It looks good to me, but I guess only to me ;) If you like it, feel free to use: https://pastebin.com/jzaFwAeu https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 89 PS9, Line 89: present You could just init buf[0] as '\0', and then check like this: buf[0] ? ":" : "" https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 93 PS9, Line 93: snprintf What if this call would fail? https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 101 PS9, Line 101: tmsi, sizeof(buf) Printing to tmsi, but sizeof(buf)? https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 105 PS9, Line 105: snprintf(buf, sizeof(buf), Wouldn't this call overwrite the content of buffer? https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr_core.h File src/libvlr/vlr_core.h: https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr_core.h at 7 PS9, Line 7: const This could be done in a separate change... -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 10 Jan 2019 14:05:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:11:37 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 14:11:37 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/#/c/12402/9/tests/msc_vlr/msc_vlr_test_authen_reuse.err File tests/msc_vlr/msc_vlr_test_authen_reuse.err: https://gerrit.osmocom.org/#/c/12402/9/tests/msc_vlr/msc_vlr_test_authen_reuse.err at 11 PS9, Line 11: : I think it makes sense to separate the RAT type from the subscriber name in some different way, e.g. using ' ', '|' or '/'. Probably, printing it first would also be better, just to compare: DMM RAN_conn(GERAN-A-0:LU IMSI-901700000010650){RAN_CONN_S_NEW}: Updated ID DMM RAN_conn(GERAN-A-0:LU|IMSI-901700000010650){RAN_CONN_S_NEW}: Updated ID DMM RAN_conn(GERAN-A-0:LU/IMSI-901700000010650){RAN_CONN_S_NEW}: Updated ID -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 10 Jan 2019 14:11:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:13:46 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 14:13:46 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12403 ) Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... Patch Set 9: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12403/9/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12403/9/src/libmsc/msc_mgcp.c at 1029 PS9, Line 1029: ran_conn_get_conn_id Same here, what about printing it first? -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 14:13:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:20:06 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 14:20:06 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 10: (2 comments) https://gerrit.osmocom.org/#/c/12404/10/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12404/10/src/libmsc/gsm_04_08.c at 124 PS10, Line 124: char cm1[42]; You could avoid 'else' branches this way: char cm1[42] = "no-cm1"; char cm2[42] = " no-cm2"; char cm3[42] = " no-cm3"; https://gerrit.osmocom.org/#/c/12404/10/src/libmsc/gsm_04_08.c at 152 PS10, Line 152: snprintf Let's check the rc at least here, just to be sure that we aren't printing garbage... -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 14:20:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 14:21:05 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12405 ) Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 14:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 14:46:15 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 10 Jan 2019 14:46:15 +0000 Subject: Change in osmo-asf4-dfu[master]: Add .gitignore file In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12517 ) Change subject: Add .gitignore file ...................................................................... Patch Set 1: Code-Review-1 there already is https://gerrit.osmocom.org/#/c/osmo-asf4-dfu/+/12495/ in review -- To view, visit https://gerrit.osmocom.org/12517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d853bc48d904c2567edb2103d590259877bbf87 Gerrit-Change-Number: 12517 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 10 Jan 2019 14:46:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 16:27:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 10 Jan 2019 16:27:36 +0000 Subject: Change in osmo-msc[master]: transaction: drop unused ti_flag Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12519 Change subject: transaction: drop unused ti_flag ...................................................................... transaction: drop unused ti_flag The ti_flag parameter in trans_assign_trans_id() is undocumented and unused. It's unclear what was the initial intention for it so let's just drop it to avoid confusion. Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 5 files changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/12519/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 6e67f39..2826af7 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -110,7 +110,7 @@ void trans_free(struct gsm_trans *trans); int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, - uint8_t protocol, uint8_t ti_flag); + uint8_t protocol); struct gsm_trans *trans_has_conn(const struct ran_conn *conn); void trans_conn_closed(const struct ran_conn *conn); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index be9a451..b91fbc8 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -631,7 +631,7 @@ /* Get free transaction_id */ trans_id = trans_assign_trans_id(trans->net, trans->vsub, - GSM48_PDISC_CC, 0); + GSM48_PDISC_CC); if (trans_id < 0) { /* no free transaction ID */ rc = mncc_release_ind(trans->net, trans, trans->callref, diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 788a0a9..96eaa30 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1005,7 +1005,7 @@ LOGP(DLSMS, LOGL_INFO, "Going to send a MT SMS\n"); /* Generate a new transaction ID */ - tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS, 0); + tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS); if (tid == -1) { LOGP(DLSMS, LOGL_ERROR, "No available transaction IDs\n"); return NULL; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 3ee6e92..0461e79 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -308,7 +308,7 @@ /* Assign transaction ID */ tid = trans_assign_trans_id(trans->net, - trans->vsub, GSM48_PDISC_NC_SS, 0); + trans->vsub, GSM48_PDISC_NC_SS); if (tid < 0) { LOGP(DMM, LOGL_ERROR, "No free transaction ID\n"); /* TODO: inform HLR about this */ diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index f62d6b4..5b29a7a 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -176,22 +176,18 @@ } /*! allocate an unused transaction ID for the given subscriber - * in the given protocol using the ti_flag specified + * in the given protocol * \param[in] net GSM network * \param[in] subscr Subscriber for which to find ID * \param[in] protocol Protocol for whihc to find ID - * \param[in] ti_flag FIXME */ int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub, - uint8_t protocol, uint8_t ti_flag) + uint8_t protocol) { struct gsm_trans *trans; unsigned int used_tid_bitmask = 0; int i, j, h; - if (ti_flag) - ti_flag = 0x8; - /* generate bitmask of already-used TIDs for this (subscr,proto) */ llist_for_each_entry(trans, &net->trans_list, entry) { if (trans->vsub != vsub || @@ -203,10 +199,10 @@ /* find a new one, trying to go in a 'circular' pattern */ for (h = 6; h > 0; h--) - if (used_tid_bitmask & (1 << (h | ti_flag))) + if (used_tid_bitmask & (1 << h)) break; for (i = 0; i < 7; i++) { - j = ((h + i) % 7) | ti_flag; + j = (h + i) % 7; if ((used_tid_bitmask & (1 << j)) == 0) return j; } -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 16:45:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 10 Jan 2019 16:45:34 +0000 Subject: Change in osmo-msc[master]: Use explicit protocol discriminator for NC SS/USSD session Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12520 Change subject: Use explicit protocol discriminator for NC SS/USSD session ...................................................................... Use explicit protocol discriminator for NC SS/USSD session In gsm0911_rcv_nc_ss() we sometimes use pdisc parsed from msgb and sometimes constant. This function is only called when protocol discriminator is GSM48_PDISC_NC_SS so there's no point in parsing it again from msgb. Let's make it consistent and always use constant. Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 --- M src/libmsc/gsm_09_11.c 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/12520/1 diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 3ee6e92..12bec9d 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -60,11 +60,10 @@ struct msgb *gsup_msgb; uint16_t facility_ie_len; uint8_t *facility_ie; - uint8_t pdisc, tid; + uint8_t tid; uint8_t msg_type; int rc; - pdisc = gsm48_hdr_pdisc(gh); msg_type = gsm48_hdr_msg_type(gh); tid = gsm48_hdr_trans_id_flip_ti(gh); @@ -72,10 +71,10 @@ log_set_context(LOG_CTX_VLR_SUBSCR, conn->vsub); DEBUGP(DMM, "Received SS/USSD data (trans_id=%x, msg_type=%s)\n", - tid, gsm48_pdisc_msgtype_name(pdisc, msg_type)); + tid, gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type)); /* Reuse existing transaction, or create a new one */ - trans = trans_find_by_id(conn, pdisc, tid); + trans = trans_find_by_id(conn, GSM48_PDISC_NC_SS, tid); if (!trans) { /* Count MS-initiated attempts to establish a NC SS/USSD session */ rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS]); @@ -91,7 +90,7 @@ if (msg_type != GSM0480_MTYPE_REGISTER) { LOGP(DMM, LOGL_ERROR, "Unexpected message (msg_type=%s), " "transaction is not allocated yet\n", - gsm48_pdisc_msgtype_name(pdisc, msg_type)); + gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type)); gsm48_tx_simple(conn, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); @@ -100,7 +99,7 @@ DEBUGP(DMM, " -> (new transaction)\n"); trans = trans_alloc(conn->network, conn->vsub, - pdisc, tid, new_callref++); + GSM48_PDISC_NC_SS, tid, new_callref++); if (!trans) { DEBUGP(DMM, " -> No memory for trans\n"); gsm48_tx_simple(conn, -- To view, visit https://gerrit.osmocom.org/12520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 Gerrit-Change-Number: 12520 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 16:55:40 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 10 Jan 2019 16:55:40 +0000 Subject: Change in osmo-gsm-tester[master]: mobile: Switch from removed cli option to vty port In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12445 ) Change subject: mobile: Switch from removed cli option to vty port ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 Gerrit-Change-Number: 12445 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Thu, 10 Jan 2019 16:55:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 16:56:37 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 10 Jan 2019 16:56:37 +0000 Subject: Change in osmo-gsm-tester[master]: mobile: Switch from removed cli option to vty port In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12445 ) Change subject: mobile: Switch from removed cli option to vty port ...................................................................... mobile: Switch from removed cli option to vty port Bind the mobile's to a random (chosen by the kernel) VTY port. The CLI option was removed and I added a new VTY command to be able to specify the port in addition to the address. Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 --- M src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl M src/osmo_ms_driver/starter.py 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl index 395d6f4..0a2cd6d 100644 --- a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl @@ -1,3 +1,5 @@ +line vty + bind 127.0.0.1 0 no gps enable no hide-default ms ${test.ms_number} diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index bf7727f..dd3aac5 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -121,7 +121,7 @@ self.log("Starting mobile") # Let the kernel pick an unused port for the VTY. - args = [self._binary, "-c", mob_filename, "--vty-port=0"] + args = [self._binary, "-c", mob_filename] self._omob_proc = process.Process(self.name(), self._tmp_dir, args, env=self._env) if suite_run: -- To view, visit https://gerrit.osmocom.org/12445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 Gerrit-Change-Number: 12445 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 17:18:42 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 17:18:42 +0000 Subject: Change in osmo-msc[master]: Use explicit protocol discriminator for NC SS/USSD session In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12520 ) Change subject: Use explicit protocol discriminator for NC SS/USSD session ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 Gerrit-Change-Number: 12520 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 17:18:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 17:45:01 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 17:45:01 +0000 Subject: Change in osmo-msc[master]: transaction: drop unused ti_flag In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: transaction: drop unused ti_flag ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12519/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12519/1//COMMIT_MSG at 10 PS1, Line 10: It's unclear what was the initial intention for it AFAIR, ti_flag is used to indicate the origin of a transaction: - '0'B means that a given message comes *from* the side that originates the transaction, - '1'B means that a given message comes *to* the side that originates the transaction. I am not sure if we should drop it just because the callers always pass '0'B. https://gerrit.osmocom.org/#/c/12519/1//COMMIT_MSG at 10 PS1, Line 10: unused Actually, it's used, but '0'B is always passed. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 17:45:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 17:45:38 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 17:45:38 +0000 Subject: Change in osmo-msc[master]: Use explicit protocol discriminator for NC SS/USSD session In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12520 ) Change subject: Use explicit protocol discriminator for NC SS/USSD session ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 Gerrit-Change-Number: 12520 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 10 Jan 2019 17:45:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 19:46:48 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 10 Jan 2019 19:46:48 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12441 ) Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 10 Jan 2019 19:46:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 22:39:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 Jan 2019 22:39:31 +0000 Subject: Change in libosmocore[master]: change GSM48_CMSERV_* to enum type, add names Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12521 Change subject: change GSM48_CMSERV_* to enum type, add names ...................................................................... change GSM48_CMSERV_* to enum type, add names Prepare handling multiple CM Service Requests in osmo-msc: an enum is more clear than an int and #defines for passing around and count CM Service types. Change-Id: I9c2a7adc45ab7a1a7519168e965e7d805e1481ff --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/12521/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 791fbd4..86b5f6f 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1631,13 +1631,20 @@ /* FIXME: Table 10.4 / 10.4a (GPRS) */ /* Section 10.5.3.3 CM service type */ -#define GSM48_CMSERV_MO_CALL_PACKET 1 -#define GSM48_CMSERV_EMERGENCY 2 -#define GSM48_CMSERV_SMS 4 -#define GSM48_CMSERV_SUP_SERV 8 -#define GSM48_CMSERV_VGCS 9 -#define GSM48_CMSERV_VBS 10 -#define GSM48_CMSERV_LOC_SERV 11 +enum osmo_cm_service_type { + GSM48_CMSERV_MO_CALL_PACKET = 1, + GSM48_CMSERV_EMERGENCY = 2, + GSM48_CMSERV_SMS = 4, + GSM48_CMSERV_SUP_SERV = 8, + GSM48_CMSERV_VGCS = 9, + GSM48_CMSERV_VBS = 10, + GSM48_CMSERV_LOC_SERV = 11, + GSM48_CMSERV_MAX_VAL = GSM48_CMSERV_LOC_SERV +}; + +extern const struct value_string osmo_cm_service_type_names[]; +static inline const char *osmo_cm_service_type_name(enum osmo_cm_service_type val) +{ return get_value_string(osmo_cm_service_type_names, val); } /* Section 10.5.2.26, Table 10.5.64 */ #define GSM48_PM_MASK 0x03 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 099b85d..795e98b 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1145,4 +1145,15 @@ {} }; +const struct value_string osmo_cm_service_type_names[] = { + { GSM48_CMSERV_MO_CALL_PACKET, "MO-Call" }, + { GSM48_CMSERV_EMERGENCY, "Emergency-Call" }, + { GSM48_CMSERV_SMS, "Short-Messaging-Service" }, + { GSM48_CMSERV_SUP_SERV, "Supplementary-Service" }, + { GSM48_CMSERV_VGCS, "Voice-Group-Call" }, + { GSM48_CMSERV_VBS, "Voice-Broadcast-Call" }, + { GSM48_CMSERV_LOC_SERV, "Location-Service" }, + {} +}; + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index cdcbcc9..6f88ebe 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -556,6 +556,7 @@ osmo_rat_type_names; osmo_lu_type_names; +osmo_cm_service_type_names; local: *; }; -- To view, visit https://gerrit.osmocom.org/12521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9c2a7adc45ab7a1a7519168e965e7d805e1481ff Gerrit-Change-Number: 12521 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 23:32:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 Jan 2019 23:32:04 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 9: (10 comments) https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c at 304 PS9, Line 304: gsm48_mi_type_name(mi_type), mi_string > This could be also changed to osmo_mi_name(...). ok. I didn't want to refactor all the logging though :P Putting it in a separate patch. https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/gsm_04_08.c at 752 PS9, Line 752: req->cm_service_type > Looks like a mistake to me. The message says "mi_type ... [?] that's right. I already fixed it later on my branch, didn't realize I actually introduced the mistake here. Thanks! https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/12402/9/src/libmsc/ran_conn.c at 696 PS9, Line 696: _ran_conn_update_id > TBH, this looks unreadable. [?] because of the string fmt args. I'd have to introduce yet another va_args thing like osmo_fsm_inst_update_id_f(). I mean, it's possible. But then I'd also need another char buffer of limited size, or another talloc string as well, and all that jazz. So I went for ## ARGS instead. Oh wait, looking at it now, I guess the FMT passed from all callers ends up just being '%s' now, so there is indeed a simpler way to implement it. (there were more complex intermediate patch states) Thanks! https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 82 PS9, Line 82: vlr_subscr_name > I couldn't resist and wrote an alternative version using the Pointer arithmetic. [?] I've done exactly that before, but I wanted to have simpler code this time. See used_ref_counts_str(), the APPEND_STR macro. Or see gsm0808_utils.c, the APPEND_THING, APPEND_STR and APPEND_CELL_ID_U macros. Maybe we can glorify such a macro to the OSMO_* namespace? But it's not so trivial to make it universally useful. If there is a limited fixed amount of elements, I prefer the fixed string buffers approach, because it is trivially obvious that it doesn't contain mistakes. As you can see below... oh wait... https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 89 PS9, Line 89: present > You could just init buf[0] as '\0', and then check like this: [?] no, buf only gets composed right at the end. https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 93 PS9, Line 93: snprintf > What if this call would fail? then imsi would be empty, right? But how can it possibly fail. There is enough space. The string fmt is trivial. The input is a plain ASCII string, even only ['0'-'9'] chars. https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 101 PS9, Line 101: tmsi, sizeof(buf) > Printing to tmsi, but sizeof(buf)? oh shit! https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr.c at 105 PS9, Line 105: snprintf(buf, sizeof(buf), > Wouldn't this call overwrite the content of buffer? actually it writes to buf[], and later buf[] gets overwritten from scratch, so TMSInew is always lost. oh so *that's* why I'm not seeing TMSInew in any logging! :D thanks man https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr_core.h File src/libvlr/vlr_core.h: https://gerrit.osmocom.org/#/c/12402/9/src/libvlr/vlr_core.h at 7 PS9, Line 7: const > This could be done in a separate change... someone else actually already did. https://gerrit.osmocom.org/#/c/12402/9/tests/msc_vlr/msc_vlr_test_authen_reuse.err File tests/msc_vlr/msc_vlr_test_authen_reuse.err: https://gerrit.osmocom.org/#/c/12402/9/tests/msc_vlr/msc_vlr_test_authen_reuse.err at 11 PS9, Line 11: : > I think it makes sense to separate the RAT type from the subscriber name in some different way, e.g. [?] Limitation here is that the FSM instance ID must be a valid identifier as osmo_identifier_valid(). One reason is that the FSM instances are browsable from the CTRL interface. An earlier patch version had this: GERAN-A-0_IMSI-123456_LU First off, we get the RAN conn (GERAN-A-0), then obtain the mobile identity and note down the L3 complete type. My first change was to put the L3 type next to the conn. GERAN-A-0_LU_IMSI-123456 But semantically, a subscriber may contact us several times with (of course) the same IMSI. So I prefer to put the subscriber identification at the start. What connection ID is in use and its L3 complete type follows: IMSI-123456_MSISDN-1234_GERAN-A-0_LU IMSI-123456_MSISDN-1234_GERAN-A-1_CM_SERVICE_REQ IMSI-123456_MSISDN-1234_UTRAN-Iu-5_LU That seems to be more logical to me to follow subscriber context in a log. Next up, I didn't like the '-' and '_' mix, it is hard to figure out visually which of them is the separator. Neither space nor ',|/' are permitted characters for osmo_identifier_valid(). We already use ':' as separator elsewhere. A drawback of ':' is that it conflicts with stats exporting where ':' is not permitted, but IIUC we have solved this problem generically, already. That's how I reached this ordering of identifiers. I think it makes a lot of sense. If you have good reasons or strong opinions I'm fine with changing it, it's a bikeshed after all. -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 10 Jan 2019 23:32:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 23:55:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 Jan 2019 23:55:52 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello dexter, Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#10). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/iu_dummy.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 18 files changed, 11,782 insertions(+), 11,434 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/10 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 10 23:55:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 Jan 2019 23:55:53 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12522 Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... mm_rx_id_resp(): use osmo_mi_name() Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 --- M src/libmsc/gsm_04_08.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/12522/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 8b225b2..7f6da3e 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -290,8 +290,8 @@ static int mm_rx_id_resp(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); - uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; - char mi_string[GSM48_MI_SIZE]; + uint8_t *mi = gh->data+1; + uint8_t mi_len = gh->data[0]; if (!conn->vsub) { LOGP(DMM, LOGL_ERROR, @@ -299,13 +299,11 @@ return -EINVAL; } - gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); - DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n", - gsm48_mi_type_name(mi_type), mi_string); + DEBUGP(DMM, "IDENTITY RESPONSE: MI=%s\n", osmo_mi_name(mi, mi_len)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data); - return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]); + return vlr_subscr_rx_id_resp(conn->vsub, mi, mi_len); } /* Chapter 9.2.15: Receive Location Updating Request. -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 00:41:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 00:41:48 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12470 to look at the new patch set (#4). Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... add LOG_RAN_CONN() to use the conn->fi->id for context For each conn, set a default logging category, to distinguish categories for BSSMAP and RANAP based conns. LOG_RAN_CONN(): log with the conn's default category, LOG_RAN_CONN_CAT(): log with a manually set category (mostly for keeping previous DMM logging on the same category). In some places, replace LOGP() using manual context with LOG_RAN_CONN(), and remove the manual context info, now provided by the conn->fi->id. This is loosely related to inter-BSC and inter-MSC handover: to speed up refactoring, I want to avoid the need for manual logging context and just use this LOG_RAN_CONN(). Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 19 files changed, 297 insertions(+), 262 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12470/4 -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 00:41:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 00:41:48 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello dexter, Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#11). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/iu_dummy.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 18 files changed, 11,763 insertions(+), 11,406 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/11 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 00:41:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 00:41:50 +0000 Subject: Change in osmo-msc[master]: use osmo_lu_type_name() from libosmocore Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12523 Change subject: use osmo_lu_type_name() from libosmocore ...................................................................... use osmo_lu_type_name() from libosmocore Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err 10 files changed, 63 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/12523/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7ff8681..41797cd 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -308,14 +308,6 @@ return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]); } -/* FIXME: to libosmogsm */ -static const struct value_string lupd_names[] = { - { GSM48_LUPD_NORMAL, "NORMAL" }, - { GSM48_LUPD_PERIODIC, "PERIODIC" }, - { GSM48_LUPD_IMSI_ATT, "IMSI ATTACH" }, - { 0, NULL } -}; - /* Chapter 9.2.15: Receive Location Updating Request. * Keep this function non-static for direct invocation by unit tests. */ int mm_rx_loc_upd_req(struct ran_conn *conn, struct msgb *msg) @@ -342,7 +334,7 @@ LOGP(DMM, LOGL_ERROR, "Cannot accept another LU, conn already busy establishing authenticity;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); return -EINVAL; } @@ -350,15 +342,14 @@ LOGP(DMM, LOGL_ERROR, "Cannot accept another LU, conn already established;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); return -EINVAL; } ran_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, - get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index e834e91..e50df6d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -452,7 +452,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -897,7 +897,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) @@ -1096,7 +1096,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1325,7 +1325,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2011,7 +2011,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 69ad9a2..32d9f6b 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -504,7 +504,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1036,7 +1036,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1269,7 +1269,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1491,7 +1491,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2220,7 +2220,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2712,7 +2712,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 1a3d67c..cb7d026 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -89,7 +89,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -171,7 +171,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -320,7 +320,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -468,7 +468,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -617,7 +617,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -697,7 +697,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -847,7 +847,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -925,7 +925,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1004,7 +1004,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1086,7 +1086,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 7e49d01..03718e5 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -10,7 +10,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -98,7 +98,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 8e99883..76004cd 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -10,7 +10,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -118,7 +118,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -356,7 +356,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -556,7 +556,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f865d87..1d7da68 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -324,7 +324,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -641,7 +641,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) @@ -823,7 +823,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1004,7 +1004,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1211,7 +1211,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1378,7 +1378,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1577,7 +1577,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1739,7 +1739,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1939,7 +1939,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2167,7 +2167,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 76431fb..0963d66 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -45,7 +45,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -160,7 +160,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -194,7 +194,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED @@ -282,7 +282,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -411,7 +411,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -535,7 +535,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -669,7 +669,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x8: cm_service) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -724,7 +724,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -916,7 +916,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1096,7 +1096,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1252,7 +1252,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x20: trans_sms) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -1315,7 +1315,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1554,7 +1554,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 1b33b2d..ff52aa3 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -101,7 +101,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -216,7 +216,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -362,7 +362,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:591536962) diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 5dcdbbe..7454b50 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -205,7 +205,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) -- To view, visit https://gerrit.osmocom.org/12523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 Gerrit-Change-Number: 12523 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 01:10:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 01:10:49 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12470/2/src/libmsc/gsm_04_08.c at 343 PS2, Line 343: "C > (one of the reasons why this space-alignment sucks) [?] yeah, my opinion used to be "align with opening brace" for a long time. My opinion is changing now. Haven't gathered the guts yet to switch my vim rules to "always indent with a single tab"... your feedback is actually tipping the balance as we speak. Hmm, can't seem to find the cinoptions item that allows to do this. All I can find is constant indenting after line breaks directly after the opening brace, which I never use: cino=(0 cino=(0,W4 a_long_line( a_long_line( argument, argument, argument); argument); a_short_line(argument, a_short_line(argument, argument); argument); I'll switch to single-tab as soon as I find a vim cinoptions rule that does this: a_short_line(argument, argument); -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 01:10:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 01:21:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 01:21:08 +0000 Subject: Change in osmo-msc[master]: use osmo_lu_type_name() from libosmocore In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12523 ) Change subject: use osmo_lu_type_name() from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 Gerrit-Change-Number: 12523 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 01:21:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 09:16:23 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 09:16:23 +0000 Subject: Change in osmo-msc[master]: Use explicit protocol discriminator for NC SS/USSD session In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12520 ) Change subject: Use explicit protocol discriminator for NC SS/USSD session ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 Gerrit-Change-Number: 12520 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 09:16:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 09:34:02 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 09:34:02 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Vadim Yanitskiy, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#8). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 914 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/8 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 09:35:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 09:35:26 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 7: (1 comment) Updated, ready for another review. https://gerrit.osmocom.org/#/c/12478/6/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/6/src/libvlr/vlr.c at 1017 PS6, Line 1017: osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_LU_COMPL_FAILURE, (void *)&gsup->cause); > (a cast to void* is never needed) It is necessary here, because &gsup->cause is a const, and osmo_fsm_inst_dispatch() expects userdata here, with the type void* (without const). So GCC complains when removing the (void *). -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 09:35:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 09:47:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 11 Jan 2019 09:47:21 +0000 Subject: Change in osmo-msc[master]: Use explicit protocol discriminator for NC SS/USSD session In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12520 ) Change subject: Use explicit protocol discriminator for NC SS/USSD session ...................................................................... Use explicit protocol discriminator for NC SS/USSD session In gsm0911_rcv_nc_ss() we sometimes use pdisc parsed from msgb and sometimes constant. This function is only called when protocol discriminator is GSM48_PDISC_NC_SS so there's no point in parsing it again from msgb. Let's make it consistent and always use constant. Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 --- M src/libmsc/gsm_09_11.c 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 3ee6e92..12bec9d 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -60,11 +60,10 @@ struct msgb *gsup_msgb; uint16_t facility_ie_len; uint8_t *facility_ie; - uint8_t pdisc, tid; + uint8_t tid; uint8_t msg_type; int rc; - pdisc = gsm48_hdr_pdisc(gh); msg_type = gsm48_hdr_msg_type(gh); tid = gsm48_hdr_trans_id_flip_ti(gh); @@ -72,10 +71,10 @@ log_set_context(LOG_CTX_VLR_SUBSCR, conn->vsub); DEBUGP(DMM, "Received SS/USSD data (trans_id=%x, msg_type=%s)\n", - tid, gsm48_pdisc_msgtype_name(pdisc, msg_type)); + tid, gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type)); /* Reuse existing transaction, or create a new one */ - trans = trans_find_by_id(conn, pdisc, tid); + trans = trans_find_by_id(conn, GSM48_PDISC_NC_SS, tid); if (!trans) { /* Count MS-initiated attempts to establish a NC SS/USSD session */ rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS]); @@ -91,7 +90,7 @@ if (msg_type != GSM0480_MTYPE_REGISTER) { LOGP(DMM, LOGL_ERROR, "Unexpected message (msg_type=%s), " "transaction is not allocated yet\n", - gsm48_pdisc_msgtype_name(pdisc, msg_type)); + gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type)); gsm48_tx_simple(conn, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); @@ -100,7 +99,7 @@ DEBUGP(DMM, " -> (new transaction)\n"); trans = trans_alloc(conn->network, conn->vsub, - pdisc, tid, new_callref++); + GSM48_PDISC_NC_SS, tid, new_callref++); if (!trans) { DEBUGP(DMM, " -> No memory for trans\n"); gsm48_tx_simple(conn, -- To view, visit https://gerrit.osmocom.org/12520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 Gerrit-Change-Number: 12520 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 12:38:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 12:38:42 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12524 Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... gsm23003: add osmo_imei_str_valid() To be used by OsmoHLR to check IMEIs before writing them to the DB. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map 3 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/1 diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 2f380ae..d21c8d5 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -93,6 +93,7 @@ bool osmo_imsi_str_valid(const char *imsi); bool osmo_msisdn_str_valid(const char *msisdn); +bool osmo_imei_str_valid(const char *imei); const char *osmo_mcc_name(uint16_t mcc); const char *osmo_mnc_name(uint16_t mnc, bool mnc_3_digits); diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 4fdad48..74d0de2 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -71,6 +71,18 @@ return is_n_digits(msisdn, 1, 15); } +/*! Determine whether the given IMEI is valid according to 3GPP TS 23.003, + * Section 6.2.1. It consists of 14 digits, the 15th check digit is not + * intended for digital transmission. + * \param imei IMEI digits in ASCII string representation. + * \returns true when the IMEI is valid, false for invalid characters or number + * of digits. + */ +bool osmo_imei_str_valid(const char *imei) +{ + return is_n_digits(imei, 14, 14); +} + /*! Return MCC string as standardized 3-digit with leading zeros. * \param[in] mcc MCC value. * \returns string in static buffer. diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index cdcbcc9..dbac69b 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -534,6 +534,7 @@ osmo_imsi_str_valid; osmo_msisdn_str_valid; +osmo_imei_str_valid; osmo_mncc_stringify; osmo_mncc_names; -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:02:09 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 13:02:09 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c at 75 PS1, Line 75: the 15th check digit is not : * intended for digital transmission. Could you please explain this? I think this function should also verify this digit according: https://en.wikipedia.org/wiki/International_Mobile_Equipment_Identity#Check_digit_computation -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 13:02:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:11:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 13:11:53 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c at 75 PS1, Line 75: the 15th check digit is not : * intended for digital transmission. Sure. From the mentioned spec: > The IMEI (14 digits) is complemented by a Check Digit (CD). The Check Digit is not part of the digits transmitted when the IMEI is checked, as described below. The Check Digit is intended to avoid manual transmission errors, e.g. when customers register stolen MEs at the operator's customer care desk. The Check Digit is defined according to the Luhn formula, as defined in annex B In OsmoMSC, we store the IMEI with 14 digits, and it will also get sent with 14 digits from the MSC to the HLR (https://gerrit.osmocom.org/#/c/osmo-msc/+/12478/). Then the HLR will save the 14 digit version in the HLR DB (OS#2541). -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 13:11:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:19:09 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 13:19:09 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c at 75 PS1, Line 75: the 15th check digit is not : * intended for digital transmission. > Sure. From the mentioned spec: [?] Ok, got it! Anyway, I think we can make this function a bit more flexible by checking the length. If strlen(imei) is 14, then just do is_n_digits(imei, ...), but if the 15th check digit is present, we could also do the verification... What do you think? -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 13:19:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:26:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 13:26:58 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/1/src/gsm/gsm23003.c at 75 PS1, Line 75: the 15th check digit is not : * intended for digital transmission. > Ok, got it! [?] I think that we want to be sure if we are dealing with the 14 digits variant, or the 15 digits variant. So if we make it possible to verify the check digit too, I would add a parameter to the function. Something like that: osmo_imei_str_valid(const char *imei, bool check_digit); Would you prefer if I implement it that way? -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 13:26:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:45:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 13:45:32 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c at 1016 PS8, Line 1016: (void *)&gsup->cause); What is the meaning of cause in successful case? https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c at 1018 PS8, Line 1018: (void *)&gsup->cause); Same here, isn't it only being sent when msgt == OSMO_GSUP_MSGT_CHECK_IMEI_ERROR? -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 13:45:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 13:55:52 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 13:55:52 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c at 1006 PS8, Line 1006: const You're losing 'const' when calling osmo_fsm_inst_dispatch(), so maybe just drop it to avoid explicit (void *) cast? This is just an idea, up to you. -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 13:55:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:03:09 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 14:03:09 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c at 1234 PS8, Line 1234: vlr_subscr_tx_req_check_imei Should we still do this if check-imei-req is disabled in the VTY config? https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c at 1242 PS8, Line 1242: NULL Wait, vlr_subscr_handle_check_imei() is passing the cause here, but we don't use it? -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 14:03:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:06:58 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 14:06:58 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12522 ) Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Fine excluding some cosmetic comments. https://gerrit.osmocom.org/#/c/12522/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12522/2/src/libmsc/gsm_04_08.c at 293 PS2, Line 293: data+1 Please use spaces, i.e. '... data + 1'. https://gerrit.osmocom.org/#/c/12522/2/src/libmsc/gsm_04_08.c at 294 PS2, Line 294: mi_len Placing this variable before the *mi would make the code a bit more readable. While reading 'gh->data+1' I was wondering why do you skip one byte... -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 14:06:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:10:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 14:10:27 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c at 1016 PS8, Line 1016: (void *)&gsup->cause); > What is the meaning of cause in successful case? Oh, I realize now that I had copied the (void *)&gsup->cause argument from vlr_subscr_handle_lu_err() above, without thinking too much about it. You are right, on ACK and NACK the gsup->cause is not set. And even where it is set at ERROR below, we already log it. So there is not really a point in sending the gsup->cause as userdata along with osmo_fsm_inst_dispatch. The function that gets called from the dispatch, lu_compl_vlr_wait_imei() in vlr_lu_fsm.c, ignores the data argument anyway. I'll just remove the argument. Good catch, thanks! https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr.c at 1018 PS8, Line 1018: (void *)&gsup->cause); > Same here, isn't it only being sent when msgt == OSMO_GSUP_MSGT_CHECK_IMEI_ERROR? (see above) -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 14:10:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:13:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 14:13:19 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c at 1234 PS8, Line 1234: vlr_subscr_tx_req_check_imei > Should we still do this if check-imei-req is disabled in the VTY config? When check-imei-req is disabled, the MSC/VLR will not even ask the MS to send the IMEI. The VLR_ULA_E_ID_IMEI event won't come in then, so we won't reach this code line. https://gerrit.osmocom.org/#/c/12478/8/src/libvlr/vlr_lu_fsm.c at 1242 PS8, Line 1242: NULL > Wait, vlr_subscr_handle_check_imei() is passing the cause here, but we don't use it? Yeah, I've just realized this as well (see my other answer above) :) -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 14:13:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:16:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 14:16:57 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#9). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 914 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/9 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 14:23:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 14:23:22 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 14:23:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 11 15:10:07 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 11 Jan 2019 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#367?= Message-ID: <1540500245.517.1547219407359.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.17 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:34:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:34:13 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12525 Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_id() and db_subscr_get_by_imei(). The new functions are used in db_test. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. A follow-up commit will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 212 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/1 diff --git a/sql/hlr.sql b/sql/hlr.sql index 9ff9867..10838f2 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -5,8 +5,10 @@ imsi VARCHAR(15) UNIQUE NOT NULL, -- Chapter 2.1.2 msisdn VARCHAR(15) UNIQUE, - -- Chapter 2.2.3: Most recent / current IMEI + -- Chapter 2.2.3: Most recent / current IMEISV imeisv VARCHAR, + -- Chapter 2.1.9: Most recent / current IMEI + imei VARCHAR(14), -- Chapter 2.4.5 vlr_number VARCHAR(15), -- Chapter 2.4.6 @@ -74,4 +76,4 @@ -- 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 = 1; +PRAGMA user_version = 2; diff --git a/src/db.c b/src/db.c index f7cbace..7e8ad69 100644 --- a/src/db.c +++ b/src/db.c @@ -28,12 +28,13 @@ #include "db_bootstrap.h" /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ -#define CURRENT_SCHEMA_VERSION 1 +#define CURRENT_SCHEMA_VERSION 2 #define SEL_COLUMNS \ "id," \ "imsi," \ "msisdn," \ + "imei," \ "vlr_number," \ "sgsn_number," \ "sgsn_address," \ @@ -50,8 +51,10 @@ [DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?", [DB_STMT_SEL_BY_MSISDN] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE msisdn = ?", [DB_STMT_SEL_BY_ID] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE id = ?", + [DB_STMT_SEL_BY_IMEI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imei = ?", [DB_STMT_UPD_VLR_BY_ID] = "UPDATE subscriber SET vlr_number = $number WHERE id = $subscriber_id", [DB_STMT_UPD_SGSN_BY_ID] = "UPDATE subscriber SET sgsn_number = $number WHERE id = $subscriber_id", + [DB_STMT_UPD_IMEI_BY_ID] = "UPDATE subscriber SET imei = $imei WHERE id = $subscriber_id", [DB_STMT_AUC_BY_IMSI] = "SELECT id, algo_id_2g, ki, algo_id_3g, k, op, opc, sqn, ind_bitlen" " FROM subscriber" @@ -290,6 +293,40 @@ return rc; } +static int db_upgrade_v2(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN imei VARCHAR(14) default NULL"; + const char *set_schema_version_sql = "PRAGMA user_version = 2"; + + rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql); + return rc; + } + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + sqlite3_finalize(stmt); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + return rc; + } + + rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql); + return rc; + } + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return rc; +} + static int db_get_user_version(struct db_context *dbc) { const char *user_version_sql = "PRAGMA user_version"; @@ -400,6 +437,15 @@ } version = 1; /* fall through */ + case 1: + rc = db_upgrade_v2(dbc); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 2: (rc=%d) %s\n", + rc, sqlite3_errmsg(dbc->db)); + goto out_free; + } + version = 2; + /* fall through */ /* case N: ... */ default: break; diff --git a/src/db.h b/src/db.h index ae592fb..fddda4f 100644 --- a/src/db.h +++ b/src/db.h @@ -9,8 +9,10 @@ DB_STMT_SEL_BY_IMSI, DB_STMT_SEL_BY_MSISDN, DB_STMT_SEL_BY_ID, + DB_STMT_SEL_BY_IMEI, DB_STMT_UPD_VLR_BY_ID, DB_STMT_UPD_SGSN_BY_ID, + DB_STMT_UPD_IMEI_BY_ID, DB_STMT_AUC_BY_IMSI, DB_STMT_AUC_UPD_SQN, DB_STMT_UPD_PURGE_CS_BY_IMSI, @@ -71,6 +73,7 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; char msisdn[GT_MAX_DIGITS+1]; /* imeisv? */ + char imei[32]; char vlr_number[32]; char sgsn_number[32]; char sgsn_address[GT_MAX_DIGITS+1]; @@ -122,6 +125,7 @@ const char *msisdn); int db_subscr_update_aud_by_id(struct db_context *dbc, int64_t subscr_id, const struct sub_auth_data_str *aud); +int db_subscr_update_imei_by_id(struct db_context *dbc, int64_t subscr_id, const char *imei); int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi, struct hlr_subscriber *subscr); @@ -129,10 +133,10 @@ struct hlr_subscriber *subscr); int db_subscr_get_by_id(struct db_context *dbc, int64_t id, struct hlr_subscriber *subscr); +int db_subscr_get_by_imei(struct db_context *dbc, const char *imei, struct hlr_subscriber *subscr); int db_subscr_nam(struct db_context *dbc, const char *imsi, bool nam_val, bool is_ps); int db_subscr_lu(struct db_context *dbc, int64_t subscr_id, const char *vlr_or_sgsn_number, bool is_ps); - int db_subscr_purge(struct db_context *dbc, const char *by_imsi, bool purge_val, bool is_ps); diff --git a/src/db_hlr.c b/src/db_hlr.c index c97cd82..1c24e19 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -386,6 +386,55 @@ return ret; } +/*! Set a subscriber's IMEI in the HLR database. + * \param[in,out] dbc database context. + * \param[in] subscr_id ID of the subscriber in the HLR db. + * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. + * \returns 0 on success, -ENOENT when the given subscriber does not exist, + * -EIO on database errors. + */ +int db_subscr_update_imei_by_id(struct db_context *dbc, int64_t subscr_id, const char *imei) +{ + int rc, ret = 0; + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_UPD_IMEI_BY_ID]; + + if (imei && !osmo_imei_str_valid(imei)) { + LOGP(DAUC, LOGL_ERROR, "Cannot update subscriber ID=%" PRId64 ": invalid IMEI: '%s'\n", subscr_id, + imei); + return -EINVAL; + } + + if (!db_bind_int64(stmt, "$subscriber_id", subscr_id)) + return -EIO; + if (imei && !db_bind_text(stmt, "$imei", imei)) + return -EIO; + + /* execute the statement */ + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber ID=%" PRId64 ": SQL Error: %s\n", subscr_id, + sqlite3_errmsg(dbc->db)); + ret = -EIO; + goto out; + } + + /* verify execution result */ + rc = sqlite3_changes(dbc->db); + if (!rc) { + LOGP(DAUC, LOGL_ERROR, "Cannot update IMEI for subscriber ID=%" PRId64 ": no such subscriber\n", + subscr_id); + ret = -ENOENT; + } else if (rc != 1) { + LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", + subscr_id, rc); + ret = -EIO; + } + +out: + db_remove_reset(stmt); + return ret; +} + /* Common code for db_subscr_get_by_*() functions. */ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscriber *subscr, const char **err) @@ -415,18 +464,19 @@ subscr->id = sqlite3_column_int64(stmt, 0); copy_sqlite3_text_to_buf(subscr->imsi, stmt, 1); copy_sqlite3_text_to_buf(subscr->msisdn, stmt, 2); + copy_sqlite3_text_to_buf(subscr->imei, stmt, 3); /* FIXME: These should all be BLOBs as they might contain NUL */ - copy_sqlite3_text_to_buf(subscr->vlr_number, stmt, 3); - copy_sqlite3_text_to_buf(subscr->sgsn_number, stmt, 4); - copy_sqlite3_text_to_buf(subscr->sgsn_address, stmt, 5); - subscr->periodic_lu_timer = sqlite3_column_int(stmt, 6); - subscr->periodic_rau_tau_timer = sqlite3_column_int(stmt, 7); - subscr->nam_cs = sqlite3_column_int(stmt, 8); - subscr->nam_ps = sqlite3_column_int(stmt, 9); - subscr->lmsi = sqlite3_column_int(stmt, 10); - subscr->ms_purged_cs = sqlite3_column_int(stmt, 11); - subscr->ms_purged_ps = sqlite3_column_int(stmt, 12); - last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 13); + copy_sqlite3_text_to_buf(subscr->vlr_number, stmt, 4); + copy_sqlite3_text_to_buf(subscr->sgsn_number, stmt, 5); + copy_sqlite3_text_to_buf(subscr->sgsn_address, stmt, 6); + subscr->periodic_lu_timer = sqlite3_column_int(stmt, 7); + subscr->periodic_rau_tau_timer = sqlite3_column_int(stmt, 8); + subscr->nam_cs = sqlite3_column_int(stmt, 9); + subscr->nam_ps = sqlite3_column_int(stmt, 10); + subscr->lmsi = sqlite3_column_int(stmt, 11); + subscr->ms_purged_cs = sqlite3_column_int(stmt, 12); + subscr->ms_purged_ps = sqlite3_column_int(stmt, 13); + last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 14); if (last_lu_seen_str && last_lu_seen_str[0] != '\0') { if (strptime(last_lu_seen_str, DB_LAST_LU_SEEN_FMT, &tm) == NULL) { LOGP(DAUC, LOGL_ERROR, "Cannot parse last LU timestamp '%s' of subscriber with IMSI='%s': %s\n", @@ -530,6 +580,28 @@ return rc; } +/*! Retrieve subscriber data from the HLR database. + * \param[in,out] dbc database context. + * \param[in] imei ASCII string of identifier digits + * \param[out] subscr place retrieved data in this struct. + * \returns 0 on success, -ENOENT if no such subscriber was found, -EIO on + * database error. + */ +int db_subscr_get_by_imei(struct db_context *dbc, const char *imei, struct hlr_subscriber *subscr) +{ + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SEL_BY_IMEI]; + const char *err; + int rc; + + if (!db_bind_text(stmt, NULL, imei)) + return -EIO; + + rc = db_sel(dbc, stmt, subscr, &err); + if (rc) + LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: IMEI=%s: %s\n", imei, err); + return rc; +} + /*! You should use hlr_subscr_nam() instead; enable or disable PS or CS for a * subscriber without notifying GSUP clients. * \param[in,out] dbc database context. diff --git a/tests/db/db_test.c b/tests/db/db_test.c index c4ed6ed..cbc1a7d 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -148,6 +148,7 @@ Pd(id); Ps(imsi); Ps(msisdn); + Ps(imei); Ps(vlr_number); Ps(sgsn_number); Ps(sgsn_address); @@ -296,6 +297,15 @@ ASSERT_RC(db_subscr_update_msisdn_by_imsi(dbc, "foobar", "99"), -ENOENT); ASSERT_SEL(msisdn, "99", -ENOENT); + comment("Set valid / invalid IMEI"); + + ASSERT_RC(db_subscr_update_imei_by_id(dbc, id0, "12345678901234"), 0); + ASSERT_SEL(imei, "12345678901234", 0); + + ASSERT_RC(db_subscr_update_imei_by_id(dbc, id0, "123456789012345"), -EINVAL); /* too long */ + ASSERT_SEL(imei, "12345678901234", 0); + ASSERT_SEL(imei, "123456789012345", -ENOENT); + comment("Set / unset nam_cs and nam_ps"); /* nam_val, is_ps */ diff --git a/tests/db/db_test.err b/tests/db/db_test.err index 1d34045..2b8398f 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -227,6 +227,33 @@ DAUC Cannot read subscriber from db: MSISDN='99': No such subscriber +--- Set valid / invalid IMEI + +db_subscr_update_imei_by_id(dbc, id0, "12345678901234") --> 0 + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> 0 +struct hlr_subscriber { + .id = 1, + .imsi = '123456789000000', + .msisdn = '543210123456789', + .imei = '12345678901234', +} + +db_subscr_update_imei_by_id(dbc, id0, "123456789012345") --> -EINVAL +DAUC Cannot update subscriber ID=1: invalid IMEI: '123456789012345' + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> 0 +struct hlr_subscriber { + .id = 1, + .imsi = '123456789000000', + .msisdn = '543210123456789', + .imei = '12345678901234', +} + +db_subscr_get_by_imei(dbc, "123456789012345", &g_subscr) --> -ENOENT +DAUC Cannot read subscriber from db: IMEI=123456789012345: No such subscriber + + --- Set / unset nam_cs and nam_ps db_subscr_nam(dbc, imsi0, false, true) --> 0 @@ -236,6 +263,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_ps = false, } @@ -246,6 +274,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_cs = false, .nam_ps = false, } @@ -257,6 +286,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_ps = false, } @@ -267,6 +297,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } @@ -279,6 +310,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_ps = false, } @@ -289,6 +321,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_ps = false, } @@ -299,6 +332,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_cs = false, .nam_ps = false, } @@ -310,6 +344,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_cs = false, .nam_ps = false, } @@ -321,6 +356,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_cs = false, } @@ -331,6 +367,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .nam_cs = false, } @@ -341,6 +378,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_nam(dbc, imsi0, true, false) --> 0 @@ -350,6 +388,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } @@ -380,6 +419,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .sgsn_number = '5952', } @@ -390,6 +430,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '712', .sgsn_number = '5952', } @@ -404,6 +445,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '712', .sgsn_number = '111', } @@ -415,6 +457,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '712', .sgsn_number = '111', } @@ -426,6 +469,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '222', .sgsn_number = '111', } @@ -437,6 +481,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '222', .sgsn_number = '111', } @@ -451,6 +496,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '222', } @@ -461,6 +507,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_lu(dbc, id0, "111", true) --> 0 @@ -472,6 +519,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '222', .sgsn_number = '111', } @@ -483,6 +531,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .vlr_number = '222', } @@ -493,6 +542,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } @@ -517,6 +567,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_ps = true, } @@ -527,6 +578,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_cs = true, .ms_purged_ps = true, } @@ -538,6 +590,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_ps = true, } @@ -548,6 +601,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } @@ -560,6 +614,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_ps = true, } @@ -570,6 +625,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_ps = true, } @@ -580,6 +636,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_purge(dbc, imsi0, false, true) --> 0 @@ -589,6 +646,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_purge(dbc, imsi0, true, false) --> 0 @@ -598,6 +656,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_cs = true, } @@ -608,6 +667,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', .ms_purged_cs = true, } @@ -618,6 +678,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_purge(dbc, imsi0, false, false) --> 0 @@ -627,6 +688,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } @@ -661,6 +723,7 @@ .id = 1, .imsi = '123456789000000', .msisdn = '543210123456789', + .imei = '12345678901234', } db_subscr_delete_by_id(dbc, id0) --> 0 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:34:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:34:14 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12526 Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c 3 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/1 diff --git a/src/hlr.c b/src/hlr.c index ce5618a..b3e2fa8 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -258,6 +258,22 @@ } } +static void update_imei(const char *imsi, const char *imei) +{ + struct hlr_subscriber subscr; + + /* Check if subscriber is known */ + if (db_subscr_get_by_imsi(g_hlr->dbc, imsi, &subscr) < 0) { + LOGP(DAUC, LOGL_ERROR, "Cannot set IMEI '%s' for unknown IMSI '%s'\n", imei, imsi); + return; + } + + LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing IMEI = %s\n", imsi, imei); + + if (db_subscr_update_imei_by_id(g_hlr->dbc, subscr.id, imei)) + LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update IMEI in the database\n", imsi); +} + /*! Receive Update Location Request, creates new \ref lu_operation */ static int rx_upd_loc_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup) @@ -420,8 +436,11 @@ return -1; } - /* Only print the IMEI for now, it's planned to store it here (OS#2541) */ - LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s\n", gsup->imsi, imei); + /* Save in DB if desired */ + if (g_hlr->store_imei) + update_imei(gsup->imsi, imei); + else + LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s (consider setting 'store-imei 1')\n", gsup->imsi, imei); /* Accept all IMEIs */ gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK; diff --git a/src/hlr.h b/src/hlr.h index e9cc747..00fa43c 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -51,6 +51,8 @@ struct llist_head ussd_routes; struct llist_head ss_sessions; + + bool store_imei; }; extern struct hlr *g_hlr; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 6706aa4..f556565 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -71,6 +71,8 @@ static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); + if (g_hlr->store_imei) + vty_out(vty, " store-imei 1%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -305,6 +307,17 @@ return CMD_SUCCESS; } +DEFUN(cfg_store_imei, cfg_store_imei_cmd, + "store-imei (0|1)", + "Save the IMEI in the database, when receiving Check IMEI requests. When using OsmoHLR with OsmoMSC, make sure" + " to set 'check-imei-rqd 1' in osmo-msc.cfg.\n" + "Do not save IMEIs in the subscriber database\n" + "Save IMEIs in the subscriber database\n") +{ + g_hlr->store_imei = atoi(argv[0]) ? true : false; + return CMD_SUCCESS; +} + /*********************************************************************** * Common Code ***********************************************************************/ @@ -368,6 +381,7 @@ install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd); + install_element(HLR_NODE, &cfg_store_imei_cmd); hlr_vty_subscriber_init(); } -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:34:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:34:14 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12527 Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "show subscriber", and allow showing subscribers by their IMEI with: "show subscriber imei ..." Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/1 diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 92cfa2a..ba22e78 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -58,6 +58,8 @@ vty_out(vty, " IMSI: %s%s", *subscr->imsi ? subscr->imsi : "none", VTY_NEWLINE); vty_out(vty, " MSISDN: %s%s", *subscr->msisdn ? subscr->msisdn : "none", VTY_NEWLINE); + if (*subscr->imei) + vty_out(vty, " IMEI: %s%s", subscr->imei, VTY_NEWLINE); if (*subscr->vlr_number) vty_out(vty, " VLR number: %s%s", subscr->vlr_number, VTY_NEWLINE); if (*subscr->sgsn_number) @@ -138,6 +140,8 @@ rc = db_subscr_get_by_msisdn(g_hlr->dbc, id, subscr); else if (strcmp(type, "id") == 0) rc = db_subscr_get_by_id(g_hlr->dbc, atoll(id), subscr); + else if (strcmp(type, "imei") == 0) + rc = db_subscr_get_by_imei(g_hlr->dbc, id, subscr); if (rc) vty_out(vty, "%% No subscriber for %s = '%s'%s", type, id, VTY_NEWLINE); @@ -147,12 +151,13 @@ #define SUBSCR_CMD "subscriber " #define SUBSCR_CMD_HELP "Subscriber management commands\n" -#define SUBSCR_ID "(imsi|msisdn|id) IDENT" +#define SUBSCR_ID "(imsi|msisdn|id|imei) IDENT" #define SUBSCR_ID_HELP \ "Identify subscriber by IMSI\n" \ "Identify subscriber by MSISDN (phone number)\n" \ "Identify subscriber by database ID\n" \ - "IMSI/MSISDN/ID of the subscriber\n" + "Identify subscriber by IMEI (14 digits, without 15th check digit)\n" \ + "IMSI/MSISDN/ID/IMEI of the subscriber\n" #define SUBSCR SUBSCR_CMD SUBSCR_ID " " #define SUBSCR_HELP SUBSCR_CMD_HELP SUBSCR_ID_HELP -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:34:50 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:34:50 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 1: CI fails, because this depends on: https://gerrit.osmocom.org/#/c/libosmocore/+/12524/ -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 15:34:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:34:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:34:56 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 1: CI fails, because this depends on: https://gerrit.osmocom.org/#/c/libosmocore/+/12524/ -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 15:34:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 15:35:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 11 Jan 2019 15:35:00 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 1: CI fails, because this depends on: https://gerrit.osmocom.org/#/c/libosmocore/+/12524/ -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Jan 2019 15:35:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 16:59:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 16:59:02 +0000 Subject: Change in libusrp[master]: firmware: Fix include directory path names Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12528 Change subject: firmware: Fix include directory path names ...................................................................... firmware: Fix include directory path names When we forked libusrp from the gnuradio source archive, we moved around the directories, but failed to adjust the FW_INCLUDES. Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 --- M firmware/lib/Makefile.am M firmware/src/usrp2/Makefile.am 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/28/12528/1 diff --git a/firmware/lib/Makefile.am b/firmware/lib/Makefile.am index a6790f0..a791031 100644 --- a/firmware/lib/Makefile.am +++ b/firmware/lib/Makefile.am @@ -30,7 +30,7 @@ DEFINES= -FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include +FW_INCLUDES=-I$(top_srcdir)/firmware/include # with EA = 0, the FX2 implements a portion of the 8051 "external memory" # on chip. This memory is mapped like this: diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am index 4402cd6..24ff9b1 100644 --- a/firmware/src/usrp2/Makefile.am +++ b/firmware/src/usrp2/Makefile.am @@ -54,10 +54,10 @@ DEFINES=-DHAVE_USRP2 -FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \ - -I$(top_srcdir)/usrp/firmware/src/usrp2 \ - -I$(top_srcdir)/usrp/firmware/src/common \ - -I$(top_builddir)/usrp/firmware/src/common +FW_INCLUDES=-I$(top_srcdir)/firmware/include \ + -I$(top_srcdir)/firmware/src/usrp2 \ + -I$(top_srcdir)/firmware/src/common \ + -I$(top_builddir)/firmware/src/common # with EA = 0, the FX2 implements a portion of the 8051 "external memory" # on chip. This memory is mapped like this: -- To view, visit https://gerrit.osmocom.org/12528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 Gerrit-Change-Number: 12528 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 16:59:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 16:59:02 +0000 Subject: Change in libusrp[master]: firmware: Port to more modern SDCC syntax. Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12529 Change subject: firmware: Port to more modern SDCC syntax. ...................................................................... firmware: Port to more modern SDCC syntax. SDCC, at least from version 3 onwards, has change the names of special attributes like "at" or "sfr". They are now all prefixed with double- underscores. Upstream fx2lib has made that change in commit 3071389d9a868ed553b84809b399008648536fcf which can be obtained from https://github.com/djmuhlestein/fx2lib/pull/1/commits/3071389d9a868ed553b84809b399008648536fcf Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd --- M firmware/include/fx2regs.h M firmware/include/i2c.h M firmware/include/syncdelay.h M firmware/include/usb_common.h M firmware/include/usb_descriptors.h M firmware/lib/delay.c M firmware/lib/i2c.c M firmware/lib/isr.c M firmware/lib/usb_common.c M firmware/src/common/fpga_load.c M firmware/src/common/fpga_load.h M firmware/src/usrp2/board_specific.c M firmware/src/usrp2/eeprom_init.c M firmware/src/usrp2/eeprom_io.c M firmware/src/usrp2/eeprom_io.h M firmware/src/usrp2/fpga_rev2.c M firmware/src/usrp2/spi.c M firmware/src/usrp2/spi.h M firmware/src/usrp2/usrp_main.c M firmware/src/usrp2/usrp_rev2_regs.h 20 files changed, 434 insertions(+), 434 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/29/12529/1 diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index 2f210f5..dec5164 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -48,14 +48,14 @@ // The Ez-USB FX2 registers are defined here. We use FX2regs.h for register // address allocation by using "#define ALLOCATE_EXTERN". // When using "#define ALLOCATE_EXTERN", you get (for instance): -// xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; +// __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; // Such lines are created from FX2.h by using the preprocessor. // Incidently, these lines will not generate any space in the resulting hex // file; they just bind the symbols to the addresses for compilation. // You just need to put "#define ALLOCATE_EXTERN" in your main program file; // i.e. fw.c or a stand-alone C source file. // Without "#define ALLOCATE_EXTERN", you just get the external reference: -// extern xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; +// extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; // This uses the concatenation operator "##" to insert a comment "//" // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. */ @@ -63,7 +63,7 @@ #ifdef ALLOCATE_EXTERN #define EXTERN -#define _AT_(a) at a +#define _AT_(a) __at a #else #define EXTERN extern #define _AT_ ;/ ## / @@ -72,163 +72,163 @@ typedef unsigned char BYTE; typedef unsigned short WORD; -EXTERN xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; -EXTERN xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; +EXTERN __xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; +EXTERN __xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; // General Configuration -EXTERN xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status -EXTERN xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration -EXTERN xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments -EXTERN xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments -EXTERN xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state -EXTERN xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint -EXTERN xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H -EXTERN xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L -EXTERN xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 -EXTERN xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities -EXTERN xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision -EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control +EXTERN __xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status +EXTERN __xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration +EXTERN __xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments +EXTERN __xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments +EXTERN __xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state +EXTERN __xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint +EXTERN __xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H +EXTERN __xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L +EXTERN __xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 +EXTERN __xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities +EXTERN __xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision +EXTERN __xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control // Endpoint Configuration -EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration -EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration -EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration -EXTERN xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration -EXTERN xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration -EXTERN xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration -EXTERN xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration -EXTERN xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration -EXTERN xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration -EXTERN xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration -EXTERN xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) -EXTERN xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) -EXTERN xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) -EXTERN xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) -EXTERN xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) -EXTERN xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) -EXTERN xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) -EXTERN xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) -EXTERN xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H -EXTERN xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L -EXTERN xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H -EXTERN xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L -EXTERN xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H -EXTERN xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L -EXTERN xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H -EXTERN xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L -EXTERN xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End -EXTERN xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End +EXTERN __xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration +EXTERN __xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration +EXTERN __xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration +EXTERN __xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration +EXTERN __xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration +EXTERN __xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration +EXTERN __xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration +EXTERN __xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration +EXTERN __xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration +EXTERN __xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration +EXTERN __xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End +EXTERN __xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End // Interrupts -EXTERN xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable -EXTERN xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request -EXTERN xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable -EXTERN xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request -EXTERN xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable -EXTERN xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request -EXTERN xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable -EXTERN xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request -EXTERN xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable -EXTERN xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request -EXTERN xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable -EXTERN xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request -EXTERN xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables -EXTERN xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests -EXTERN xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables -EXTERN xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests -EXTERN xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable -EXTERN xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request -EXTERN xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables -EXTERN xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests -EXTERN xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit -EXTERN xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] -EXTERN xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector -EXTERN xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector -EXTERN xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup +EXTERN __xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request +EXTERN __xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request +EXTERN __xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request +EXTERN __xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request +EXTERN __xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable +EXTERN __xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request +EXTERN __xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable +EXTERN __xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request +EXTERN __xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables +EXTERN __xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests +EXTERN __xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables +EXTERN __xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests +EXTERN __xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable +EXTERN __xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request +EXTERN __xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables +EXTERN __xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests +EXTERN __xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit +EXTERN __xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] +EXTERN __xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector +EXTERN __xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector +EXTERN __xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup // Input/Output -EXTERN xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration -EXTERN xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration -EXTERN xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration -EXTERN xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status -EXTERN xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data -EXTERN xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control -EXTERN xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access -EXTERN xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access +EXTERN __xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration +EXTERN __xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration +EXTERN __xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration +EXTERN __xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status +EXTERN __xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data +EXTERN __xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control +EXTERN __xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access +EXTERN __xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access #define EXTAUTODAT1 XAUTODAT1 #define EXTAUTODAT2 XAUTODAT2 // USB Control -EXTERN xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status -EXTERN xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend -EXTERN xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity -EXTERN xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control -EXTERN xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H -EXTERN xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L -EXTERN xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 -EXTERN xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address +EXTERN __xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status +EXTERN __xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend +EXTERN __xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity +EXTERN __xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control +EXTERN __xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H +EXTERN __xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L +EXTERN __xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 +EXTERN __xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address // Endpoints -EXTERN xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H -EXTERN xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L -EXTERN xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count -EXTERN xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count -EXTERN xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H -EXTERN xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L -EXTERN xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H -EXTERN xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L -EXTERN xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H -EXTERN xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L -EXTERN xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H -EXTERN xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L -EXTERN xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status -EXTERN xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status -EXTERN xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status -EXTERN xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status -EXTERN xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status -EXTERN xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status -EXTERN xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status -EXTERN xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags -EXTERN xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags -EXTERN xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags -EXTERN xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags -EXTERN xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H -EXTERN xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L -EXTERN xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H -EXTERN xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L -EXTERN xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H -EXTERN xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L -EXTERN xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H -EXTERN xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L -EXTERN xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte -EXTERN xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte -EXTERN xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode -EXTERN xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data +EXTERN __xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H +EXTERN __xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L +EXTERN __xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count +EXTERN __xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count +EXTERN __xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H +EXTERN __xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L +EXTERN __xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H +EXTERN __xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L +EXTERN __xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H +EXTERN __xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L +EXTERN __xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H +EXTERN __xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L +EXTERN __xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status +EXTERN __xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status +EXTERN __xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status +EXTERN __xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status +EXTERN __xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status +EXTERN __xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status +EXTERN __xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status +EXTERN __xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags +EXTERN __xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags +EXTERN __xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags +EXTERN __xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags +EXTERN __xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H +EXTERN __xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L +EXTERN __xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H +EXTERN __xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L +EXTERN __xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H +EXTERN __xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L +EXTERN __xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H +EXTERN __xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L +EXTERN __xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte +EXTERN __xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte +EXTERN __xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode +EXTERN __xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data // GPIF -EXTERN xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector -EXTERN xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode -EXTERN xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states -EXTERN xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive -EXTERN xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H -EXTERN xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L +EXTERN __xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector +EXTERN __xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode +EXTERN __xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states +EXTERN __xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive +EXTERN __xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H +EXTERN __xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L -EXTERN xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 -EXTERN xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 -EXTERN xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 -EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 +EXTERN __xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 +EXTERN __xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 +EXTERN __xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 +EXTERN __xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 #define EP2GPIFTCH GPIFTCB1 // these are here for backwards compatibility #define EP2GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) @@ -239,68 +239,68 @@ #define EP8GPIFTCH GPIFTCB1 // these are here for backwards compatibility #define EP8GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) -// EXTERN xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select -EXTERN xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag -EXTERN xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger -// EXTERN xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low -EXTERN xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select -EXTERN xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag -EXTERN xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger -// EXTERN xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select -EXTERN xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag -EXTERN xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger -// EXTERN xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select -EXTERN xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag -EXTERN xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger -EXTERN xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) -EXTERN xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac -EXTERN xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger -EXTERN xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG -EXTERN xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states -EXTERN xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles +// EXTERN __xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select +EXTERN __xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag +EXTERN __xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger +// EXTERN __xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low +EXTERN __xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select +EXTERN __xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag +EXTERN __xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger +// EXTERN __xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select +EXTERN __xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag +EXTERN __xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger +// EXTERN __xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select +EXTERN __xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag +EXTERN __xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger +EXTERN __xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) +EXTERN __xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac +EXTERN __xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger +EXTERN __xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG +EXTERN __xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states +EXTERN __xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles // UDMA -EXTERN xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state -EXTERN xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria -EXTERN xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state -EXTERN xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state -EXTERN xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; -EXTERN xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe -EXTERN xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge -EXTERN xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe -EXTERN xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift -EXTERN xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte -EXTERN xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte -EXTERN xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only +EXTERN __xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state +EXTERN __xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria +EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state +EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state +EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; +EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe +EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge +EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe +EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift +EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte +EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte +EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only // Debug/Test -EXTERN xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug -EXTERN xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration -EXTERN xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes -EXTERN xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override -EXTERN xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM -EXTERN xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals -EXTERN xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs +EXTERN __xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug +EXTERN __xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration +EXTERN __xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes +EXTERN __xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override +EXTERN __xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM +EXTERN __xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals +EXTERN __xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs // Endpoint Buffers -EXTERN xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer -EXTERN xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer -EXTERN xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer -EXTERN xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) -EXTERN xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) -EXTERN xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) -EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) +EXTERN __xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer +EXTERN __xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer +EXTERN __xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer +EXTERN __xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) +EXTERN __xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) +EXTERN __xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) +EXTERN __xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) #undef EXTERN #undef _AT_ @@ -313,201 +313,201 @@ "ezregs.inc" which includes the same basic information for assembly inclusion. -----------------------------------------------------------------------------*/ -sfr at 0x80 IOA; -sfr at 0x81 SP; -sfr at 0x82 DPL; -sfr at 0x83 DPH; -sfr at 0x84 DPL1; -sfr at 0x85 DPH1; -sfr at 0x86 DPS; +__sfr __at 0x80 IOA; +__sfr __at 0x81 SP; +__sfr __at 0x82 DPL; +__sfr __at 0x83 DPH; +__sfr __at 0x84 DPL1; +__sfr __at 0x85 DPH1; +__sfr __at 0x86 DPS; /* DPS */ - sbit at 0x86+0 SEL; -sfr at 0x87 PCON; /* PCON */ - //sbit IDLE = 0x87+0; - //sbit STOP = 0x87+1; - //sbit GF0 = 0x87+2; - //sbit GF1 = 0x87+3; - //sbit SMOD0 = 0x87+7; -sfr at 0x88 TCON; + __sbit __at 0x86+0 SEL; +__sfr __at 0x87 PCON; /* PCON */ + //__sbit IDLE = 0x87+0; + //__sbit STOP = 0x87+1; + //__sbit GF0 = 0x87+2; + //__sbit GF1 = 0x87+3; + //__sbit SMOD0 = 0x87+7; +__sfr __at 0x88 TCON; /* TCON */ - sbit at 0x88+0 IT0; - sbit at 0x88+1 IE0; - sbit at 0x88+2 IT1; - sbit at 0x88+3 IE1; - sbit at 0x88+4 TR0; - sbit at 0x88+5 TF0; - sbit at 0x88+6 TR1; - sbit at 0x88+7 TF1; -sfr at 0x89 TMOD; + __sbit __at 0x88+0 IT0; + __sbit __at 0x88+1 IE0; + __sbit __at 0x88+2 IT1; + __sbit __at 0x88+3 IE1; + __sbit __at 0x88+4 TR0; + __sbit __at 0x88+5 TF0; + __sbit __at 0x88+6 TR1; + __sbit __at 0x88+7 TF1; +__sfr __at 0x89 TMOD; /* TMOD */ - //sbit M00 = 0x89+0; - //sbit M10 = 0x89+1; - //sbit CT0 = 0x89+2; - //sbit GATE0 = 0x89+3; - //sbit M01 = 0x89+4; - //sbit M11 = 0x89+5; - //sbit CT1 = 0x89+6; - //sbit GATE1 = 0x89+7; -sfr at 0x8A TL0; -sfr at 0x8B TL1; -sfr at 0x8C TH0; -sfr at 0x8D TH1; -sfr at 0x8E CKCON; + //__sbit M00 = 0x89+0; + //__sbit M10 = 0x89+1; + //__sbit CT0 = 0x89+2; + //__sbit GATE0 = 0x89+3; + //__sbit M01 = 0x89+4; + //__sbit M11 = 0x89+5; + //__sbit CT1 = 0x89+6; + //__sbit GATE1 = 0x89+7; +__sfr __at 0x8A TL0; +__sfr __at 0x8B TL1; +__sfr __at 0x8C TH0; +__sfr __at 0x8D TH1; +__sfr __at 0x8E CKCON; /* CKCON */ - //sbit MD0 = 0x89+0; - //sbit MD1 = 0x89+1; - //sbit MD2 = 0x89+2; - //sbit T0M = 0x89+3; - //sbit T1M = 0x89+4; - //sbit T2M = 0x89+5; -// sfr at 0x8F SPC_FNC; // Was WRS in Reg320 + //__sbit MD0 = 0x89+0; + //__sbit MD1 = 0x89+1; + //__sbit MD2 = 0x89+2; + //__sbit T0M = 0x89+3; + //__sbit T1M = 0x89+4; + //__sbit T2M = 0x89+5; +// __sfr __at 0x8F SPC_FNC; // Was WRS in Reg320 /* CKCON */ - //sbit WRS = 0x8F+0; -sfr at 0x90 IOB; -sfr at 0x91 EXIF; // EXIF Bit Values differ from Reg320 + //__sbit WRS = 0x8F+0; +__sfr __at 0x90 IOB; +__sfr __at 0x91 EXIF; // EXIF Bit Values differ from Reg320 /* EXIF */ - //sbit USBINT = 0x91+4; - //sbit I2CINT = 0x91+5; - //sbit IE4 = 0x91+6; - //sbit IE5 = 0x91+7; -sfr at 0x92 MPAGE; -sfr at 0x98 SCON0; + //__sbit USBINT = 0x91+4; + //__sbit I2CINT = 0x91+5; + //__sbit IE4 = 0x91+6; + //__sbit IE5 = 0x91+7; +__sfr __at 0x92 MPAGE; +__sfr __at 0x98 SCON0; /* SCON0 */ - sbit at 0x98+0 RI; - sbit at 0x98+1 TI; - sbit at 0x98+2 RB8; - sbit at 0x98+3 TB8; - sbit at 0x98+4 REN; - sbit at 0x98+5 SM2; - sbit at 0x98+6 SM1; - sbit at 0x98+7 SM0; -sfr at 0x99 SBUF0; + __sbit __at 0x98+0 RI; + __sbit __at 0x98+1 TI; + __sbit __at 0x98+2 RB8; + __sbit __at 0x98+3 TB8; + __sbit __at 0x98+4 REN; + __sbit __at 0x98+5 SM2; + __sbit __at 0x98+6 SM1; + __sbit __at 0x98+7 SM0; +__sfr __at 0x99 SBUF0; -sfr at 0x9A APTR1H; -sfr at 0x9B APTR1L; -sfr at 0x9C AUTODAT1; -sfr at 0x9D AUTOPTRH2; -sfr at 0x9E AUTOPTRL2; -sfr at 0x9F AUTODAT2; -sfr at 0xA0 IOC; -sfr at 0xA1 INT2CLR; -sfr at 0xA2 INT4CLR; +__sfr __at 0x9A APTR1H; +__sfr __at 0x9B APTR1L; +__sfr __at 0x9C AUTODAT1; +__sfr __at 0x9D AUTOPTRH2; +__sfr __at 0x9E AUTOPTRL2; +__sfr __at 0x9F AUTODAT2; +__sfr __at 0xA0 IOC; +__sfr __at 0xA1 INT2CLR; +__sfr __at 0xA2 INT4CLR; #define AUTOPTRH1 APTR1H #define AUTOPTRL1 APTR1L -sfr at 0xA8 IE; +__sfr __at 0xA8 IE; /* IE */ - sbit at 0xA8+0 EX0; - sbit at 0xA8+1 ET0; - sbit at 0xA8+2 EX1; - sbit at 0xA8+3 ET1; - sbit at 0xA8+4 ES0; - sbit at 0xA8+5 ET2; - sbit at 0xA8+6 ES1; - sbit at 0xA8+7 EA; + __sbit __at 0xA8+0 EX0; + __sbit __at 0xA8+1 ET0; + __sbit __at 0xA8+2 EX1; + __sbit __at 0xA8+3 ET1; + __sbit __at 0xA8+4 ES0; + __sbit __at 0xA8+5 ET2; + __sbit __at 0xA8+6 ES1; + __sbit __at 0xA8+7 EA; -sfr at 0xAA EP2468STAT; +__sfr __at 0xAA EP2468STAT; /* EP2468STAT */ - //sbit EP2E = 0xAA+0; - //sbit EP2F = 0xAA+1; - //sbit EP4E = 0xAA+2; - //sbit EP4F = 0xAA+3; - //sbit EP6E = 0xAA+4; - //sbit EP6F = 0xAA+5; - //sbit EP8E = 0xAA+6; - //sbit EP8F = 0xAA+7; + //__sbit EP2E = 0xAA+0; + //__sbit EP2F = 0xAA+1; + //__sbit EP4E = 0xAA+2; + //__sbit EP4F = 0xAA+3; + //__sbit EP6E = 0xAA+4; + //__sbit EP6F = 0xAA+5; + //__sbit EP8E = 0xAA+6; + //__sbit EP8F = 0xAA+7; -sfr at 0xAB EP24FIFOFLGS; -sfr at 0xAC EP68FIFOFLGS; -sfr at 0xAF AUTOPTRSETUP; +__sfr __at 0xAB EP24FIFOFLGS; +__sfr __at 0xAC EP68FIFOFLGS; +__sfr __at 0xAF AUTOPTRSETUP; /* AUTOPTRSETUP */ - // sbit EXTACC = 0xAF+0; - // sbit APTR1FZ = 0xAF+1; - // sbit APTR2FZ = 0xAF+2; + // __sbit EXTACC = 0xAF+0; + // __sbit APTR1FZ = 0xAF+1; + // __sbit APTR2FZ = 0xAF+2; -sfr at 0xB0 IOD; -sfr at 0xB1 IOE; -sfr at 0xB2 OEA; -sfr at 0xB3 OEB; -sfr at 0xB4 OEC; -sfr at 0xB5 OED; -sfr at 0xB6 OEE; +__sfr __at 0xB0 IOD; +__sfr __at 0xB1 IOE; +__sfr __at 0xB2 OEA; +__sfr __at 0xB3 OEB; +__sfr __at 0xB4 OEC; +__sfr __at 0xB5 OED; +__sfr __at 0xB6 OEE; -sfr at 0xB8 IP; +__sfr __at 0xB8 IP; /* IP */ - sbit at 0xB8+0 PX0; - sbit at 0xB8+1 PT0; - sbit at 0xB8+2 PX1; - sbit at 0xB8+3 PT1; - sbit at 0xB8+4 PS0; - sbit at 0xB8+5 PT2; - sbit at 0xB8+6 PS1; + __sbit __at 0xB8+0 PX0; + __sbit __at 0xB8+1 PT0; + __sbit __at 0xB8+2 PX1; + __sbit __at 0xB8+3 PT1; + __sbit __at 0xB8+4 PS0; + __sbit __at 0xB8+5 PT2; + __sbit __at 0xB8+6 PS1; -sfr at 0xBA EP01STAT; -sfr at 0xBB GPIFTRIG; +__sfr __at 0xBA EP01STAT; +__sfr __at 0xBB GPIFTRIG; -sfr at 0xBD GPIFSGLDATH; -sfr at 0xBE GPIFSGLDATLX; -sfr at 0xBF GPIFSGLDATLNOX; +__sfr __at 0xBD GPIFSGLDATH; +__sfr __at 0xBE GPIFSGLDATLX; +__sfr __at 0xBF GPIFSGLDATLNOX; -sfr at 0xC0 SCON1; +__sfr __at 0xC0 SCON1; /* SCON1 */ - sbit at 0xC0+0 RI1; - sbit at 0xC0+1 TI1; - sbit at 0xC0+2 RB81; - sbit at 0xC0+3 TB81; - sbit at 0xC0+4 REN1; - sbit at 0xC0+5 SM21; - sbit at 0xC0+6 SM11; - sbit at 0xC0+7 SM01; -sfr at 0xC1 SBUF1; -sfr at 0xC8 T2CON; + __sbit __at 0xC0+0 RI1; + __sbit __at 0xC0+1 TI1; + __sbit __at 0xC0+2 RB81; + __sbit __at 0xC0+3 TB81; + __sbit __at 0xC0+4 REN1; + __sbit __at 0xC0+5 SM21; + __sbit __at 0xC0+6 SM11; + __sbit __at 0xC0+7 SM01; +__sfr __at 0xC1 SBUF1; +__sfr __at 0xC8 T2CON; /* T2CON */ - sbit at 0xC8+0 CP_RL2; - sbit at 0xC8+1 C_T2; - sbit at 0xC8+2 TR2; - sbit at 0xC8+3 EXEN2; - sbit at 0xC8+4 TCLK; - sbit at 0xC8+5 RCLK; - sbit at 0xC8+6 EXF2; - sbit at 0xC8+7 TF2; -sfr at 0xCA RCAP2L; -sfr at 0xCB RCAP2H; -sfr at 0xCC TL2; -sfr at 0xCD TH2; -sfr at 0xD0 PSW; + __sbit __at 0xC8+0 CP_RL2; + __sbit __at 0xC8+1 C_T2; + __sbit __at 0xC8+2 TR2; + __sbit __at 0xC8+3 EXEN2; + __sbit __at 0xC8+4 TCLK; + __sbit __at 0xC8+5 RCLK; + __sbit __at 0xC8+6 EXF2; + __sbit __at 0xC8+7 TF2; +__sfr __at 0xCA RCAP2L; +__sfr __at 0xCB RCAP2H; +__sfr __at 0xCC TL2; +__sfr __at 0xCD TH2; +__sfr __at 0xD0 PSW; /* PSW */ - sbit at 0xD0+0 P; - sbit at 0xD0+1 FL; - sbit at 0xD0+2 OV; - sbit at 0xD0+3 RS0; - sbit at 0xD0+4 RS1; - sbit at 0xD0+5 F0; - sbit at 0xD0+6 AC; - sbit at 0xD0+7 CY; -sfr at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 + __sbit __at 0xD0+0 P; + __sbit __at 0xD0+1 FL; + __sbit __at 0xD0+2 OV; + __sbit __at 0xD0+3 RS0; + __sbit __at 0xD0+4 RS1; + __sbit __at 0xD0+5 F0; + __sbit __at 0xD0+6 AC; + __sbit __at 0xD0+7 CY; +__sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 /* EICON */ - sbit at 0xD8+3 INT6; - sbit at 0xD8+4 RESI; - sbit at 0xD8+5 ERESI; - sbit at 0xD8+7 SMOD1; -sfr at 0xE0 ACC; -sfr at 0xE8 EIE; // EIE Bit Values differ from Reg320 + __sbit __at 0xD8+3 INT6; + __sbit __at 0xD8+4 RESI; + __sbit __at 0xD8+5 ERESI; + __sbit __at 0xD8+7 SMOD1; +__sfr __at 0xE0 ACC; +__sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 /* EIE */ - sbit at 0xE8+0 EIUSB; - sbit at 0xE8+1 EI2C; - sbit at 0xE8+2 EIEX4; - sbit at 0xE8+3 EIEX5; - sbit at 0xE8+4 EIEX6; -sfr at 0xF0 B; -sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320 + __sbit __at 0xE8+0 EIUSB; + __sbit __at 0xE8+1 EI2C; + __sbit __at 0xE8+2 EIEX4; + __sbit __at 0xE8+3 EIEX5; + __sbit __at 0xE8+4 EIEX6; +__sfr __at 0xF0 B; +__sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 /* EIP */ - sbit at 0xF8+0 PUSB; - sbit at 0xF8+1 PI2C; - sbit at 0xF8+2 EIPX4; - sbit at 0xF8+3 EIPX5; - sbit at 0xF8+4 EIPX6; + __sbit __at 0xF8+0 PUSB; + __sbit __at 0xF8+1 PI2C; + __sbit __at 0xF8+2 EIPX4; + __sbit __at 0xF8+3 EIPX5; + __sbit __at 0xF8+4 EIPX6; /*----------------------------------------------------------------------------- Bit Masks diff --git a/firmware/include/i2c.h b/firmware/include/i2c.h index 273526d..25f5364 100644 --- a/firmware/include/i2c.h +++ b/firmware/include/i2c.h @@ -24,9 +24,9 @@ #define _I2C_H_ // returns non-zero if successful, else 0 -unsigned char i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len); +unsigned char i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 -unsigned char i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len); +unsigned char i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len); #endif /* _I2C_H_ */ diff --git a/firmware/include/syncdelay.h b/firmware/include/syncdelay.h index 0af7d09..107932d 100644 --- a/firmware/include/syncdelay.h +++ b/firmware/include/syncdelay.h @@ -58,8 +58,8 @@ /* * FIXME ensure that the peep hole optimizer isn't screwing us */ -#define SYNCDELAY _asm nop; nop; nop; _endasm -#define NOP _asm nop; _endasm +#define SYNCDELAY __asm nop; nop; nop; __endasm +#define NOP __asm nop; __endasm #endif /* _SYNCDELAY_H_ */ diff --git a/firmware/include/usb_common.h b/firmware/include/usb_common.h index ae07b23..2fbab6d 100644 --- a/firmware/include/usb_common.h +++ b/firmware/include/usb_common.h @@ -23,7 +23,7 @@ #ifndef _USB_COMMON_H_ #define _USB_COMMON_H_ -extern volatile bit _usb_got_SUDAV; +extern volatile __bit _usb_got_SUDAV; // Provided by user application to handle VENDOR commands. // returns non-zero if it handled the command. diff --git a/firmware/include/usb_descriptors.h b/firmware/include/usb_descriptors.h index 0b8c621..ea91169 100644 --- a/firmware/include/usb_descriptors.h +++ b/firmware/include/usb_descriptors.h @@ -20,21 +20,21 @@ * Boston, MA 02110-1301, USA. */ -extern xdata const char high_speed_device_descr[]; -extern xdata const char high_speed_devqual_descr[]; -extern xdata const char high_speed_config_descr[]; +extern __xdata const char high_speed_device_descr[]; +extern __xdata const char high_speed_devqual_descr[]; +extern __xdata const char high_speed_config_descr[]; -extern xdata const char full_speed_device_descr[]; -extern xdata const char full_speed_devqual_descr[]; -extern xdata const char full_speed_config_descr[]; +extern __xdata const char full_speed_device_descr[]; +extern __xdata const char full_speed_devqual_descr[]; +extern __xdata const char full_speed_config_descr[]; -extern xdata unsigned char nstring_descriptors; -extern xdata char * xdata string_descriptors[]; +extern __xdata unsigned char nstring_descriptors; +extern __xdata char * __xdata string_descriptors[]; /* * We patch these locations with info read from the usrp config eeprom */ -extern xdata char usb_desc_hw_rev_binary_patch_location_0[]; -extern xdata char usb_desc_hw_rev_binary_patch_location_1[]; -extern xdata char usb_desc_hw_rev_ascii_patch_location_0[]; -extern xdata char usb_desc_serial_number_ascii[]; +extern __xdata char usb_desc_hw_rev_binary_patch_location_0[]; +extern __xdata char usb_desc_hw_rev_binary_patch_location_1[]; +extern __xdata char usb_desc_hw_rev_ascii_patch_location_0[]; +extern __xdata char usb_desc_serial_number_ascii[]; diff --git a/firmware/lib/delay.c b/firmware/lib/delay.c index 13cf0ee..f2e8307 100644 --- a/firmware/lib/delay.c +++ b/firmware/lib/delay.c @@ -24,11 +24,11 @@ * Delay approximately 1 microsecond (including overhead in udelay). */ static void -udelay1 (void) _naked +udelay1 (void) __naked { - _asm ; lcall that got us here took 4 bus cycles + __asm ; lcall that got us here took 4 bus cycles ret ; 4 bus cycles - _endasm; + __endasm; } /* @@ -51,9 +51,9 @@ * but explains the factor of 4 problem below). */ static void -mdelay1 (void) _naked +mdelay1 (void) __naked { - _asm + __asm mov dptr,#(-1200 & 0xffff) 002$: inc dptr ; 3 bus cycles @@ -62,7 +62,7 @@ jnz 002$ ; 3 bus cycles ret - _endasm; + __endasm; } void diff --git a/firmware/lib/i2c.c b/firmware/lib/i2c.c index 0f238b5..dd31a5f 100644 --- a/firmware/lib/i2c.c +++ b/firmware/lib/i2c.c @@ -30,7 +30,7 @@ // returns non-zero if successful, else 0 unsigned char -i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) +i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len) { volatile unsigned char junk; @@ -89,7 +89,7 @@ // returns non-zero if successful, else 0 unsigned char -i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len) +i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len) { while (I2CS & bmSTOP) // wait for stop to clear ; diff --git a/firmware/lib/isr.c b/firmware/lib/isr.c index 05412da..61f2dc3 100644 --- a/firmware/lib/isr.c +++ b/firmware/lib/isr.c @@ -24,9 +24,9 @@ #include "fx2regs.h" #include "syncdelay.h" -extern xdata unsigned char _standard_interrupt_vector[]; -extern xdata unsigned char _usb_autovector[]; -extern xdata unsigned char _fifo_gpif_autovector[]; +extern __xdata unsigned char _standard_interrupt_vector[]; +extern __xdata unsigned char _usb_autovector[]; +extern __xdata unsigned char _fifo_gpif_autovector[]; #define LJMP_OPCODE 0x02 @@ -39,7 +39,7 @@ void hook_sv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks @@ -66,7 +66,7 @@ void hook_uv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks @@ -93,7 +93,7 @@ void hook_fgv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks diff --git a/firmware/lib/usb_common.c b/firmware/lib/usb_common.c index 3b0547b..6a7a103 100644 --- a/firmware/lib/usb_common.c +++ b/firmware/lib/usb_common.c @@ -28,12 +28,12 @@ #include "usb_descriptors.h" #include "usb_requests.h" -extern xdata char str0[]; -extern xdata char str1[]; -extern xdata char str2[]; -extern xdata char str3[]; -extern xdata char str4[]; -extern xdata char str5[]; +extern __xdata char str0[]; +extern __xdata char str1[]; +extern __xdata char str2[]; +extern __xdata char str3[]; +extern __xdata char str4[]; +extern __xdata char str5[]; #define bRequestType SETUPDAT[0] @@ -48,15 +48,15 @@ #define MSB(x) (((unsigned short) x) >> 8) #define LSB(x) (((unsigned short) x) & 0xff) -volatile bit _usb_got_SUDAV; +volatile __bit _usb_got_SUDAV; unsigned char _usb_config = 0; unsigned char _usb_alt_setting = 0; // FIXME really 1/interface -xdata unsigned char *current_device_descr; -xdata unsigned char *current_devqual_descr; -xdata unsigned char *current_config_descr; -xdata unsigned char *other_config_descr; +__xdata unsigned char *current_device_descr; +__xdata unsigned char *current_devqual_descr; +__xdata unsigned char *current_config_descr; +__xdata unsigned char *other_config_descr; static void setup_descriptors (void) @@ -81,21 +81,21 @@ } static void -isr_SUDAV (void) interrupt +isr_SUDAV (void) __interrupt { clear_usb_irq (); _usb_got_SUDAV = 1; } static void -isr_USBRESET (void) interrupt +isr_USBRESET (void) __interrupt { clear_usb_irq (); setup_descriptors (); } static void -isr_HIGHSPEED (void) interrupt +isr_HIGHSPEED (void) __interrupt { clear_usb_irq (); setup_descriptors (); @@ -133,7 +133,7 @@ // return pointer to control and status register for endpoint. // only called with plausible_endpoints -xdata volatile unsigned char * +__xdata volatile unsigned char * epcs (unsigned char ep) { if (ep == 0x01) // ep1 has different in and out CS regs @@ -234,7 +234,7 @@ if (wValueL >= nstring_descriptors) fx2_stall_ep0 (); else { - xdata char *p = string_descriptors[wValueL]; + __xdata char *p = string_descriptors[wValueL]; SUDPTRH = MSB (p); SUDPTRL = LSB (p); } diff --git a/firmware/src/common/fpga_load.c b/firmware/src/common/fpga_load.c index c3ae9e7..4c0a85e 100644 --- a/firmware/src/common/fpga_load.c +++ b/firmware/src/common/fpga_load.c @@ -89,9 +89,9 @@ #else static void -clock_out_config_byte (unsigned char bits) _naked +clock_out_config_byte (unsigned char bits) __naked { - _asm + __asm mov a, dpl rrc a @@ -136,14 +136,14 @@ ret - _endasm; + __endasm; } #endif static void clock_out_bytes (unsigned char bytecount, - unsigned char xdata *p) + unsigned char __xdata *p) { while (bytecount-- > 0) clock_out_config_byte (*p++); @@ -163,7 +163,7 @@ * ALTERA_NSTATUS = 1 (input) */ unsigned char -fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) +fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) { clock_out_bytes (bytecount, p); return 1; diff --git a/firmware/src/common/fpga_load.h b/firmware/src/common/fpga_load.h index 7c36a04..40ebf92 100644 --- a/firmware/src/common/fpga_load.h +++ b/firmware/src/common/fpga_load.h @@ -22,7 +22,7 @@ #define INCLUDED_FPGA_LOAD_H unsigned char fpga_load_begin (void); -unsigned char fpga_load_xfer (xdata unsigned char *p, unsigned char len); +unsigned char fpga_load_xfer (__xdata unsigned char *p, unsigned char len); unsigned char fpga_load_end (void); #endif /* INCLUDED_FPGA_LOAD_H */ diff --git a/firmware/src/usrp2/board_specific.c b/firmware/src/usrp2/board_specific.c index ef0081d..92fc28f 100644 --- a/firmware/src/usrp2/board_specific.c +++ b/firmware/src/usrp2/board_specific.c @@ -64,7 +64,7 @@ // NOP on usrp1 } -static xdata unsigned char xbuf[1]; +static __xdata unsigned char xbuf[1]; void write_9862 (unsigned char which, unsigned char regno, unsigned char value) diff --git a/firmware/src/usrp2/eeprom_init.c b/firmware/src/usrp2/eeprom_init.c index a6f6cbe..f10ab54 100644 --- a/firmware/src/usrp2/eeprom_init.c +++ b/firmware/src/usrp2/eeprom_init.c @@ -29,7 +29,7 @@ * into hash1. */ #define USRP_HASH_SIZE 16 -xdata at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; +__xdata __at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; #define enable_codecs() USRP_PA &= ~(bmPA_SEN_CODEC_A | bmPA_SEN_CODEC_B) diff --git a/firmware/src/usrp2/eeprom_io.c b/firmware/src/usrp2/eeprom_io.c index 9eeb536..1afdc23 100644 --- a/firmware/src/usrp2/eeprom_io.c +++ b/firmware/src/usrp2/eeprom_io.c @@ -27,12 +27,12 @@ // returns non-zero if successful, else 0 unsigned char eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - xdata unsigned char *buf, unsigned char len) + __xdata unsigned char *buf, unsigned char len) { // We setup a random read by first doing a "zero byte write". // Writes carry an address. Reads use an implicit address. - static xdata unsigned char cmd[1]; + static __xdata unsigned char cmd[1]; cmd[0] = eeprom_offset; if (!i2c_write(i2c_addr, cmd, 1)) return 0; diff --git a/firmware/src/usrp2/eeprom_io.h b/firmware/src/usrp2/eeprom_io.h index 558017b..d1c4ee6 100644 --- a/firmware/src/usrp2/eeprom_io.h +++ b/firmware/src/usrp2/eeprom_io.h @@ -27,12 +27,12 @@ // returns non-zero if successful, else 0 unsigned char eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - xdata unsigned char *buf, unsigned char len); + __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, - const xdata unsigned char *buf, unsigned char len); + const __xdata unsigned char *buf, unsigned char len); #endif /* INCLUDED_EEPROM_IO_H */ diff --git a/firmware/src/usrp2/fpga_rev2.c b/firmware/src/usrp2/fpga_rev2.c index cca961d..a1081f5 100644 --- a/firmware/src/usrp2/fpga_rev2.c +++ b/firmware/src/usrp2/fpga_rev2.c @@ -30,7 +30,7 @@ unsigned char g_rx_reset = 0; void -fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) +fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) { spi_write (0, 0x00 | (regno & 0x7f), SPI_ENABLE_FPGA, @@ -39,7 +39,7 @@ } -static xdata unsigned char regval[4] = {0, 0, 0, 0}; +static __xdata unsigned char regval[4] = {0, 0, 0, 0}; static void write_fpga_master_ctrl (void) diff --git a/firmware/src/usrp2/spi.c b/firmware/src/usrp2/spi.c index f5803c5..fab0429 100644 --- a/firmware/src/usrp2/spi.c +++ b/firmware/src/usrp2/spi.c @@ -98,17 +98,17 @@ write_byte_msb (unsigned char v); static void -write_bytes_msb (const xdata unsigned char *buf, unsigned char len); +write_bytes_msb (const __xdata unsigned char *buf, unsigned char len); static void -read_bytes_msb (xdata unsigned char *buf, unsigned char len); +read_bytes_msb (__xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char spi_read (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - xdata unsigned char *buf, unsigned char len) + __xdata unsigned char *buf, unsigned char len) { if (count_bits8 (enables) > 1) return 0; // error, too many enables set @@ -165,7 +165,7 @@ unsigned char spi_write (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - const xdata unsigned char *buf, unsigned char len) + const __xdata unsigned char *buf, unsigned char len) { setup_enables (enables); @@ -261,7 +261,7 @@ } static void -write_bytes_msb (const xdata unsigned char *buf, unsigned char len) +write_bytes_msb (const __xdata unsigned char *buf, unsigned char len) { while (len-- != 0){ write_byte_msb (*buf++); @@ -320,9 +320,9 @@ } #else static unsigned char -read_byte_msb (void) _naked +read_byte_msb (void) __naked { - _asm + __asm clr a setb _bitS_CLK @@ -367,12 +367,12 @@ mov dpl,a ret - _endasm; + __endasm; } #endif static void -read_bytes_msb (xdata unsigned char *buf, unsigned char len) +read_bytes_msb (__xdata unsigned char *buf, unsigned char len) { while (len-- != 0){ *buf++ = read_byte_msb (); diff --git a/firmware/src/usrp2/spi.h b/firmware/src/usrp2/spi.h index 12bc5e5..0ee6882 100644 --- a/firmware/src/usrp2/spi.h +++ b/firmware/src/usrp2/spi.h @@ -31,13 +31,13 @@ unsigned char spi_read (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - xdata unsigned char *buf, unsigned char len); + __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char spi_write (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - const xdata unsigned char *buf, unsigned char len); + const __xdata unsigned char *buf, unsigned char len); #endif /* INCLUDED_SPI_H */ diff --git a/firmware/src/usrp2/usrp_main.c b/firmware/src/usrp2/usrp_main.c index c7c09f8..9e95f16 100644 --- a/firmware/src/usrp2/usrp_main.c +++ b/firmware/src/usrp2/usrp_main.c @@ -62,7 +62,7 @@ * into hash1. */ #define USRP_HASH_SIZE 16 -xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; +__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; static void get_ep0_data (void) @@ -304,7 +304,7 @@ * Toggle led 0 */ void -isr_tick (void) interrupt +isr_tick (void) __interrupt { static unsigned char count = 1; @@ -323,8 +323,8 @@ void patch_usb_descriptors(void) { - static xdata unsigned char hw_rev; - static xdata unsigned char serial_no[8]; + static __xdata unsigned char hw_rev; + static __xdata unsigned char serial_no[8]; unsigned char i; eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id diff --git a/firmware/src/usrp2/usrp_rev2_regs.h b/firmware/src/usrp2/usrp_rev2_regs.h index a4f1d98..4390f13 100644 --- a/firmware/src/usrp2/usrp_rev2_regs.h +++ b/firmware/src/usrp2/usrp_rev2_regs.h @@ -47,9 +47,9 @@ #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) -sbit at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A -sbit at 0x80+1 bitS_OUT; // out from FX2 point of view -sbit at 0x80+2 bitS_IN; // in from FX2 point of view +__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A +__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view +__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ @@ -85,8 +85,8 @@ #define bmPC_LED0 bmBIT6 // active low #define bmPC_LED1 bmBIT7 // active low -sbit at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C -sbit at 0xA0+3 bitALTERA_DCLK; +__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C +__sbit __at 0xA0+3 bitALTERA_DCLK; #define bmALTERA_BITS (bmALTERA_DATA0 \ -- To view, visit https://gerrit.osmocom.org/12529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd Gerrit-Change-Number: 12529 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 16:59:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 16:59:02 +0000 Subject: Change in libusrp[master]: Re-enable build of usrp FX2 firmware Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12530 Change subject: Re-enable build of usrp FX2 firmware ...................................................................... Re-enable build of usrp FX2 firmware Back in FIXE, for some reason building the USRP1 FX2 firmware was disabled. Let's re-enable it, as the FX2 firmware is required as an essential part of USRP1 device operation. It's loaded into the FX2 RAM over USB after the initial USB attach. As the firmware code has meanwhile been ported to a more modern SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust the required minimum SDCC version. Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b --- M configure.ac M firmware/Makefile.am M m4/usrp_sdcc.m4 3 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/30/12530/1 diff --git a/configure.ac b/configure.ac index d55e4b2..ac486bc 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) +USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])]) + AC_CONFIG_FILES([ Makefile usrp.pc @@ -92,6 +94,10 @@ host/apps/Makefile firmware/Makefile firmware/include/Makefile + firmware/lib/Makefile + firmware/src/Makefile + firmware/src/common/Makefile + firmware/src/usrp2/Makefile fpga/Makefile fpga/rbf/Makefile fpga/rbf/rev2/Makefile diff --git a/firmware/Makefile.am b/firmware/Makefile.am index edef571..9c0da35 100644 --- a/firmware/Makefile.am +++ b/firmware/Makefile.am @@ -19,5 +19,4 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = include -# compilation broken: SUBDIR += lib src +SUBDIRS = include lib src diff --git a/m4/usrp_sdcc.m4 b/m4/usrp_sdcc.m4 index 3aae0bf..ca5550c 100644 --- a/m4/usrp_sdcc.m4 +++ b/m4/usrp_sdcc.m4 @@ -21,7 +21,7 @@ [ sdccok=yes AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) - AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) + AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) if test "$XCC" = "no" -o "$XAS" = "no" ; then AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net]) -- To view, visit https://gerrit.osmocom.org/12530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b Gerrit-Change-Number: 12530 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 16:59:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 16:59:03 +0000 Subject: Change in libusrp[master]: debian: Make sure the FX2 firmware is packaged Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12531 Change subject: debian: Make sure the FX2 firmware is packaged ...................................................................... debian: Make sure the FX2 firmware is packaged Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 --- M debian/libusrp-firmware.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/31/12531/1 diff --git a/debian/libusrp-firmware.install b/debian/libusrp-firmware.install index 741c2eb..5fc4676 100644 --- a/debian/libusrp-firmware.install +++ b/debian/libusrp-firmware.install @@ -1 +1,2 @@ usr/share/usrp/*/*.rbf +usr/share/usrp/*/*.ihx -- To view, visit https://gerrit.osmocom.org/12531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 Gerrit-Change-Number: 12531 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:02:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:02:05 +0000 Subject: Change in libusrp[master]: Re-enable build of usrp FX2 firmware In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12530 to look at the new patch set (#2). Change subject: Re-enable build of usrp FX2 firmware ...................................................................... Re-enable build of usrp FX2 firmware Back in df354005f35c072976bfd6f1b031827cf3fa2e98, for some reason building the USRP1 FX2 firmware was disabled. Let's re-enable it, as the FX2 firmware is required as an essential part of USRP1 device operation. It's loaded into the FX2 RAM over USB after the initial USB attach. As the firmware code has meanwhile been ported to a more modern SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust the required minimum SDCC version. Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b --- M configure.ac M firmware/Makefile.am M m4/usrp_sdcc.m4 3 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/30/12530/2 -- To view, visit https://gerrit.osmocom.org/12530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b Gerrit-Change-Number: 12530 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:02:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:02:05 +0000 Subject: Change in libusrp[master]: debian: Make sure the FX2 firmware is packaged In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12531 to look at the new patch set (#2). Change subject: debian: Make sure the FX2 firmware is packaged ...................................................................... debian: Make sure the FX2 firmware is packaged Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 --- M debian/libusrp-firmware.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/31/12531/2 -- To view, visit https://gerrit.osmocom.org/12531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 Gerrit-Change-Number: 12531 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:05:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:05:13 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 4: was there any feedback yet to my question raised on January 7: "Doesn't every RAN connection have a fsm instance? why not simply log through that FSM and use that FSMs log level / subsystem?" -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 17:05:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:06:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:06:09 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 11 Jan 2019 17:06:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:06:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:06:34 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12522 ) Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 17:06:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:07:30 +0000 Subject: Change in libusrp[master]: Re-enable build of usrp FX2 firmware In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12530 ) Change subject: Re-enable build of usrp FX2 firmware ...................................................................... Patch Set 2: ok, this is failing as our build slaves don't have sdcc installed yet. Need to fix this before re-triggering the build -- To view, visit https://gerrit.osmocom.org/12530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b Gerrit-Change-Number: 12530 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 17:07:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:08:39 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:08:39 +0000 Subject: Change in libosmocore[master]: change GSM48_CMSERV_* to enum type, add names In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12521 ) Change subject: change GSM48_CMSERV_* to enum type, add names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c2a7adc45ab7a1a7519168e965e7d805e1481ff Gerrit-Change-Number: 12521 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 17:08:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:09:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:09:46 +0000 Subject: Change in osmo-msc[master]: transaction: drop unused ti_flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: transaction: drop unused ti_flag ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 17:09:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:10:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:10:09 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore output files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12495 ) Change subject: ignore output files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 Gerrit-Change-Number: 12495 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:10:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:11:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:11:59 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12496 ) Change subject: add USB DFU description ...................................................................... Patch Set 1: Code-Review-1 I thought we wanted to make it LGPL-2.1-or-later? -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:11:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:12:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:12:04 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore gdb history file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12497 ) Change subject: ignore gdb history file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3acf07ad7404fa3981baf65dab2a3ef416f9938 Gerrit-Change-Number: 12497 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:12:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:12:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:12:14 +0000 Subject: Change in osmo-asf4-dfu[master]: fix USB enabling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12498 ) Change subject: fix USB enabling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22cdd77648ac21490909423bf529fb31f30d6af0 Gerrit-Change-Number: 12498 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:12:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:12:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:12:34 +0000 Subject: Change in osmo-asf4-dfu[master]: add documentation and fix timeout value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12499 ) Change subject: add documentation and fix timeout value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8 Gerrit-Change-Number: 12499 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:12:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:12:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:12:45 +0000 Subject: Change in osmo-asf4-dfu[master]: add initial DFU class request handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12500 ) Change subject: add initial DFU class request handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf Gerrit-Change-Number: 12500 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:12:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:13:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:13:00 +0000 Subject: Change in osmo-asf4-dfu[master]: add flash ASF4 driver In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12501 ) Change subject: add flash ASF4 driver ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5eccb37da64c7def7b99418773d09b6d98664432 Gerrit-Change-Number: 12501 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:13:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:13:11 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:13:11 +0000 Subject: Change in osmo-asf4-dfu[master]: add code to initialize flash In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12502 ) Change subject: add code to initialize flash ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a208abb39a9da8796e2a4bcb803ce32686cb95f Gerrit-Change-Number: 12502 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:13:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:13:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:13:22 +0000 Subject: Change in osmo-asf4-dfu[master]: add system LED initialisation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12503 ) Change subject: add system LED initialisation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79f1b769fc9dd7e1a972bacf0928ff46988f0e36 Gerrit-Change-Number: 12503 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:13:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:14:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:14:00 +0000 Subject: Change in osmo-asf4-dfu[master]: switch to LGPLv2 license In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12504 ) Change subject: switch to LGPLv2 license ...................................................................... Patch Set 1: let's squash this one with the first commit to ensure the license text is correct from the first commit onwards -- To view, visit https://gerrit.osmocom.org/12504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I235997ff9f4e597300697d1bd5a18caefd49c314 Gerrit-Change-Number: 12504 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:14:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:15:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:15:02 +0000 Subject: Change in osmo-asf4-dfu[master]: declare variables so the main loop can read the data to be flashed pr... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12505 ) Change subject: declare variables so the main loop can read the data to be flashed provided by the USB stack ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12505/1/usb/class/dfu/device/dfudf.c File usb/class/dfu/device/dfudf.c: https://gerrit.osmocom.org/#/c/12505/1/usb/class/dfu/device/dfudf.c at 37 PS1, Line 37: enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_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_progress = 0; : bool dfu_manifestation_complete = false; you could wrapp all of these into some 'struct dfu_state' and then have one 'struct dfu_state g_dfu' or something like that to avoid cluttering lots of global symbols in the namespace. But that's just a thought, nothing required. -- To view, visit https://gerrit.osmocom.org/12505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I092357aad95abef1a781be1ea77944f2ea523dab Gerrit-Change-Number: 12505 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:15:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:15:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:15:17 +0000 Subject: Change in osmo-asf4-dfu[master]: make USB descriptor available for the two state machines In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12506 ) Change subject: make USB descriptor available for the two state machines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e Gerrit-Change-Number: 12506 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:15:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:15:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:15:31 +0000 Subject: Change in osmo-asf4-dfu[master]: restructure and complete the USB-side DFU state machine In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12507 ) Change subject: restructure and complete the USB-side DFU state machine ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5237393c2789fdeddca2182da25ef417a2e71216 Gerrit-Change-Number: 12507 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:15:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:15:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:15:49 +0000 Subject: Change in osmo-asf4-dfu[master]: implement flashing-side of the DFU state machine In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12508 ) Change subject: implement flashing-side of the DFU state machine ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ed9cc2a22ed5e41bb59a3ce3f21ab098cec48e7 Gerrit-Change-Number: 12508 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:15:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:16:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:16:33 +0000 Subject: Change in osmo-asf4-dfu[master]: removed unused USB CDC stack In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12509 ) Change subject: removed unused USB CDC stack ...................................................................... Patch Set 1: Code-Review+2 one could want to add a CDC-ACM based serial console in parallel to DFU, but if that's the case the code could also be re-imported. -- To view, visit https://gerrit.osmocom.org/12509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1735ad4add9278be9a1fb730752377de99c4f4b Gerrit-Change-Number: 12509 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:16:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:16:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:16:40 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused ARMCC Makefile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12510 ) Change subject: remove unused ARMCC Makefile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I232502798d71c97d0e7b4adf6bb6af3fa0940bd1 Gerrit-Change-Number: 12510 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:16:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:16:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:16:46 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused example code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12511 ) Change subject: remove unused example code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I205cd02f0c9a55d22bb78e84a88a29afe31224b0 Gerrit-Change-Number: 12511 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:16:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:16:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:16:54 +0000 Subject: Change in osmo-asf4-dfu[master]: add license file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12512 ) Change subject: add license file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If7b127ddd23bd8c5d158a731d58d425cdf6330f4 Gerrit-Change-Number: 12512 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:16:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:17:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:17:27 +0000 Subject: Change in osmo-asf4-dfu[master]: set USB string to osmocom osmo-ASF4-DFU In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12513 ) Change subject: set USB string to osmocom osmo-ASF4-DFU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I001a7b6f54b3aaab04d55e84cd9ada0daa423805 Gerrit-Change-Number: 12513 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:17:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:17:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:17:35 +0000 Subject: Change in osmo-asf4-dfu[master]: enable flashing by providing real downloaded data length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12514 ) Change subject: enable flashing by providing real downloaded data length ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f16170a4b41a70d89954e2c4a841efc67a26786 Gerrit-Change-Number: 12514 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:17:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:18:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:18:09 +0000 Subject: Change in osmo-asf4-dfu[master]: use reserved bootloader get application start In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12515 ) Change subject: use reserved bootloader get application start ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dda27d6401caabb4a6470aa3fe9691f63097136 Gerrit-Change-Number: 12515 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:18:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:18:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:18:47 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12516 ) Change subject: add README file ...................................................................... Patch Set 1: Code-Review-1 let's call it README.md and use markdown syntax. cgit (and any github mirrors) will then format it nicely. -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:19:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:19:03 +0000 Subject: Change in osmo-asf4-dfu[master]: Add git-review config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12518 ) Change subject: Add git-review config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If28c2f4908f8df96b627fd42b7e122e559d9382a Gerrit-Change-Number: 12518 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 17:19:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:19:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:19:14 +0000 Subject: Change in osmo-asf4-dfu[master]: Add .gitignore file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12517 ) Change subject: Add .gitignore file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d853bc48d904c2567edb2103d590259877bbf87 Gerrit-Change-Number: 12517 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 17:19:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:20:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:20:42 +0000 Subject: Change in libosmocore[master]: LCLS: add allocator function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12491 ) Change subject: LCLS: add allocator function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12491/1/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12491/1/src/gsm/gsm0808_utils.c at 587 PS1, Line 587: r->gcr = talloc_zero(r, struct osmo_gcr_parsed); please remind me, why again was the gcr member not a static member of the struct osmo_lcls and has to be dynamically allocated? -- To view, visit https://gerrit.osmocom.org/12491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 Gerrit-Change-Number: 12491 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 11 Jan 2019 17:20:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:48:59 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 17:48:59 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 4: > Patch Set 4: > > was there any feedback yet to my question raised on January 7: > "Doesn't every RAN connection have a fsm instance? why not simply log through that FSM and use that FSMs log level / subsystem?" Sorry, missed that comment. The useful part is to use the ran_conn->fi's id as context info. FI's log level: the FI's log level is more about the level on which to see the FSM transitions. If I LOG_RAN_CONN(LOGL_ERROR), I want to log it as error, not as debug, just because the FI is on debug. FSM's subsys: a ran_conn has various stuff happening: BSSMAP, RANAP, CC, SMS, USSD, MM, RR, ... and so far a lot of logging uses the conn's (so far vsub) context as logging context info. If we used the FSM's logging subsys for all of those, then we would substantially flatten the use of logging categories. In the end all that we need from the FI is its logging context. But I realize that I can indeed use LOGPFSMSL() with identical features, in next patch set. -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 17:48:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 17:54:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 17:54:36 +0000 Subject: Change in osmo-ci[master]: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12532 Change subject: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves ...................................................................... ansible: Install 'sdcc' compiler for libusrp firmware on build slaves Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/12532/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 b2a2f2b..1429e37 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -48,6 +48,8 @@ # by LimeSuite - cmake - patchelf + # by libusrp + - sdcc - name: install build dependencies and libraries apt: -- To view, visit https://gerrit.osmocom.org/12532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 Gerrit-Change-Number: 12532 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 18:02:33 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12470 to look at the new patch set (#5). Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... add LOG_RAN_CONN() to use the conn->fi->id for context For each conn, set a default logging category, to distinguish categories for BSSMAP and RANAP based conns. LOG_RAN_CONN(): log with the conn's default category, LOG_RAN_CONN_CAT(): log with a manually set category (mostly for keeping previous DMM logging on the same category). In some places, replace LOGP() using manual context with LOG_RAN_CONN(), and remove the manual context info, now provided by the conn->fi->id. This is loosely related to inter-BSC and inter-MSC handover: to speed up refactoring, I want to avoid the need for manual logging context and just use this LOG_RAN_CONN(). Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 19 files changed, 295 insertions(+), 262 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12470/5 -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 18:02:33 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12471 to look at the new patch set (#5). Change subject: rx CM Service Req: reject double use sooner ...................................................................... rx CM Service Req: reject double use sooner When a CM Service Req is being rejected, we should do so before changing the state of the current conn. Concerning multiple CM Service Requests: in fact we should store multiple requests, but first fix the status quo of rejecting multiple requests. Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/12471/5 -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 18:02:33 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Hello dexter, Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12402 to look at the new patch set (#12). Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/iu_dummy.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 18 files changed, 11,763 insertions(+), 11,406 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/12 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 12 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 18:02:33 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12522 to look at the new patch set (#3). Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... mm_rx_id_resp(): use osmo_mi_name() Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_rest.err 5 files changed, 18 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/12522/3 -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:02:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 18:02:38 +0000 Subject: Change in osmo-ci[master]: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12532 ) Change subject: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 Gerrit-Change-Number: 12532 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 18:02:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 18:07:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 18:07:57 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 11 Jan 2019 18:07:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:18:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 19:18:03 +0000 Subject: Change in libusrp[master]: firmware: Fix include directory path names In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12528 ) Change subject: firmware: Fix include directory path names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 Gerrit-Change-Number: 12528 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 19:18:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:18:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 19:18:05 +0000 Subject: Change in libusrp[master]: firmware: Port to more modern SDCC syntax. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12529 ) Change subject: firmware: Port to more modern SDCC syntax. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd Gerrit-Change-Number: 12529 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 19:18:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:18:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 19:18:07 +0000 Subject: Change in libusrp[master]: Re-enable build of usrp FX2 firmware In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12530 ) Change subject: Re-enable build of usrp FX2 firmware ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b Gerrit-Change-Number: 12530 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 19:18:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:18:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 19:18:09 +0000 Subject: Change in libusrp[master]: debian: Make sure the FX2 firmware is packaged In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12531 ) Change subject: debian: Make sure the FX2 firmware is packaged ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 Gerrit-Change-Number: 12531 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 11 Jan 2019 19:18:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:20:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 19:20:29 +0000 Subject: Change in libusrp[master]: firmware: Fix include directory path names In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12528 ) Change subject: firmware: Fix include directory path names ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 Gerrit-Change-Number: 12528 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 19:20:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 19:26:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 11 Jan 2019 19:26:34 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 29: feedback on some of my initial concerns, which we talked about in person: TLDR: all of my higher level concerns are addressed and we're good to go. - paging: the SGs indeed registers the subscriber with the 2G MSC, after which it stays valid in the VLR without a timeout, i.e. without periodic LU being required. - HLR: the SGs indeed contacts the HLR correctly. After it has registered a subscriber in the VLR including a GSUP LU procedure, it stays in the VLR until an IMSI Detach or until the SGs interface goes down, so a vlr_susbcr_find_*() is indeed sufficient. - inter-MSC HO: the SGs interface state is already placed in the vlr_subscr struct, hence there will be no need to separate it from the ran_conn in order to keep the SGs at the MSC-A. -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 11 Jan 2019 19:26:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 21:42:37 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 21:42:37 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 12: I really need to move this work forward, so feel free to submit a patch that makes everything const. Personally, I don't think it really deserves -1. -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 11 Jan 2019 21:42:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 21:42:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 21:42:40 +0000 Subject: Change in osmo-trx[master]: usrp1: Remove uninitialized skipRx logic Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12533 Change subject: usrp1: Remove uninitialized skipRx logic ...................................................................... usrp1: Remove uninitialized skipRx logic There appears to have been some logic to operate a USRP1 in transmit-only GSM mode. This is achieved using the skipRx member of the transceiver object. However, there's nobody that ever initializes it properly, and hence the feature is not possible to use anyway. I don't think this has any valid use case, so let's remove it. Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f --- M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 2 files changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/33/12533/1 diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 5d19514..a8f1638 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -100,7 +100,6 @@ string rbf = "std_inband.rbf"; //string rbf = "inband_1rxhb_1tx.rbf"; m_uRx.reset(); - if (!skipRx) { try { m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make( 0, decimRate * tx_sps, 1, -1, @@ -122,7 +121,6 @@ m_uRx.reset(); return -1; } - } try { m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make( @@ -145,7 +143,7 @@ return -1; } - if (!skipRx) m_uRx->stop(); + m_uRx->stop(); m_uTx->stop(); #endif @@ -188,10 +186,10 @@ { LOGC(DDEV, INFO) << "starting USRP..."; #ifndef SWLOOPBACK - if (!m_uRx && !skipRx) return false; + if (!m_uRx) return false; if (!m_uTx) return false; - if (!skipRx) m_uRx->stop(); + m_uRx->stop(); m_uTx->stop(); writeLock.lock(); @@ -221,10 +219,7 @@ isAligned = false; - if (!skipRx) started = (m_uRx->start() && m_uTx->start()); - else - started = m_uTx->start(); return started; #else gettimeofday(&lastReadTime,NULL); diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 451b5a9..521d81d 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -55,7 +55,6 @@ unsigned long long samplesWritten; ///< number of samples sent to USRP bool started; ///< flag indicates USRP has started - bool skipRx; ///< set if USRP is transmit-only. static const unsigned int currDataSize_log2 = 21; static const unsigned long currDataSize = (1 << currDataSize_log2); -- To view, visit https://gerrit.osmocom.org/12533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f Gerrit-Change-Number: 12533 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 21:42:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 21:42:41 +0000 Subject: Change in osmo-trx[master]: usrp1: Fix formatting of log message (missing space) Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12534 Change subject: usrp1: Fix formatting of log message (missing space) ...................................................................... usrp1: Fix formatting of log message (missing space) Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 --- M Transceiver52M/device/usrp1/USRPDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/34/12534/1 diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index a8f1638..2343fb6 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -606,7 +606,7 @@ return true; } else { - LOGC(DDEV, ALERT) << "set TX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set TX: " << wFreq << " failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -631,7 +631,7 @@ return true; } else { - LOGC(DDEV, ALERT) << "set RX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set RX: " << wFreq << " failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; -- To view, visit https://gerrit.osmocom.org/12534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 Gerrit-Change-Number: 12534 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 21:42:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 21:42:44 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: accept MT SMS messages over GSUP Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c 5 files changed, 164 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified Objections: Max: I would prefer this is not merged as is diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index b739918..4297cdb 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -42,6 +42,10 @@ int gsm411_send_sms(struct gsm_network *net, struct vlr_subscr *vsub, struct gsm_sms *sms); +int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, + size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, + size_t sm_rp_ud_len, const uint8_t *sm_rp_ud); + void gsm411_sapi_n_reject(struct ran_conn *conn); int gsm411_send_rp_ack(struct gsm_trans *trans, uint8_t msg_ref); diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h index 94ff8f6..969eaba 100644 --- a/include/osmocom/msc/gsm_04_11_gsup.h +++ b/include/osmocom/msc/gsm_04_11_gsup.h @@ -12,3 +12,9 @@ uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len); int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg); + +int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr); +int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, + uint8_t sm_rp_mr, uint8_t cause); +int gsm411_gsup_mt_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7ff8681..686194f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1810,6 +1810,11 @@ DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n"); return gsm411_gsup_mo_handler(vsub, gsup_msg); + /* GSM 04.11 code implementing MT SMS */ + case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: + DEBUGP(DMSC, "Routed to GSM 04.11 MT handler\n"); + return gsm411_gsup_mt_handler(vsub, gsup_msg); + default: LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n", osmo_gsup_message_type_name(gsup_msg->message_type)); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 788a0a9..15a92d4 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -158,10 +158,13 @@ gsm411_smc_recv(&trans->sms.smc_inst, GSM411_MMSMS_REL_IND, NULL, 0); - /* Notify the SMSqueue and free stored SMS */ - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); - trans->sms.sms = NULL; - sms_free(sms); + /* gsm411_send_rp_data() doesn't set trans->sms.sms */ + if (sms != NULL) { + /* Notify the SMSqueue and free stored SMS */ + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); + trans->sms.sms = NULL; + sms_free(sms); + } /* Destroy this transaction */ trans_free(trans); @@ -794,6 +797,11 @@ * successfully received a SMS. We can now safely mark it as * transmitted */ + if (trans->net->sms_over_gsup) { + /* Forward towards SMSC via GSUP */ + return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); + } + if (!sms) { LOGP(DLSMS, LOGL_ERROR, "RX RP-ACK but no sms in transaction?!?\n"); return gsm411_send_rp_error(trans, rph->msg_ref, @@ -830,6 +838,11 @@ vlr_subscr_name(trans->conn->vsub), cause_len, cause, get_value_string(gsm411_rp_cause_strs, cause)); + if (trans->net->sms_over_gsup) { + /* Forward towards SMSC via GSUP */ + return gsm411_gsup_mt_fwd_sm_err(trans, rph->msg_ref, cause); + } + if (!sms) { LOGP(DLSMS, LOGL_ERROR, "RX RP-ERR, but no sms in transaction?!?\n"); @@ -1112,6 +1125,42 @@ GSM411_SM_RL_DATA_REQ); } +/* Low-level function to send raw RP-DATA to a given subscriber */ +int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, + size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, + size_t sm_rp_ud_len, const uint8_t *sm_rp_ud) +{ + struct gsm_trans *trans; + struct msgb *msg; + + /* Allocate a new transaction for MT SMS */ + trans = gsm411_alloc_mt_trans(net, vsub); + if (!trans) + return -ENOMEM; + + /* Allocate a message buffer for to be encoded SMS */ + msg = gsm411_msgb_alloc(); + if (!msg) { + trans_free(trans); + return -ENOMEM; + } + + /* Encode SM-RP-OA (SMSC address) */ + msgb_lv_put(msg, sm_rp_oa_len, sm_rp_oa); + + /* Encode SM-RP-DA (shall be empty, len=0) */ + msgb_v_put(msg, 0x00); + + /* Encode RP-UD itself (SM TPDU) */ + msgb_lv_put(msg, sm_rp_ud_len, sm_rp_ud); + + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); + + return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, + GSM411_MT_RP_DATA_MT, trans->sms.sm_rp_mr, + GSM411_SM_RL_DATA_REQ); +} + /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ int gsm0411_rcv_sms(struct ran_conn *conn, struct msgb *msg) diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 5c01072..f2de95f 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -201,3 +201,99 @@ msg_name, msg_is_err ? "Err" : "Res"); return -EINVAL; } + +int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX MT-forwardSM-Res\n"); + + /* Initialize a new GSUP message */ + gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + trans->vsub->imsi, &sm_rp_mr); + + return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg); +} + +int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, + uint8_t sm_rp_mr, uint8_t cause) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX MT-forwardSM-Err\n"); + + /* Initialize a new GSUP message */ + gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + trans->vsub->imsi, &sm_rp_mr); + + /* SM-RP-Cause value */ + gsup_msg.sm_rp_cause = &cause; + + /* TODO: include optional SM-RP-UI field if present */ + return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg); +} + +/* Handles MT SMS (and triggers Paging Request if required) */ +int gsm411_gsup_mt_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg) +{ + struct vlr_instance *vlr; + struct gsm_network *net; + int rc; + + /* Obtain required pointers */ + vlr = vsub->vlr; + net = (struct gsm_network *) vlr->user_ctx; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + + LOGP(DLSMS, LOGL_DEBUG, "RX MT-forwardSM-Req\n"); + + /* Make sure that 'SMS over GSUP' is expected */ + if (!net->sms_over_gsup) { + LOGP(DLSMS, LOGL_NOTICE, "Unexpected MT SMS over GSUP, " + "ignoring message...\n"); + /* TODO: notify sender about that? */ + return -EIO; + } + + /** + * Verify GSUP message + * + * FIXME: SM-RP-MR is not known yet (to be assigned by MSC) + * NOTE: SM-RP-DA is out of our interest + */ + if (!gsup_msg->sm_rp_mr) + goto msg_error; + if (!gsup_msg->sm_rp_ui) + goto msg_error; + + /* SM-RP-OA shall contain SMSC address */ + if (gsup_msg->sm_rp_oa_type != OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR) + goto msg_error; + + /* Send RP-DATA */ + rc = gsm411_send_rp_data(net, vsub, + gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa, + gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); + if (rc) { + LOGP(DLSMS, LOGL_NOTICE, "Failed to send MT SMS, " + "ignoring MT-forwardSM-Req message...\n"); + /* TODO: notify sender about that? */ + return rc; + } + + return 0; + +msg_error: + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "RX malformed MT-forwardSM-Req\n"); + return -EINVAL; +} -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 13 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 21:42:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 Jan 2019 21:42:49 +0000 Subject: Change in osmo-trx[master]: cosmetic: Don't call the SDR "USRP" in error message Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12535 Change subject: cosmetic: Don't call the SDR "USRP" in error message ...................................................................... cosmetic: Don't call the SDR "USRP" in error message Transceiver.cpp is used for all SDR hardware we support, not just USRP. Change-Id: I9b7ddb0d679f111407704048ef3ddd964db49441 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/12535/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 442853f..df1c0bd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -388,7 +388,7 @@ state = &mStates[i]; while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->USRP interface (" + LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; if (state->mRetrans) updateFillerTable(i, burst); -- To view, visit https://gerrit.osmocom.org/12535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b7ddb0d679f111407704048ef3ddd964db49441 Gerrit-Change-Number: 12535 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 22:44:04 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 22:44:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Fri, 11 Jan 2019 22:44:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 22:44:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 22:44:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Patch Set 9: Code-Review+2 Recovering Harald's +2. -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Fri, 11 Jan 2019 22:44:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 22:44:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 22:44:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} The idea of this test case is to verify MT SMS transmission initiated by ESME over GSUP. Basically, the algorythm is the following: 1.0 send MT-ForwardSM-Req on GSUP, 1.1 expect Paging Request on RAN, 1.2 establish a RAN connection, 1.3 expect CP-DATA/RP-DATA on BSSAP/DTAP, 2.1 send CP-DATA/RP-ACK on BSSAP/DTAP, 2.2.a expect MT-ForwardSM-Res, 2.2.b expect MT-ForwardSM-Err. Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 151 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 96ddc8d..b7a02a7 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2196,6 +2196,153 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Helper for sending MT SMS over GSUP */ +private function f_gsup_forwardSM_req(SmsParameters spars, OCT1 mms := '00'O) +runs on BSC_ConnHdlr { + 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)), + /* Encoded SMS TPDU (taken from Wireshark) + * FIXME: we should encode spars somehow */ + sm_rp_ui := '00068021436500008111328130858200'O, + sm_rp_mms := mms + )); +} + +/* Test successful MT-SMS (RP-ACK) over GSUP */ +private function f_tc_gsup_mt_sms_ack(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ? + ); + + /* Submit a MT SMS on GSUP */ + f_gsup_forwardSM_req(spars); + + /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars); + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_ack() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(90); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_sms_ack), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + +/* Test rejected MT-SMS (RP-ERROR) over GSUP */ +private function f_tc_gsup_mt_sms_err(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var OCT1 sm_rp_cause := '78'O; /* dummy RP-Cause value */ + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ?, + sm_rp_cause := sm_rp_cause + ); + + /* Submit a MT SMS on GSUP */ + f_gsup_forwardSM_req(spars); + + /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ERROR and expect MT-forwardSM-Err on GSUP */ + f_mt_sms_send_rp_error(spars, oct2int(sm_rp_cause)); + alt { + [] GSUP.receive(mt_forwardSM_err) { + log("RX MT-forwardSM-Err (RP-ERROR)"); + setverdict(pass); + mtc.stop; + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_err() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(91); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_sms_err), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -4057,6 +4204,8 @@ execute( TC_gsup_mo_sms() ); execute( TC_gsup_mo_smma() ); + execute( TC_gsup_mt_sms_ack() ); + execute( TC_gsup_mt_sms_err() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 8a5822d..7a35296 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -65,6 +65,8 @@ + + -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 11 22:44:33 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 11 Jan 2019 22:44:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12058 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms The idea of this test case is to verify the process of multi-part MT SMS transmission. The MSC should keep the RAN connection until the last message part is transmitted. Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 73 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, approved Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index b7a02a7..05f8fd9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2343,6 +2343,77 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Test multi-part MT-SMS over GSUP */ +private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ? + ); + + /* Send 4 messages (NOTE: SM-RP-UI remains unchanged) */ + for (var integer i := 3; i >= 0; i := i-1) { + /* Submit a MT SMS on GSUP (MMS is decremented) */ + f_gsup_forwardSM_req(spars, int2oct(i, 1)); + + /* Expect Paging Request and Establish connection */ + if (i == 3) { /* ... only once! */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + } + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars); + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Keep some 'distance' between transmissions */ + f_sleep(1.5); + } + + f_expect_clear(); +} +testcase TC_gsup_mt_multi_part_sms() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(91); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_multi_part_sms), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -4206,6 +4277,7 @@ execute( TC_gsup_mo_smma() ); execute( TC_gsup_mt_sms_ack() ); execute( TC_gsup_mt_sms_err() ); + execute( TC_gsup_mt_multi_part_sms() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 7a35296..8a19d5b 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -67,6 +67,7 @@ + -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 00:24:02 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 00:24:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12536 Change subject: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB ...................................................................... BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB It was observed that 'BTS_Tests.TC_rach_max_ta' started to fail with the following reason: "BTS_Tests.ttcn:1091 : RACH passed but was expected to be dropped: -2560". My initial assumption was that the test case basically sends FAKE_TOA command on a wrong TRXC interface, and it was confirmed using trx_sniff.py: # TRXD of the BB side $ ./trx_sniff.py -p 6700 [DEBUG] trx_sniff.py:110 L1 -> TRX burst: fn=616 tn=0 pwr=0 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=597 tn=0 rssi=-60 toa256=-2560 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=598 tn=0 rssi=-60 toa256=-2560 ... # TRXD of the BTS side (Uplink bursts only) $ ./trx_sniff.py -p 5700 --direction L1 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=719 tn=0 rssi=-60 toa256=0 and additionally be enriching logging messages of fake_trx.py: [DEBUG] fake_trx.py:186 (trx at 0.0.0.0:6700) Recv FAKE_TOA cmd Sending FAKE_* commands on TRXC interface of the BB side affects the bursts being forwarded to this side, so we should use the TRXC interface of the BTS side to simulate Uplink delay. The reason why the test case has been passing some time ago is that there was a bug in fake_trx.py, that has been fixed recently. This patch makes 'BTS_Tests.TC_rach_max_ta' green again ;) Change-Id: I7736abd85407c186856be9f1a22613a1fa6e0c32 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/12536/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0de787a..f7caac2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -50,8 +50,8 @@ charstring mp_rsl_ip := "127.0.0.2"; integer mp_rsl_port := 3003; integer mp_trx0_arfcn := 871; - charstring mp_bb_trxc_ip := "127.0.0.1"; - integer mp_bb_trxc_port := 6701; + charstring mp_bts_trxc_ip := "127.0.0.1"; + integer mp_bts_trxc_port := 5701; charstring mp_pcu_socket := PCU_SOCK_DEFAULT; charstring mp_ctrl_ip := "127.0.0.1"; integer mp_ctrl_port := 4238; @@ -81,8 +81,8 @@ port L1CTL_PT L1CTL; /* TRXC port (for classic tests) */ - port TRXC_CODEC_PT BB_TRXC; - var integer g_bb_trxc_conn_id; + port TRXC_CODEC_PT BTS_TRXC; + var integer g_bts_trxc_conn_id; /* VTY connections to both BTS and BSC */ port TELNETasp_PT BTSVTY; @@ -123,8 +123,8 @@ type component ConnHdlr extends RSL_DchanHdlr { port L1CTL_PT L1CTL; - port TRXC_CODEC_PT BB_TRXC; - var integer g_bb_trxc_conn_id; + port TRXC_CODEC_PT BTS_TRXC; + var integer g_bts_trxc_conn_id; timer g_Tguard; timer g_Tmeas_exp := 2.0; /* >= 103 SACCH multiframe ~ 500ms */ @@ -316,7 +316,7 @@ }; /* FIXME: FACCH/H is unreliable with calypso firmware, see OS#3653 */ - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { g_AllChanTypes := { /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), @@ -358,11 +358,11 @@ map(self:PCU, system:PCU); f_init_pcu(PCU, id, g_pcu_conn_id, g_pcu_last_info); - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { var TrxcMessage ret; /* start with a default moderate timing offset equalling TA=2 */ f_main_trxc_connect(); - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); } } @@ -418,24 +418,24 @@ } private function f_trxc_connect() runs on ConnHdlr { - map(self:BB_TRXC, system:BB_TRXC); + map(self:BTS_TRXC, system:BTS_TRXC); var Result res; - res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, + res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC, mp_bts_trxc_ip, mp_bts_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } - g_bb_trxc_conn_id := res.connId; + g_bts_trxc_conn_id := res.connId; } private function f_trxc_fake_rssi(uint8_t rssi) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); } private function f_trx_fake_toffs256(int16_t toffs256) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); } /* first function started in ConnHdlr component */ @@ -447,7 +447,7 @@ map(self:L1CTL, system:L1CTL); f_connect_reset(L1CTL); - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { f_trxc_connect(); } @@ -1060,20 +1060,20 @@ } private function f_main_trxc_connect() runs on test_CT { - map(self:BB_TRXC, system:BB_TRXC); + map(self:BTS_TRXC, system:BTS_TRXC); var Result res; - res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, + res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC, mp_bts_trxc_ip, mp_bts_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } - g_bb_trxc_conn_id := res.connId; + g_bts_trxc_conn_id := res.connId; } private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT { var TrxcMessage ret; /* tell fake_trx to use a given timing offset for all bursts */ - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); f_sleep(0.5); /* Transmit RACH request + wait for confirmation */ @@ -1415,7 +1415,7 @@ f_l1_tune(L1CTL); RSL.clear; - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp)); f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); } -- To view, visit https://gerrit.osmocom.org/12536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7736abd85407c186856be9f1a22613a1fa6e0c32 Gerrit-Change-Number: 12536 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 00:28:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 00:28:53 +0000 Subject: Change in docker-playground[master]: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12537 Change subject: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter ...................................................................... BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter In I7736abd85407c186856be9f1a22613a1fa6e0c32 'mp_bb_trxc_ip' was renamed to 'mp_bts_trxc_ip'. Let's correct the config. Depends-On: (TTCN) I7736abd85407c186856be9f1a22613a1fa6e0c32 Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/12537/1 diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 2f5d752..da1c908 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -9,7 +9,7 @@ [MODULE_PARAMETERS] BTS_Tests.mp_rsl_ip := "172.18.9.10" -BTS_Tests.mp_bb_trxc_ip := "172.18.9.21" +BTS_Tests.mp_bts_trxc_ip := "172.18.9.21" BTS_Tests.mp_pcu_socket := "/data/unix/pcu_sock" L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" -- To view, visit https://gerrit.osmocom.org/12537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe Gerrit-Change-Number: 12537 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 01:34:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 01:34:24 +0000 Subject: Change in osmo-trx[master]: usrp1: Remove uninitialized skipRx logic In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12533 ) Change subject: usrp1: Remove uninitialized skipRx logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f Gerrit-Change-Number: 12533 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 01:34:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 01:34:41 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 01:34:41 +0000 Subject: Change in osmo-trx[master]: usrp1: Fix formatting of log message (missing space) In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12534 ) Change subject: usrp1: Fix formatting of log message (missing space) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 Gerrit-Change-Number: 12534 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 01:34:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 12 07:37:07 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 Jan 2019 07:37:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8063?= Message-ID: <1097618549.531.1547278627591.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 241.74 KB...] checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMOGB... yes checking for LIBOSMONETIF... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBGTP... yes checking for LIBCARES... yes checking for ANSI C header files... (cached) yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sgsn/Makefile config.status: creating src/Makefile config.status: creating src/gprs/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gprs/Makefile config.status: creating tests/gbproxy/Makefile config.status: creating tests/sgsn/Makefile config.status: creating tests/gtphub/Makefile config.status: creating tests/xid/Makefile config.status: creating tests/sndcp_xid/Makefile config.status: creating tests/slhc/Makefile config.status: creating tests/v42bis/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0.120-88220 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmosgsn-vty-reference.xml + mkdir -p generated + cp ./vty/sgsn_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + [ -n ./vty/sgsn_vty_additions.xml ] + realpath ./vty/sgsn_vty_additions.xml + addition=/build/doc/manuals/vty/sgsn_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # ./srcfile.adoc. osmosgsn-usermanual.adoc is the ./srcfile.adoc, + mv generated/combined.xml generated/combine_src.xml # is like basename from coreutils, and . is WD. if ! [ -f osmosgsn-usermanual.adoc ]; then \ ln -s osmosgsn-usermanual.adoc osmosgsn-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/sgsn_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0-120-g88220" -a revdate="2018-Nov-14" osmosgsn-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmosgsn-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmosgsn-vty-reference.pdf osmosgsn-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmosgsn-vty-reference.pdf 'osmosgsn-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in sgsn make[4]: Entering directory '/build/include/osmocom/sgsn' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/sgsn' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in gprs make[3]: Entering directory '/build/src/gprs' CC gb_proxy.o CC gb_proxy_main.o CC gb_proxy_vty.o CC gb_proxy_patch.o CC gprs_gb_parse.o CC gb_proxy_tlli.o CC gb_proxy_peer.o CC gb_proxy_ctrl.o CC gprs_llc_parse.o CC crc24.o CC gprs_utils.o CC gprs_gmm_attach.o CC gprs_gmm.o gprs_gmm.c: In function 'gsm0408_gprs_rcvmsg_iu': gprs_gmm.c:2880:9: note: #pragma message: set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS? #pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" ^ CC gprs_sgsn.o gprs_llc_parse.c: In function 'gprs_llc_hdr_parse': gprs_llc_parse.c:250:1: internal compiler error: Segmentation fault } ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. CC gprs_sndcp.o CC gprs_sndcp_comp.o CC gprs_sndcp_dcomp.o The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:600: recipe for target 'gprs_llc_parse.o' failed make[3]: *** [gprs_llc_parse.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/gprs' Makefile:379: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:441: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:372: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Jan 12 07:42:19 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 Jan 2019 07:42:19 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norm?= =?UTF-8?Q?al_:_master-osmo-sgsn_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8064?= In-Reply-To: <1097618549.531.1547278627591.JavaMail.jenkins@jenkins.osmocom.org> References: <1097618549.531.1547278627591.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2097154525.532.1547278939852.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:45:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:45:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12536 ) Change subject: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7736abd85407c186856be9f1a22613a1fa6e0c32 Gerrit-Change-Number: 12536 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 12 Jan 2019 09:45:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:01 +0000 Subject: Change in docker-playground[master]: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12537 ) Change subject: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe Gerrit-Change-Number: 12537 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 12 Jan 2019 09:46:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:42 +0000 Subject: Change in libusrp[master]: firmware: Fix include directory path names In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12528 ) Change subject: firmware: Fix include directory path names ...................................................................... firmware: Fix include directory path names When we forked libusrp from the gnuradio source archive, we moved around the directories, but failed to adjust the FW_INCLUDES. Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 --- M firmware/lib/Makefile.am M firmware/src/usrp2/Makefile.am 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/firmware/lib/Makefile.am b/firmware/lib/Makefile.am index a6790f0..a791031 100644 --- a/firmware/lib/Makefile.am +++ b/firmware/lib/Makefile.am @@ -30,7 +30,7 @@ DEFINES= -FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include +FW_INCLUDES=-I$(top_srcdir)/firmware/include # with EA = 0, the FX2 implements a portion of the 8051 "external memory" # on chip. This memory is mapped like this: diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am index 4402cd6..24ff9b1 100644 --- a/firmware/src/usrp2/Makefile.am +++ b/firmware/src/usrp2/Makefile.am @@ -54,10 +54,10 @@ DEFINES=-DHAVE_USRP2 -FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \ - -I$(top_srcdir)/usrp/firmware/src/usrp2 \ - -I$(top_srcdir)/usrp/firmware/src/common \ - -I$(top_builddir)/usrp/firmware/src/common +FW_INCLUDES=-I$(top_srcdir)/firmware/include \ + -I$(top_srcdir)/firmware/src/usrp2 \ + -I$(top_srcdir)/firmware/src/common \ + -I$(top_builddir)/firmware/src/common # with EA = 0, the FX2 implements a portion of the 8051 "external memory" # on chip. This memory is mapped like this: -- To view, visit https://gerrit.osmocom.org/12528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 Gerrit-Change-Number: 12528 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:43 +0000 Subject: Change in libusrp[master]: firmware: Port to more modern SDCC syntax. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12529 ) Change subject: firmware: Port to more modern SDCC syntax. ...................................................................... firmware: Port to more modern SDCC syntax. SDCC, at least from version 3 onwards, has change the names of special attributes like "at" or "sfr". They are now all prefixed with double- underscores. Upstream fx2lib has made that change in commit 3071389d9a868ed553b84809b399008648536fcf which can be obtained from https://github.com/djmuhlestein/fx2lib/pull/1/commits/3071389d9a868ed553b84809b399008648536fcf Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd --- M firmware/include/fx2regs.h M firmware/include/i2c.h M firmware/include/syncdelay.h M firmware/include/usb_common.h M firmware/include/usb_descriptors.h M firmware/lib/delay.c M firmware/lib/i2c.c M firmware/lib/isr.c M firmware/lib/usb_common.c M firmware/src/common/fpga_load.c M firmware/src/common/fpga_load.h M firmware/src/usrp2/board_specific.c M firmware/src/usrp2/eeprom_init.c M firmware/src/usrp2/eeprom_io.c M firmware/src/usrp2/eeprom_io.h M firmware/src/usrp2/fpga_rev2.c M firmware/src/usrp2/spi.c M firmware/src/usrp2/spi.h M firmware/src/usrp2/usrp_main.c M firmware/src/usrp2/usrp_rev2_regs.h 20 files changed, 434 insertions(+), 434 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index 2f210f5..dec5164 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -48,14 +48,14 @@ // The Ez-USB FX2 registers are defined here. We use FX2regs.h for register // address allocation by using "#define ALLOCATE_EXTERN". // When using "#define ALLOCATE_EXTERN", you get (for instance): -// xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; +// __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; // Such lines are created from FX2.h by using the preprocessor. // Incidently, these lines will not generate any space in the resulting hex // file; they just bind the symbols to the addresses for compilation. // You just need to put "#define ALLOCATE_EXTERN" in your main program file; // i.e. fw.c or a stand-alone C source file. // Without "#define ALLOCATE_EXTERN", you just get the external reference: -// extern xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; +// extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; // This uses the concatenation operator "##" to insert a comment "//" // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. */ @@ -63,7 +63,7 @@ #ifdef ALLOCATE_EXTERN #define EXTERN -#define _AT_(a) at a +#define _AT_(a) __at a #else #define EXTERN extern #define _AT_ ;/ ## / @@ -72,163 +72,163 @@ typedef unsigned char BYTE; typedef unsigned short WORD; -EXTERN xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; -EXTERN xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; +EXTERN __xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128]; +EXTERN __xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END ; // General Configuration -EXTERN xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status -EXTERN xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration -EXTERN xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments -EXTERN xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments -EXTERN xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state -EXTERN xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint -EXTERN xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H -EXTERN xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L -EXTERN xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 -EXTERN xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities -EXTERN xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision -EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control +EXTERN __xdata _AT_(0xE600) volatile BYTE CPUCS ; // Control & Status +EXTERN __xdata _AT_(0xE601) volatile BYTE IFCONFIG ; // Interface Configuration +EXTERN __xdata _AT_(0xE602) volatile BYTE PINFLAGSAB ; // FIFO FLAGA and FLAGB Assignments +EXTERN __xdata _AT_(0xE603) volatile BYTE PINFLAGSCD ; // FIFO FLAGC and FLAGD Assignments +EXTERN __xdata _AT_(0xE604) volatile BYTE FIFORESET ; // Restore FIFOS to default state +EXTERN __xdata _AT_(0xE605) volatile BYTE BREAKPT ; // Breakpoint +EXTERN __xdata _AT_(0xE606) volatile BYTE BPADDRH ; // Breakpoint Address H +EXTERN __xdata _AT_(0xE607) volatile BYTE BPADDRL ; // Breakpoint Address L +EXTERN __xdata _AT_(0xE608) volatile BYTE UART230 ; // 230 Kbaud clock for T0,T1,T2 +EXTERN __xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR ; // FIFO polarities +EXTERN __xdata _AT_(0xE60A) volatile BYTE REVID ; // Chip Revision +EXTERN __xdata _AT_(0xE60B) volatile BYTE REVCTL ; // Chip Revision Control // Endpoint Configuration -EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration -EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration -EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration -EXTERN xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration -EXTERN xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration -EXTERN xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration -EXTERN xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration -EXTERN xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration -EXTERN xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration -EXTERN xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration -EXTERN xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) -EXTERN xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) -EXTERN xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) -EXTERN xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) -EXTERN xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) -EXTERN xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) -EXTERN xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) -EXTERN xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) -EXTERN xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H -EXTERN xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L -EXTERN xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H -EXTERN xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L -EXTERN xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H -EXTERN xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L -EXTERN xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H -EXTERN xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L -EXTERN xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) -EXTERN xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End -EXTERN xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End +EXTERN __xdata _AT_(0xE610) volatile BYTE EP1OUTCFG ; // Endpoint 1-OUT Configuration +EXTERN __xdata _AT_(0xE611) volatile BYTE EP1INCFG ; // Endpoint 1-IN Configuration +EXTERN __xdata _AT_(0xE612) volatile BYTE EP2CFG ; // Endpoint 2 Configuration +EXTERN __xdata _AT_(0xE613) volatile BYTE EP4CFG ; // Endpoint 4 Configuration +EXTERN __xdata _AT_(0xE614) volatile BYTE EP6CFG ; // Endpoint 6 Configuration +EXTERN __xdata _AT_(0xE615) volatile BYTE EP8CFG ; // Endpoint 8 Configuration +EXTERN __xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG ; // Endpoint 2 FIFO configuration +EXTERN __xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG ; // Endpoint 4 FIFO configuration +EXTERN __xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG ; // Endpoint 6 FIFO configuration +EXTERN __xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG ; // Endpoint 8 FIFO configuration +EXTERN __xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH ; // Endpoint 2 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL ; // Endpoint 2 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH ; // Endpoint 4 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL ; // Endpoint 4 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH ; // Endpoint 6 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL ; // Endpoint 6 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH ; // Endpoint 8 Packet Length H (IN only) +EXTERN __xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL ; // Endpoint 8 Packet Length L (IN only) +EXTERN __xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH ; // EP2 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL ; // EP2 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH ; // EP4 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL ; // EP4 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH ; // EP6 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL ; // EP6 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH ; // EP8 Programmable Flag trigger H +EXTERN __xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL ; // EP8 Programmable Flag trigger L +EXTERN __xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS ; // EP2 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS ; // EP4 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS ; // EP6 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS ; // EP8 (if ISO) IN Packets per frame (1-3) +EXTERN __xdata _AT_(0xE648) volatile BYTE INPKTEND ; // Force IN Packet End +EXTERN __xdata _AT_(0xE649) volatile BYTE OUTPKTEND ; // Force OUT Packet End // Interrupts -EXTERN xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable -EXTERN xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request -EXTERN xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable -EXTERN xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request -EXTERN xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable -EXTERN xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request -EXTERN xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable -EXTERN xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request -EXTERN xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable -EXTERN xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request -EXTERN xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable -EXTERN xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request -EXTERN xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables -EXTERN xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests -EXTERN xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables -EXTERN xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests -EXTERN xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable -EXTERN xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request -EXTERN xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables -EXTERN xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests -EXTERN xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit -EXTERN xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] -EXTERN xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector -EXTERN xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector -EXTERN xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup +EXTERN __xdata _AT_(0xE650) volatile BYTE EP2FIFOIE ; // Endpoint 2 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ ; // Endpoint 2 Flag Interrupt Request +EXTERN __xdata _AT_(0xE652) volatile BYTE EP4FIFOIE ; // Endpoint 4 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ ; // Endpoint 4 Flag Interrupt Request +EXTERN __xdata _AT_(0xE654) volatile BYTE EP6FIFOIE ; // Endpoint 6 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ ; // Endpoint 6 Flag Interrupt Request +EXTERN __xdata _AT_(0xE656) volatile BYTE EP8FIFOIE ; // Endpoint 8 Flag Interrupt Enable +EXTERN __xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ ; // Endpoint 8 Flag Interrupt Request +EXTERN __xdata _AT_(0xE658) volatile BYTE IBNIE ; // IN-BULK-NAK Interrupt Enable +EXTERN __xdata _AT_(0xE659) volatile BYTE IBNIRQ ; // IN-BULK-NAK interrupt Request +EXTERN __xdata _AT_(0xE65A) volatile BYTE NAKIE ; // Endpoint Ping NAK interrupt Enable +EXTERN __xdata _AT_(0xE65B) volatile BYTE NAKIRQ ; // Endpoint Ping NAK interrupt Request +EXTERN __xdata _AT_(0xE65C) volatile BYTE USBIE ; // USB Int Enables +EXTERN __xdata _AT_(0xE65D) volatile BYTE USBIRQ ; // USB Interrupt Requests +EXTERN __xdata _AT_(0xE65E) volatile BYTE EPIE ; // Endpoint Interrupt Enables +EXTERN __xdata _AT_(0xE65F) volatile BYTE EPIRQ ; // Endpoint Interrupt Requests +EXTERN __xdata _AT_(0xE660) volatile BYTE GPIFIE ; // GPIF Interrupt Enable +EXTERN __xdata _AT_(0xE661) volatile BYTE GPIFIRQ ; // GPIF Interrupt Request +EXTERN __xdata _AT_(0xE662) volatile BYTE USBERRIE ; // USB Error Interrupt Enables +EXTERN __xdata _AT_(0xE663) volatile BYTE USBERRIRQ ; // USB Error Interrupt Requests +EXTERN __xdata _AT_(0xE664) volatile BYTE ERRCNTLIM ; // USB Error counter and limit +EXTERN __xdata _AT_(0xE665) volatile BYTE CLRERRCNT ; // Clear Error Counter EC[3..0] +EXTERN __xdata _AT_(0xE666) volatile BYTE INT2IVEC ; // Interupt 2 (USB) Autovector +EXTERN __xdata _AT_(0xE667) volatile BYTE INT4IVEC ; // Interupt 4 (FIFOS & GPIF) Autovector +EXTERN __xdata _AT_(0xE668) volatile BYTE INTSETUP ; // Interrupt 2&4 Setup // Input/Output -EXTERN xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration -EXTERN xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration -EXTERN xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration -EXTERN xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status -EXTERN xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data -EXTERN xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control -EXTERN xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access -EXTERN xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access +EXTERN __xdata _AT_(0xE670) volatile BYTE PORTACFG ; // I/O PORTA Alternate Configuration +EXTERN __xdata _AT_(0xE671) volatile BYTE PORTCCFG ; // I/O PORTC Alternate Configuration +EXTERN __xdata _AT_(0xE672) volatile BYTE PORTECFG ; // I/O PORTE Alternate Configuration +EXTERN __xdata _AT_(0xE678) volatile BYTE I2CS ; // Control & Status +EXTERN __xdata _AT_(0xE679) volatile BYTE I2DAT ; // Data +EXTERN __xdata _AT_(0xE67A) volatile BYTE I2CTL ; // I2C Control +EXTERN __xdata _AT_(0xE67B) volatile BYTE XAUTODAT1 ; // Autoptr1 MOVX access +EXTERN __xdata _AT_(0xE67C) volatile BYTE XAUTODAT2 ; // Autoptr2 MOVX access #define EXTAUTODAT1 XAUTODAT1 #define EXTAUTODAT2 XAUTODAT2 // USB Control -EXTERN xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status -EXTERN xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend -EXTERN xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity -EXTERN xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control -EXTERN xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H -EXTERN xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L -EXTERN xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 -EXTERN xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address +EXTERN __xdata _AT_(0xE680) volatile BYTE USBCS ; // USB Control & Status +EXTERN __xdata _AT_(0xE681) volatile BYTE SUSPEND ; // Put chip into suspend +EXTERN __xdata _AT_(0xE682) volatile BYTE WAKEUPCS ; // Wakeup source and polarity +EXTERN __xdata _AT_(0xE683) volatile BYTE TOGCTL ; // Toggle Control +EXTERN __xdata _AT_(0xE684) volatile BYTE USBFRAMEH ; // USB Frame count H +EXTERN __xdata _AT_(0xE685) volatile BYTE USBFRAMEL ; // USB Frame count L +EXTERN __xdata _AT_(0xE686) volatile BYTE MICROFRAME ; // Microframe count, 0-7 +EXTERN __xdata _AT_(0xE687) volatile BYTE FNADDR ; // USB Function address // Endpoints -EXTERN xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H -EXTERN xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L -EXTERN xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count -EXTERN xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count -EXTERN xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H -EXTERN xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L -EXTERN xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H -EXTERN xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L -EXTERN xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H -EXTERN xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L -EXTERN xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H -EXTERN xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L -EXTERN xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status -EXTERN xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status -EXTERN xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status -EXTERN xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status -EXTERN xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status -EXTERN xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status -EXTERN xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status -EXTERN xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags -EXTERN xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags -EXTERN xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags -EXTERN xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags -EXTERN xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H -EXTERN xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L -EXTERN xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H -EXTERN xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L -EXTERN xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H -EXTERN xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L -EXTERN xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H -EXTERN xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L -EXTERN xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte -EXTERN xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte -EXTERN xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode -EXTERN xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data +EXTERN __xdata _AT_(0xE68A) volatile BYTE EP0BCH ; // Endpoint 0 Byte Count H +EXTERN __xdata _AT_(0xE68B) volatile BYTE EP0BCL ; // Endpoint 0 Byte Count L +EXTERN __xdata _AT_(0xE68D) volatile BYTE EP1OUTBC ; // Endpoint 1 OUT Byte Count +EXTERN __xdata _AT_(0xE68F) volatile BYTE EP1INBC ; // Endpoint 1 IN Byte Count +EXTERN __xdata _AT_(0xE690) volatile BYTE EP2BCH ; // Endpoint 2 Byte Count H +EXTERN __xdata _AT_(0xE691) volatile BYTE EP2BCL ; // Endpoint 2 Byte Count L +EXTERN __xdata _AT_(0xE694) volatile BYTE EP4BCH ; // Endpoint 4 Byte Count H +EXTERN __xdata _AT_(0xE695) volatile BYTE EP4BCL ; // Endpoint 4 Byte Count L +EXTERN __xdata _AT_(0xE698) volatile BYTE EP6BCH ; // Endpoint 6 Byte Count H +EXTERN __xdata _AT_(0xE699) volatile BYTE EP6BCL ; // Endpoint 6 Byte Count L +EXTERN __xdata _AT_(0xE69C) volatile BYTE EP8BCH ; // Endpoint 8 Byte Count H +EXTERN __xdata _AT_(0xE69D) volatile BYTE EP8BCL ; // Endpoint 8 Byte Count L +EXTERN __xdata _AT_(0xE6A0) volatile BYTE EP0CS ; // Endpoint Control and Status +EXTERN __xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS ; // Endpoint 1 OUT Control and Status +EXTERN __xdata _AT_(0xE6A2) volatile BYTE EP1INCS ; // Endpoint 1 IN Control and Status +EXTERN __xdata _AT_(0xE6A3) volatile BYTE EP2CS ; // Endpoint 2 Control and Status +EXTERN __xdata _AT_(0xE6A4) volatile BYTE EP4CS ; // Endpoint 4 Control and Status +EXTERN __xdata _AT_(0xE6A5) volatile BYTE EP6CS ; // Endpoint 6 Control and Status +EXTERN __xdata _AT_(0xE6A6) volatile BYTE EP8CS ; // Endpoint 8 Control and Status +EXTERN __xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS ; // Endpoint 2 Flags +EXTERN __xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS ; // Endpoint 4 Flags +EXTERN __xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS ; // Endpoint 6 Flags +EXTERN __xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS ; // Endpoint 8 Flags +EXTERN __xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH ; // EP2 FIFO total byte count H +EXTERN __xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL ; // EP2 FIFO total byte count L +EXTERN __xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH ; // EP4 FIFO total byte count H +EXTERN __xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL ; // EP4 FIFO total byte count L +EXTERN __xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH ; // EP6 FIFO total byte count H +EXTERN __xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL ; // EP6 FIFO total byte count L +EXTERN __xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH ; // EP8 FIFO total byte count H +EXTERN __xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL ; // EP8 FIFO total byte count L +EXTERN __xdata _AT_(0xE6B3) volatile BYTE SUDPTRH ; // Setup Data Pointer high address byte +EXTERN __xdata _AT_(0xE6B4) volatile BYTE SUDPTRL ; // Setup Data Pointer low address byte +EXTERN __xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL ; // Setup Data Pointer Auto Mode +EXTERN __xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8] ; // 8 bytes of SETUP data // GPIF -EXTERN xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector -EXTERN xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode -EXTERN xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states -EXTERN xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive -EXTERN xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H -EXTERN xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L +EXTERN __xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT ; // Waveform Selector +EXTERN __xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS ; // GPIF Done, GPIF IDLE drive mode +EXTERN __xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL ; // Inactive Bus, CTL states +EXTERN __xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG ; // CTL OUT pin drive +EXTERN __xdata _AT_(0xE6C4) volatile BYTE GPIFADRH ; // GPIF Address H +EXTERN __xdata _AT_(0xE6C5) volatile BYTE GPIFADRL ; // GPIF Address L -EXTERN xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 -EXTERN xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 -EXTERN xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 -EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 +EXTERN __xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3 ; // GPIF Transaction Count Byte 3 +EXTERN __xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2 ; // GPIF Transaction Count Byte 2 +EXTERN __xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1 ; // GPIF Transaction Count Byte 1 +EXTERN __xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0 ; // GPIF Transaction Count Byte 0 #define EP2GPIFTCH GPIFTCB1 // these are here for backwards compatibility #define EP2GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) @@ -239,68 +239,68 @@ #define EP8GPIFTCH GPIFTCB1 // these are here for backwards compatibility #define EP8GPIFTCL GPIFTCB0 // before REVE silicon (ie. REVB and REVD) -// EXTERN xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select -EXTERN xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag -EXTERN xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger -// EXTERN xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low -EXTERN xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select -EXTERN xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag -EXTERN xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger -// EXTERN xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select -EXTERN xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag -EXTERN xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger -// EXTERN xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High -// EXTERN xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low -EXTERN xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select -EXTERN xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag -EXTERN xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger -EXTERN xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) -EXTERN xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac -EXTERN xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger -EXTERN xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG -EXTERN xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states -EXTERN xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles +// EXTERN __xdata volatile BYTE EP2GPIFTCH _AT_ 0xE6D0; // EP2 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP2GPIFTCL _AT_ 0xE6D1; // EP2 GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL ; // EP2 GPIF Flag select +EXTERN __xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP ; // Stop GPIF EP2 transaction on prog. flag +EXTERN __xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG ; // EP2 FIFO Trigger +// EXTERN __xdata volatile BYTE EP4GPIFTCH _AT_ 0xE6D8; // EP4 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP4GPIFTCL _AT_ 0xE6D9; // EP4 GPIF Transactionr Count Low +EXTERN __xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL ; // EP4 GPIF Flag select +EXTERN __xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP ; // Stop GPIF EP4 transaction on prog. flag +EXTERN __xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG ; // EP4 FIFO Trigger +// EXTERN __xdata volatile BYTE EP6GPIFTCH _AT_ 0xE6E0; // EP6 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP6GPIFTCL _AT_ 0xE6E1; // EP6 GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL ; // EP6 GPIF Flag select +EXTERN __xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP ; // Stop GPIF EP6 transaction on prog. flag +EXTERN __xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG ; // EP6 FIFO Trigger +// EXTERN __xdata volatile BYTE EP8GPIFTCH _AT_ 0xE6E8; // EP8 GPIF Transaction Count High +// EXTERN __xdata volatile BYTE EP8GPIFTCL _AT_ 0xE6E9; // EP8GPIF Transaction Count Low +EXTERN __xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL ; // EP8 GPIF Flag select +EXTERN __xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP ; // Stop GPIF EP8 transaction on prog. flag +EXTERN __xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG ; // EP8 FIFO Trigger +EXTERN __xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH ; // GPIF Data H (16-bit mode only) +EXTERN __xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX ; // Read/Write GPIF Data L & trigger transac +EXTERN __xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX ; // Read GPIF Data L, no transac trigger +EXTERN __xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG ; // Internal RDY,Sync/Async, RDY5CFG +EXTERN __xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT ; // RDY pin states +EXTERN __xdata _AT_(0xE6F5) volatile BYTE GPIFABORT ; // Abort GPIF cycles // UDMA -EXTERN xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state -EXTERN xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria -EXTERN xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state -EXTERN xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state -EXTERN xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; -EXTERN xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe -EXTERN xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge -EXTERN xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe -EXTERN xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift -EXTERN xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte -EXTERN xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte -EXTERN xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only +EXTERN __xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE ; //Defines GPIF flow state +EXTERN __xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC ; //Defines flow/hold decision criteria +EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state +EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state +EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; +EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe +EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge +EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe +EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift +EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte +EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte +EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only // Debug/Test -EXTERN xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug -EXTERN xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration -EXTERN xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes -EXTERN xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override -EXTERN xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM -EXTERN xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals -EXTERN xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs +EXTERN __xdata _AT_(0xE6F8) volatile BYTE DBUG ; // Debug +EXTERN __xdata _AT_(0xE6F9) volatile BYTE TESTCFG ; // Test configuration +EXTERN __xdata _AT_(0xE6FA) volatile BYTE USBTEST ; // USB Test Modes +EXTERN __xdata _AT_(0xE6FB) volatile BYTE CT1 ; // Chirp Test--Override +EXTERN __xdata _AT_(0xE6FC) volatile BYTE CT2 ; // Chirp Test--FSM +EXTERN __xdata _AT_(0xE6FD) volatile BYTE CT3 ; // Chirp Test--Control Signals +EXTERN __xdata _AT_(0xE6FE) volatile BYTE CT4 ; // Chirp Test--Inputs // Endpoint Buffers -EXTERN xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer -EXTERN xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer -EXTERN xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer -EXTERN xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) -EXTERN xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) -EXTERN xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) -EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) +EXTERN __xdata _AT_(0xE740) volatile BYTE EP0BUF[64] ; // EP0 IN-OUT buffer +EXTERN __xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64] ; // EP1-OUT buffer +EXTERN __xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64] ; // EP1-IN buffer +EXTERN __xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024] ; // 512/1024-byte EP2 buffer (IN or OUT) +EXTERN __xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024] ; // 512 byte EP4 buffer (IN or OUT) +EXTERN __xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024] ; // 512/1024-byte EP6 buffer (IN or OUT) +EXTERN __xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024] ; // 512 byte EP8 buffer (IN or OUT) #undef EXTERN #undef _AT_ @@ -313,201 +313,201 @@ "ezregs.inc" which includes the same basic information for assembly inclusion. -----------------------------------------------------------------------------*/ -sfr at 0x80 IOA; -sfr at 0x81 SP; -sfr at 0x82 DPL; -sfr at 0x83 DPH; -sfr at 0x84 DPL1; -sfr at 0x85 DPH1; -sfr at 0x86 DPS; +__sfr __at 0x80 IOA; +__sfr __at 0x81 SP; +__sfr __at 0x82 DPL; +__sfr __at 0x83 DPH; +__sfr __at 0x84 DPL1; +__sfr __at 0x85 DPH1; +__sfr __at 0x86 DPS; /* DPS */ - sbit at 0x86+0 SEL; -sfr at 0x87 PCON; /* PCON */ - //sbit IDLE = 0x87+0; - //sbit STOP = 0x87+1; - //sbit GF0 = 0x87+2; - //sbit GF1 = 0x87+3; - //sbit SMOD0 = 0x87+7; -sfr at 0x88 TCON; + __sbit __at 0x86+0 SEL; +__sfr __at 0x87 PCON; /* PCON */ + //__sbit IDLE = 0x87+0; + //__sbit STOP = 0x87+1; + //__sbit GF0 = 0x87+2; + //__sbit GF1 = 0x87+3; + //__sbit SMOD0 = 0x87+7; +__sfr __at 0x88 TCON; /* TCON */ - sbit at 0x88+0 IT0; - sbit at 0x88+1 IE0; - sbit at 0x88+2 IT1; - sbit at 0x88+3 IE1; - sbit at 0x88+4 TR0; - sbit at 0x88+5 TF0; - sbit at 0x88+6 TR1; - sbit at 0x88+7 TF1; -sfr at 0x89 TMOD; + __sbit __at 0x88+0 IT0; + __sbit __at 0x88+1 IE0; + __sbit __at 0x88+2 IT1; + __sbit __at 0x88+3 IE1; + __sbit __at 0x88+4 TR0; + __sbit __at 0x88+5 TF0; + __sbit __at 0x88+6 TR1; + __sbit __at 0x88+7 TF1; +__sfr __at 0x89 TMOD; /* TMOD */ - //sbit M00 = 0x89+0; - //sbit M10 = 0x89+1; - //sbit CT0 = 0x89+2; - //sbit GATE0 = 0x89+3; - //sbit M01 = 0x89+4; - //sbit M11 = 0x89+5; - //sbit CT1 = 0x89+6; - //sbit GATE1 = 0x89+7; -sfr at 0x8A TL0; -sfr at 0x8B TL1; -sfr at 0x8C TH0; -sfr at 0x8D TH1; -sfr at 0x8E CKCON; + //__sbit M00 = 0x89+0; + //__sbit M10 = 0x89+1; + //__sbit CT0 = 0x89+2; + //__sbit GATE0 = 0x89+3; + //__sbit M01 = 0x89+4; + //__sbit M11 = 0x89+5; + //__sbit CT1 = 0x89+6; + //__sbit GATE1 = 0x89+7; +__sfr __at 0x8A TL0; +__sfr __at 0x8B TL1; +__sfr __at 0x8C TH0; +__sfr __at 0x8D TH1; +__sfr __at 0x8E CKCON; /* CKCON */ - //sbit MD0 = 0x89+0; - //sbit MD1 = 0x89+1; - //sbit MD2 = 0x89+2; - //sbit T0M = 0x89+3; - //sbit T1M = 0x89+4; - //sbit T2M = 0x89+5; -// sfr at 0x8F SPC_FNC; // Was WRS in Reg320 + //__sbit MD0 = 0x89+0; + //__sbit MD1 = 0x89+1; + //__sbit MD2 = 0x89+2; + //__sbit T0M = 0x89+3; + //__sbit T1M = 0x89+4; + //__sbit T2M = 0x89+5; +// __sfr __at 0x8F SPC_FNC; // Was WRS in Reg320 /* CKCON */ - //sbit WRS = 0x8F+0; -sfr at 0x90 IOB; -sfr at 0x91 EXIF; // EXIF Bit Values differ from Reg320 + //__sbit WRS = 0x8F+0; +__sfr __at 0x90 IOB; +__sfr __at 0x91 EXIF; // EXIF Bit Values differ from Reg320 /* EXIF */ - //sbit USBINT = 0x91+4; - //sbit I2CINT = 0x91+5; - //sbit IE4 = 0x91+6; - //sbit IE5 = 0x91+7; -sfr at 0x92 MPAGE; -sfr at 0x98 SCON0; + //__sbit USBINT = 0x91+4; + //__sbit I2CINT = 0x91+5; + //__sbit IE4 = 0x91+6; + //__sbit IE5 = 0x91+7; +__sfr __at 0x92 MPAGE; +__sfr __at 0x98 SCON0; /* SCON0 */ - sbit at 0x98+0 RI; - sbit at 0x98+1 TI; - sbit at 0x98+2 RB8; - sbit at 0x98+3 TB8; - sbit at 0x98+4 REN; - sbit at 0x98+5 SM2; - sbit at 0x98+6 SM1; - sbit at 0x98+7 SM0; -sfr at 0x99 SBUF0; + __sbit __at 0x98+0 RI; + __sbit __at 0x98+1 TI; + __sbit __at 0x98+2 RB8; + __sbit __at 0x98+3 TB8; + __sbit __at 0x98+4 REN; + __sbit __at 0x98+5 SM2; + __sbit __at 0x98+6 SM1; + __sbit __at 0x98+7 SM0; +__sfr __at 0x99 SBUF0; -sfr at 0x9A APTR1H; -sfr at 0x9B APTR1L; -sfr at 0x9C AUTODAT1; -sfr at 0x9D AUTOPTRH2; -sfr at 0x9E AUTOPTRL2; -sfr at 0x9F AUTODAT2; -sfr at 0xA0 IOC; -sfr at 0xA1 INT2CLR; -sfr at 0xA2 INT4CLR; +__sfr __at 0x9A APTR1H; +__sfr __at 0x9B APTR1L; +__sfr __at 0x9C AUTODAT1; +__sfr __at 0x9D AUTOPTRH2; +__sfr __at 0x9E AUTOPTRL2; +__sfr __at 0x9F AUTODAT2; +__sfr __at 0xA0 IOC; +__sfr __at 0xA1 INT2CLR; +__sfr __at 0xA2 INT4CLR; #define AUTOPTRH1 APTR1H #define AUTOPTRL1 APTR1L -sfr at 0xA8 IE; +__sfr __at 0xA8 IE; /* IE */ - sbit at 0xA8+0 EX0; - sbit at 0xA8+1 ET0; - sbit at 0xA8+2 EX1; - sbit at 0xA8+3 ET1; - sbit at 0xA8+4 ES0; - sbit at 0xA8+5 ET2; - sbit at 0xA8+6 ES1; - sbit at 0xA8+7 EA; + __sbit __at 0xA8+0 EX0; + __sbit __at 0xA8+1 ET0; + __sbit __at 0xA8+2 EX1; + __sbit __at 0xA8+3 ET1; + __sbit __at 0xA8+4 ES0; + __sbit __at 0xA8+5 ET2; + __sbit __at 0xA8+6 ES1; + __sbit __at 0xA8+7 EA; -sfr at 0xAA EP2468STAT; +__sfr __at 0xAA EP2468STAT; /* EP2468STAT */ - //sbit EP2E = 0xAA+0; - //sbit EP2F = 0xAA+1; - //sbit EP4E = 0xAA+2; - //sbit EP4F = 0xAA+3; - //sbit EP6E = 0xAA+4; - //sbit EP6F = 0xAA+5; - //sbit EP8E = 0xAA+6; - //sbit EP8F = 0xAA+7; + //__sbit EP2E = 0xAA+0; + //__sbit EP2F = 0xAA+1; + //__sbit EP4E = 0xAA+2; + //__sbit EP4F = 0xAA+3; + //__sbit EP6E = 0xAA+4; + //__sbit EP6F = 0xAA+5; + //__sbit EP8E = 0xAA+6; + //__sbit EP8F = 0xAA+7; -sfr at 0xAB EP24FIFOFLGS; -sfr at 0xAC EP68FIFOFLGS; -sfr at 0xAF AUTOPTRSETUP; +__sfr __at 0xAB EP24FIFOFLGS; +__sfr __at 0xAC EP68FIFOFLGS; +__sfr __at 0xAF AUTOPTRSETUP; /* AUTOPTRSETUP */ - // sbit EXTACC = 0xAF+0; - // sbit APTR1FZ = 0xAF+1; - // sbit APTR2FZ = 0xAF+2; + // __sbit EXTACC = 0xAF+0; + // __sbit APTR1FZ = 0xAF+1; + // __sbit APTR2FZ = 0xAF+2; -sfr at 0xB0 IOD; -sfr at 0xB1 IOE; -sfr at 0xB2 OEA; -sfr at 0xB3 OEB; -sfr at 0xB4 OEC; -sfr at 0xB5 OED; -sfr at 0xB6 OEE; +__sfr __at 0xB0 IOD; +__sfr __at 0xB1 IOE; +__sfr __at 0xB2 OEA; +__sfr __at 0xB3 OEB; +__sfr __at 0xB4 OEC; +__sfr __at 0xB5 OED; +__sfr __at 0xB6 OEE; -sfr at 0xB8 IP; +__sfr __at 0xB8 IP; /* IP */ - sbit at 0xB8+0 PX0; - sbit at 0xB8+1 PT0; - sbit at 0xB8+2 PX1; - sbit at 0xB8+3 PT1; - sbit at 0xB8+4 PS0; - sbit at 0xB8+5 PT2; - sbit at 0xB8+6 PS1; + __sbit __at 0xB8+0 PX0; + __sbit __at 0xB8+1 PT0; + __sbit __at 0xB8+2 PX1; + __sbit __at 0xB8+3 PT1; + __sbit __at 0xB8+4 PS0; + __sbit __at 0xB8+5 PT2; + __sbit __at 0xB8+6 PS1; -sfr at 0xBA EP01STAT; -sfr at 0xBB GPIFTRIG; +__sfr __at 0xBA EP01STAT; +__sfr __at 0xBB GPIFTRIG; -sfr at 0xBD GPIFSGLDATH; -sfr at 0xBE GPIFSGLDATLX; -sfr at 0xBF GPIFSGLDATLNOX; +__sfr __at 0xBD GPIFSGLDATH; +__sfr __at 0xBE GPIFSGLDATLX; +__sfr __at 0xBF GPIFSGLDATLNOX; -sfr at 0xC0 SCON1; +__sfr __at 0xC0 SCON1; /* SCON1 */ - sbit at 0xC0+0 RI1; - sbit at 0xC0+1 TI1; - sbit at 0xC0+2 RB81; - sbit at 0xC0+3 TB81; - sbit at 0xC0+4 REN1; - sbit at 0xC0+5 SM21; - sbit at 0xC0+6 SM11; - sbit at 0xC0+7 SM01; -sfr at 0xC1 SBUF1; -sfr at 0xC8 T2CON; + __sbit __at 0xC0+0 RI1; + __sbit __at 0xC0+1 TI1; + __sbit __at 0xC0+2 RB81; + __sbit __at 0xC0+3 TB81; + __sbit __at 0xC0+4 REN1; + __sbit __at 0xC0+5 SM21; + __sbit __at 0xC0+6 SM11; + __sbit __at 0xC0+7 SM01; +__sfr __at 0xC1 SBUF1; +__sfr __at 0xC8 T2CON; /* T2CON */ - sbit at 0xC8+0 CP_RL2; - sbit at 0xC8+1 C_T2; - sbit at 0xC8+2 TR2; - sbit at 0xC8+3 EXEN2; - sbit at 0xC8+4 TCLK; - sbit at 0xC8+5 RCLK; - sbit at 0xC8+6 EXF2; - sbit at 0xC8+7 TF2; -sfr at 0xCA RCAP2L; -sfr at 0xCB RCAP2H; -sfr at 0xCC TL2; -sfr at 0xCD TH2; -sfr at 0xD0 PSW; + __sbit __at 0xC8+0 CP_RL2; + __sbit __at 0xC8+1 C_T2; + __sbit __at 0xC8+2 TR2; + __sbit __at 0xC8+3 EXEN2; + __sbit __at 0xC8+4 TCLK; + __sbit __at 0xC8+5 RCLK; + __sbit __at 0xC8+6 EXF2; + __sbit __at 0xC8+7 TF2; +__sfr __at 0xCA RCAP2L; +__sfr __at 0xCB RCAP2H; +__sfr __at 0xCC TL2; +__sfr __at 0xCD TH2; +__sfr __at 0xD0 PSW; /* PSW */ - sbit at 0xD0+0 P; - sbit at 0xD0+1 FL; - sbit at 0xD0+2 OV; - sbit at 0xD0+3 RS0; - sbit at 0xD0+4 RS1; - sbit at 0xD0+5 F0; - sbit at 0xD0+6 AC; - sbit at 0xD0+7 CY; -sfr at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 + __sbit __at 0xD0+0 P; + __sbit __at 0xD0+1 FL; + __sbit __at 0xD0+2 OV; + __sbit __at 0xD0+3 RS0; + __sbit __at 0xD0+4 RS1; + __sbit __at 0xD0+5 F0; + __sbit __at 0xD0+6 AC; + __sbit __at 0xD0+7 CY; +__sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 /* EICON */ - sbit at 0xD8+3 INT6; - sbit at 0xD8+4 RESI; - sbit at 0xD8+5 ERESI; - sbit at 0xD8+7 SMOD1; -sfr at 0xE0 ACC; -sfr at 0xE8 EIE; // EIE Bit Values differ from Reg320 + __sbit __at 0xD8+3 INT6; + __sbit __at 0xD8+4 RESI; + __sbit __at 0xD8+5 ERESI; + __sbit __at 0xD8+7 SMOD1; +__sfr __at 0xE0 ACC; +__sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 /* EIE */ - sbit at 0xE8+0 EIUSB; - sbit at 0xE8+1 EI2C; - sbit at 0xE8+2 EIEX4; - sbit at 0xE8+3 EIEX5; - sbit at 0xE8+4 EIEX6; -sfr at 0xF0 B; -sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320 + __sbit __at 0xE8+0 EIUSB; + __sbit __at 0xE8+1 EI2C; + __sbit __at 0xE8+2 EIEX4; + __sbit __at 0xE8+3 EIEX5; + __sbit __at 0xE8+4 EIEX6; +__sfr __at 0xF0 B; +__sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 /* EIP */ - sbit at 0xF8+0 PUSB; - sbit at 0xF8+1 PI2C; - sbit at 0xF8+2 EIPX4; - sbit at 0xF8+3 EIPX5; - sbit at 0xF8+4 EIPX6; + __sbit __at 0xF8+0 PUSB; + __sbit __at 0xF8+1 PI2C; + __sbit __at 0xF8+2 EIPX4; + __sbit __at 0xF8+3 EIPX5; + __sbit __at 0xF8+4 EIPX6; /*----------------------------------------------------------------------------- Bit Masks diff --git a/firmware/include/i2c.h b/firmware/include/i2c.h index 273526d..25f5364 100644 --- a/firmware/include/i2c.h +++ b/firmware/include/i2c.h @@ -24,9 +24,9 @@ #define _I2C_H_ // returns non-zero if successful, else 0 -unsigned char i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len); +unsigned char i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 -unsigned char i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len); +unsigned char i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len); #endif /* _I2C_H_ */ diff --git a/firmware/include/syncdelay.h b/firmware/include/syncdelay.h index 0af7d09..107932d 100644 --- a/firmware/include/syncdelay.h +++ b/firmware/include/syncdelay.h @@ -58,8 +58,8 @@ /* * FIXME ensure that the peep hole optimizer isn't screwing us */ -#define SYNCDELAY _asm nop; nop; nop; _endasm -#define NOP _asm nop; _endasm +#define SYNCDELAY __asm nop; nop; nop; __endasm +#define NOP __asm nop; __endasm #endif /* _SYNCDELAY_H_ */ diff --git a/firmware/include/usb_common.h b/firmware/include/usb_common.h index ae07b23..2fbab6d 100644 --- a/firmware/include/usb_common.h +++ b/firmware/include/usb_common.h @@ -23,7 +23,7 @@ #ifndef _USB_COMMON_H_ #define _USB_COMMON_H_ -extern volatile bit _usb_got_SUDAV; +extern volatile __bit _usb_got_SUDAV; // Provided by user application to handle VENDOR commands. // returns non-zero if it handled the command. diff --git a/firmware/include/usb_descriptors.h b/firmware/include/usb_descriptors.h index 0b8c621..ea91169 100644 --- a/firmware/include/usb_descriptors.h +++ b/firmware/include/usb_descriptors.h @@ -20,21 +20,21 @@ * Boston, MA 02110-1301, USA. */ -extern xdata const char high_speed_device_descr[]; -extern xdata const char high_speed_devqual_descr[]; -extern xdata const char high_speed_config_descr[]; +extern __xdata const char high_speed_device_descr[]; +extern __xdata const char high_speed_devqual_descr[]; +extern __xdata const char high_speed_config_descr[]; -extern xdata const char full_speed_device_descr[]; -extern xdata const char full_speed_devqual_descr[]; -extern xdata const char full_speed_config_descr[]; +extern __xdata const char full_speed_device_descr[]; +extern __xdata const char full_speed_devqual_descr[]; +extern __xdata const char full_speed_config_descr[]; -extern xdata unsigned char nstring_descriptors; -extern xdata char * xdata string_descriptors[]; +extern __xdata unsigned char nstring_descriptors; +extern __xdata char * __xdata string_descriptors[]; /* * We patch these locations with info read from the usrp config eeprom */ -extern xdata char usb_desc_hw_rev_binary_patch_location_0[]; -extern xdata char usb_desc_hw_rev_binary_patch_location_1[]; -extern xdata char usb_desc_hw_rev_ascii_patch_location_0[]; -extern xdata char usb_desc_serial_number_ascii[]; +extern __xdata char usb_desc_hw_rev_binary_patch_location_0[]; +extern __xdata char usb_desc_hw_rev_binary_patch_location_1[]; +extern __xdata char usb_desc_hw_rev_ascii_patch_location_0[]; +extern __xdata char usb_desc_serial_number_ascii[]; diff --git a/firmware/lib/delay.c b/firmware/lib/delay.c index 13cf0ee..f2e8307 100644 --- a/firmware/lib/delay.c +++ b/firmware/lib/delay.c @@ -24,11 +24,11 @@ * Delay approximately 1 microsecond (including overhead in udelay). */ static void -udelay1 (void) _naked +udelay1 (void) __naked { - _asm ; lcall that got us here took 4 bus cycles + __asm ; lcall that got us here took 4 bus cycles ret ; 4 bus cycles - _endasm; + __endasm; } /* @@ -51,9 +51,9 @@ * but explains the factor of 4 problem below). */ static void -mdelay1 (void) _naked +mdelay1 (void) __naked { - _asm + __asm mov dptr,#(-1200 & 0xffff) 002$: inc dptr ; 3 bus cycles @@ -62,7 +62,7 @@ jnz 002$ ; 3 bus cycles ret - _endasm; + __endasm; } void diff --git a/firmware/lib/i2c.c b/firmware/lib/i2c.c index 0f238b5..dd31a5f 100644 --- a/firmware/lib/i2c.c +++ b/firmware/lib/i2c.c @@ -30,7 +30,7 @@ // returns non-zero if successful, else 0 unsigned char -i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len) +i2c_read (unsigned char addr, __xdata unsigned char *buf, unsigned char len) { volatile unsigned char junk; @@ -89,7 +89,7 @@ // returns non-zero if successful, else 0 unsigned char -i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len) +i2c_write (unsigned char addr, __xdata const unsigned char *buf, unsigned char len) { while (I2CS & bmSTOP) // wait for stop to clear ; diff --git a/firmware/lib/isr.c b/firmware/lib/isr.c index 05412da..61f2dc3 100644 --- a/firmware/lib/isr.c +++ b/firmware/lib/isr.c @@ -24,9 +24,9 @@ #include "fx2regs.h" #include "syncdelay.h" -extern xdata unsigned char _standard_interrupt_vector[]; -extern xdata unsigned char _usb_autovector[]; -extern xdata unsigned char _fifo_gpif_autovector[]; +extern __xdata unsigned char _standard_interrupt_vector[]; +extern __xdata unsigned char _usb_autovector[]; +extern __xdata unsigned char _fifo_gpif_autovector[]; #define LJMP_OPCODE 0x02 @@ -39,7 +39,7 @@ void hook_sv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks @@ -66,7 +66,7 @@ void hook_uv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks @@ -93,7 +93,7 @@ void hook_fgv (unsigned char vector_number, unsigned short addr) { - bit t; + __bit t; // sanity checks diff --git a/firmware/lib/usb_common.c b/firmware/lib/usb_common.c index 3b0547b..6a7a103 100644 --- a/firmware/lib/usb_common.c +++ b/firmware/lib/usb_common.c @@ -28,12 +28,12 @@ #include "usb_descriptors.h" #include "usb_requests.h" -extern xdata char str0[]; -extern xdata char str1[]; -extern xdata char str2[]; -extern xdata char str3[]; -extern xdata char str4[]; -extern xdata char str5[]; +extern __xdata char str0[]; +extern __xdata char str1[]; +extern __xdata char str2[]; +extern __xdata char str3[]; +extern __xdata char str4[]; +extern __xdata char str5[]; #define bRequestType SETUPDAT[0] @@ -48,15 +48,15 @@ #define MSB(x) (((unsigned short) x) >> 8) #define LSB(x) (((unsigned short) x) & 0xff) -volatile bit _usb_got_SUDAV; +volatile __bit _usb_got_SUDAV; unsigned char _usb_config = 0; unsigned char _usb_alt_setting = 0; // FIXME really 1/interface -xdata unsigned char *current_device_descr; -xdata unsigned char *current_devqual_descr; -xdata unsigned char *current_config_descr; -xdata unsigned char *other_config_descr; +__xdata unsigned char *current_device_descr; +__xdata unsigned char *current_devqual_descr; +__xdata unsigned char *current_config_descr; +__xdata unsigned char *other_config_descr; static void setup_descriptors (void) @@ -81,21 +81,21 @@ } static void -isr_SUDAV (void) interrupt +isr_SUDAV (void) __interrupt { clear_usb_irq (); _usb_got_SUDAV = 1; } static void -isr_USBRESET (void) interrupt +isr_USBRESET (void) __interrupt { clear_usb_irq (); setup_descriptors (); } static void -isr_HIGHSPEED (void) interrupt +isr_HIGHSPEED (void) __interrupt { clear_usb_irq (); setup_descriptors (); @@ -133,7 +133,7 @@ // return pointer to control and status register for endpoint. // only called with plausible_endpoints -xdata volatile unsigned char * +__xdata volatile unsigned char * epcs (unsigned char ep) { if (ep == 0x01) // ep1 has different in and out CS regs @@ -234,7 +234,7 @@ if (wValueL >= nstring_descriptors) fx2_stall_ep0 (); else { - xdata char *p = string_descriptors[wValueL]; + __xdata char *p = string_descriptors[wValueL]; SUDPTRH = MSB (p); SUDPTRL = LSB (p); } diff --git a/firmware/src/common/fpga_load.c b/firmware/src/common/fpga_load.c index c3ae9e7..4c0a85e 100644 --- a/firmware/src/common/fpga_load.c +++ b/firmware/src/common/fpga_load.c @@ -89,9 +89,9 @@ #else static void -clock_out_config_byte (unsigned char bits) _naked +clock_out_config_byte (unsigned char bits) __naked { - _asm + __asm mov a, dpl rrc a @@ -136,14 +136,14 @@ ret - _endasm; + __endasm; } #endif static void clock_out_bytes (unsigned char bytecount, - unsigned char xdata *p) + unsigned char __xdata *p) { while (bytecount-- > 0) clock_out_config_byte (*p++); @@ -163,7 +163,7 @@ * ALTERA_NSTATUS = 1 (input) */ unsigned char -fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount) +fpga_load_xfer (__xdata unsigned char *p, unsigned char bytecount) { clock_out_bytes (bytecount, p); return 1; diff --git a/firmware/src/common/fpga_load.h b/firmware/src/common/fpga_load.h index 7c36a04..40ebf92 100644 --- a/firmware/src/common/fpga_load.h +++ b/firmware/src/common/fpga_load.h @@ -22,7 +22,7 @@ #define INCLUDED_FPGA_LOAD_H unsigned char fpga_load_begin (void); -unsigned char fpga_load_xfer (xdata unsigned char *p, unsigned char len); +unsigned char fpga_load_xfer (__xdata unsigned char *p, unsigned char len); unsigned char fpga_load_end (void); #endif /* INCLUDED_FPGA_LOAD_H */ diff --git a/firmware/src/usrp2/board_specific.c b/firmware/src/usrp2/board_specific.c index ef0081d..92fc28f 100644 --- a/firmware/src/usrp2/board_specific.c +++ b/firmware/src/usrp2/board_specific.c @@ -64,7 +64,7 @@ // NOP on usrp1 } -static xdata unsigned char xbuf[1]; +static __xdata unsigned char xbuf[1]; void write_9862 (unsigned char which, unsigned char regno, unsigned char value) diff --git a/firmware/src/usrp2/eeprom_init.c b/firmware/src/usrp2/eeprom_init.c index a6f6cbe..f10ab54 100644 --- a/firmware/src/usrp2/eeprom_init.c +++ b/firmware/src/usrp2/eeprom_init.c @@ -29,7 +29,7 @@ * into hash1. */ #define USRP_HASH_SIZE 16 -xdata at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; +__xdata __at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE]; #define enable_codecs() USRP_PA &= ~(bmPA_SEN_CODEC_A | bmPA_SEN_CODEC_B) diff --git a/firmware/src/usrp2/eeprom_io.c b/firmware/src/usrp2/eeprom_io.c index 9eeb536..1afdc23 100644 --- a/firmware/src/usrp2/eeprom_io.c +++ b/firmware/src/usrp2/eeprom_io.c @@ -27,12 +27,12 @@ // returns non-zero if successful, else 0 unsigned char eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - xdata unsigned char *buf, unsigned char len) + __xdata unsigned char *buf, unsigned char len) { // We setup a random read by first doing a "zero byte write". // Writes carry an address. Reads use an implicit address. - static xdata unsigned char cmd[1]; + static __xdata unsigned char cmd[1]; cmd[0] = eeprom_offset; if (!i2c_write(i2c_addr, cmd, 1)) return 0; diff --git a/firmware/src/usrp2/eeprom_io.h b/firmware/src/usrp2/eeprom_io.h index 558017b..d1c4ee6 100644 --- a/firmware/src/usrp2/eeprom_io.h +++ b/firmware/src/usrp2/eeprom_io.h @@ -27,12 +27,12 @@ // returns non-zero if successful, else 0 unsigned char eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset, - xdata unsigned char *buf, unsigned char len); + __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset, - const xdata unsigned char *buf, unsigned char len); + const __xdata unsigned char *buf, unsigned char len); #endif /* INCLUDED_EEPROM_IO_H */ diff --git a/firmware/src/usrp2/fpga_rev2.c b/firmware/src/usrp2/fpga_rev2.c index cca961d..a1081f5 100644 --- a/firmware/src/usrp2/fpga_rev2.c +++ b/firmware/src/usrp2/fpga_rev2.c @@ -30,7 +30,7 @@ unsigned char g_rx_reset = 0; void -fpga_write_reg (unsigned char regno, const xdata unsigned char *regval) +fpga_write_reg (unsigned char regno, const __xdata unsigned char *regval) { spi_write (0, 0x00 | (regno & 0x7f), SPI_ENABLE_FPGA, @@ -39,7 +39,7 @@ } -static xdata unsigned char regval[4] = {0, 0, 0, 0}; +static __xdata unsigned char regval[4] = {0, 0, 0, 0}; static void write_fpga_master_ctrl (void) diff --git a/firmware/src/usrp2/spi.c b/firmware/src/usrp2/spi.c index f5803c5..fab0429 100644 --- a/firmware/src/usrp2/spi.c +++ b/firmware/src/usrp2/spi.c @@ -98,17 +98,17 @@ write_byte_msb (unsigned char v); static void -write_bytes_msb (const xdata unsigned char *buf, unsigned char len); +write_bytes_msb (const __xdata unsigned char *buf, unsigned char len); static void -read_bytes_msb (xdata unsigned char *buf, unsigned char len); +read_bytes_msb (__xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char spi_read (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - xdata unsigned char *buf, unsigned char len) + __xdata unsigned char *buf, unsigned char len) { if (count_bits8 (enables) > 1) return 0; // error, too many enables set @@ -165,7 +165,7 @@ unsigned char spi_write (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - const xdata unsigned char *buf, unsigned char len) + const __xdata unsigned char *buf, unsigned char len) { setup_enables (enables); @@ -261,7 +261,7 @@ } static void -write_bytes_msb (const xdata unsigned char *buf, unsigned char len) +write_bytes_msb (const __xdata unsigned char *buf, unsigned char len) { while (len-- != 0){ write_byte_msb (*buf++); @@ -320,9 +320,9 @@ } #else static unsigned char -read_byte_msb (void) _naked +read_byte_msb (void) __naked { - _asm + __asm clr a setb _bitS_CLK @@ -367,12 +367,12 @@ mov dpl,a ret - _endasm; + __endasm; } #endif static void -read_bytes_msb (xdata unsigned char *buf, unsigned char len) +read_bytes_msb (__xdata unsigned char *buf, unsigned char len) { while (len-- != 0){ *buf++ = read_byte_msb (); diff --git a/firmware/src/usrp2/spi.h b/firmware/src/usrp2/spi.h index 12bc5e5..0ee6882 100644 --- a/firmware/src/usrp2/spi.h +++ b/firmware/src/usrp2/spi.h @@ -31,13 +31,13 @@ unsigned char spi_read (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - xdata unsigned char *buf, unsigned char len); + __xdata unsigned char *buf, unsigned char len); // returns non-zero if successful, else 0 unsigned char spi_write (unsigned char header_hi, unsigned char header_lo, unsigned char enables, unsigned char format, - const xdata unsigned char *buf, unsigned char len); + const __xdata unsigned char *buf, unsigned char len); #endif /* INCLUDED_SPI_H */ diff --git a/firmware/src/usrp2/usrp_main.c b/firmware/src/usrp2/usrp_main.c index c7c09f8..9e95f16 100644 --- a/firmware/src/usrp2/usrp_main.c +++ b/firmware/src/usrp2/usrp_main.c @@ -62,7 +62,7 @@ * into hash1. */ #define USRP_HASH_SIZE 16 -xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; +__xdata __at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE]; static void get_ep0_data (void) @@ -304,7 +304,7 @@ * Toggle led 0 */ void -isr_tick (void) interrupt +isr_tick (void) __interrupt { static unsigned char count = 1; @@ -323,8 +323,8 @@ void patch_usb_descriptors(void) { - static xdata unsigned char hw_rev; - static xdata unsigned char serial_no[8]; + static __xdata unsigned char hw_rev; + static __xdata unsigned char serial_no[8]; unsigned char i; eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id diff --git a/firmware/src/usrp2/usrp_rev2_regs.h b/firmware/src/usrp2/usrp_rev2_regs.h index a4f1d98..4390f13 100644 --- a/firmware/src/usrp2/usrp_rev2_regs.h +++ b/firmware/src/usrp2/usrp_rev2_regs.h @@ -47,9 +47,9 @@ #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) -sbit at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A -sbit at 0x80+1 bitS_OUT; // out from FX2 point of view -sbit at 0x80+2 bitS_IN; // in from FX2 point of view +__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A +__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view +__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ @@ -85,8 +85,8 @@ #define bmPC_LED0 bmBIT6 // active low #define bmPC_LED1 bmBIT7 // active low -sbit at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C -sbit at 0xA0+3 bitALTERA_DCLK; +__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C +__sbit __at 0xA0+3 bitALTERA_DCLK; #define bmALTERA_BITS (bmALTERA_DATA0 \ -- To view, visit https://gerrit.osmocom.org/12529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd Gerrit-Change-Number: 12529 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:43 +0000 Subject: Change in libusrp[master]: Re-enable build of usrp FX2 firmware In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12530 ) Change subject: Re-enable build of usrp FX2 firmware ...................................................................... Re-enable build of usrp FX2 firmware Back in df354005f35c072976bfd6f1b031827cf3fa2e98, for some reason building the USRP1 FX2 firmware was disabled. Let's re-enable it, as the FX2 firmware is required as an essential part of USRP1 device operation. It's loaded into the FX2 RAM over USB after the initial USB attach. As the firmware code has meanwhile been ported to a more modern SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust the required minimum SDCC version. Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b --- M configure.ac M firmware/Makefile.am M m4/usrp_sdcc.m4 3 files changed, 8 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index d55e4b2..ac486bc 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) +USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])]) + AC_CONFIG_FILES([ Makefile usrp.pc @@ -92,6 +94,10 @@ host/apps/Makefile firmware/Makefile firmware/include/Makefile + firmware/lib/Makefile + firmware/src/Makefile + firmware/src/common/Makefile + firmware/src/usrp2/Makefile fpga/Makefile fpga/rbf/Makefile fpga/rbf/rev2/Makefile diff --git a/firmware/Makefile.am b/firmware/Makefile.am index edef571..9c0da35 100644 --- a/firmware/Makefile.am +++ b/firmware/Makefile.am @@ -19,5 +19,4 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = include -# compilation broken: SUBDIR += lib src +SUBDIRS = include lib src diff --git a/m4/usrp_sdcc.m4 b/m4/usrp_sdcc.m4 index 3aae0bf..ca5550c 100644 --- a/m4/usrp_sdcc.m4 +++ b/m4/usrp_sdcc.m4 @@ -21,7 +21,7 @@ [ sdccok=yes AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) - AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) + AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) if test "$XCC" = "no" -o "$XAS" = "no" ; then AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net]) -- To view, visit https://gerrit.osmocom.org/12530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b Gerrit-Change-Number: 12530 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:43 +0000 Subject: Change in libusrp[master]: debian: Make sure the FX2 firmware is packaged In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12531 ) Change subject: debian: Make sure the FX2 firmware is packaged ...................................................................... debian: Make sure the FX2 firmware is packaged Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 --- M debian/libusrp-firmware.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/libusrp-firmware.install b/debian/libusrp-firmware.install index 741c2eb..5fc4676 100644 --- a/debian/libusrp-firmware.install +++ b/debian/libusrp-firmware.install @@ -1 +1,2 @@ usr/share/usrp/*/*.rbf +usr/share/usrp/*/*.ihx -- To view, visit https://gerrit.osmocom.org/12531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127 Gerrit-Change-Number: 12531 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:46:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:46:57 +0000 Subject: Change in osmo-trx[master]: usrp1: Remove uninitialized skipRx logic In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12533 ) Change subject: usrp1: Remove uninitialized skipRx logic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f Gerrit-Change-Number: 12533 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:46:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:01 +0000 Subject: Change in osmo-trx[master]: usrp1: Fix formatting of log message (missing space) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12534 ) Change subject: usrp1: Fix formatting of log message (missing space) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 Gerrit-Change-Number: 12534 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:47:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:03 +0000 Subject: Change in osmo-trx[master]: cosmetic: Don't call the SDR "USRP" in error message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12535 ) Change subject: cosmetic: Don't call the SDR "USRP" in error message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b7ddb0d679f111407704048ef3ddd964db49441 Gerrit-Change-Number: 12535 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 12 Jan 2019 09:47:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:04 +0000 Subject: Change in osmo-trx[master]: usrp1: Remove uninitialized skipRx logic In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12533 ) Change subject: usrp1: Remove uninitialized skipRx logic ...................................................................... usrp1: Remove uninitialized skipRx logic There appears to have been some logic to operate a USRP1 in transmit-only GSM mode. This is achieved using the skipRx member of the transceiver object. However, there's nobody that ever initializes it properly, and hence the feature is not possible to use anyway. I don't think this has any valid use case, so let's remove it. Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f --- M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 2 files changed, 3 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 5d19514..a8f1638 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -100,7 +100,6 @@ string rbf = "std_inband.rbf"; //string rbf = "inband_1rxhb_1tx.rbf"; m_uRx.reset(); - if (!skipRx) { try { m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make( 0, decimRate * tx_sps, 1, -1, @@ -122,7 +121,6 @@ m_uRx.reset(); return -1; } - } try { m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make( @@ -145,7 +143,7 @@ return -1; } - if (!skipRx) m_uRx->stop(); + m_uRx->stop(); m_uTx->stop(); #endif @@ -188,10 +186,10 @@ { LOGC(DDEV, INFO) << "starting USRP..."; #ifndef SWLOOPBACK - if (!m_uRx && !skipRx) return false; + if (!m_uRx) return false; if (!m_uTx) return false; - if (!skipRx) m_uRx->stop(); + m_uRx->stop(); m_uTx->stop(); writeLock.lock(); @@ -221,10 +219,7 @@ isAligned = false; - if (!skipRx) started = (m_uRx->start() && m_uTx->start()); - else - started = m_uTx->start(); return started; #else gettimeofday(&lastReadTime,NULL); diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 451b5a9..521d81d 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -55,7 +55,6 @@ unsigned long long samplesWritten; ///< number of samples sent to USRP bool started; ///< flag indicates USRP has started - bool skipRx; ///< set if USRP is transmit-only. static const unsigned int currDataSize_log2 = 21; static const unsigned long currDataSize = (1 << currDataSize_log2); -- To view, visit https://gerrit.osmocom.org/12533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f Gerrit-Change-Number: 12533 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:05 +0000 Subject: Change in osmo-trx[master]: usrp1: Fix formatting of log message (missing space) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12534 ) Change subject: usrp1: Fix formatting of log message (missing space) ...................................................................... usrp1: Fix formatting of log message (missing space) Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 --- M Transceiver52M/device/usrp1/USRPDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index a8f1638..2343fb6 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -606,7 +606,7 @@ return true; } else { - LOGC(DDEV, ALERT) << "set TX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set TX: " << wFreq << " failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -631,7 +631,7 @@ return true; } else { - LOGC(DDEV, ALERT) << "set RX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set RX: " << wFreq << " failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; -- To view, visit https://gerrit.osmocom.org/12534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I378a8081a224acda3ee2af9b6aa0d680de884695 Gerrit-Change-Number: 12534 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:05 +0000 Subject: Change in osmo-trx[master]: cosmetic: Don't call the SDR "USRP" in error message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12535 ) Change subject: cosmetic: Don't call the SDR "USRP" in error message ...................................................................... cosmetic: Don't call the SDR "USRP" in error message Transceiver.cpp is used for all SDR hardware we support, not just USRP. Change-Id: I9b7ddb0d679f111407704048ef3ddd964db49441 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 442853f..df1c0bd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -388,7 +388,7 @@ state = &mStates[i]; while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->USRP interface (" + LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; if (state->mRetrans) updateFillerTable(i, burst); -- To view, visit https://gerrit.osmocom.org/12535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b7ddb0d679f111407704048ef3ddd964db49441 Gerrit-Change-Number: 12535 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:33 +0000 Subject: Change in osmo-msc[master]: use osmo_lu_type_name() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12523 ) Change subject: use osmo_lu_type_name() from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 Gerrit-Change-Number: 12523 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:47:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:47:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:47:58 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12471 ) Change subject: rx CM Service Req: reject double use sooner ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:47:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:48:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:48:27 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 12 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Sat, 12 Jan 2019 09:48:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:48:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:48:36 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12522 ) Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:48:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 12 09:48:43 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 Jan 2019 09:48:43 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#806?= Message-ID: <246684672.533.1547286523468.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] usrp1: Remove uninitialized skipRx logic [laforge] usrp1: Fix formatting of log message (missing space) [laforge] cosmetic: Don't call the SDR "USRP" in error message ------------------------------------------ [...truncated 107.74 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:49:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:49:21 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 12 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 09:49:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:49:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:49:41 +0000 Subject: Change in osmo-ci[master]: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12532 ) Change subject: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 Gerrit-Change-Number: 12532 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 12 Jan 2019 09:49:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:49:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:49:42 +0000 Subject: Change in osmo-ci[master]: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12532 ) Change subject: ansible: Install 'sdcc' compiler for libusrp firmware on build slaves ...................................................................... ansible: Install 'sdcc' compiler for libusrp firmware on build slaves Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified 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 b2a2f2b..1429e37 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -48,6 +48,8 @@ # by LimeSuite - cmake - patchelf + # by libusrp + - sdcc - name: install build dependencies and libraries apt: -- To view, visit https://gerrit.osmocom.org/12532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2fa8fa1a195079a0d8beda6a0aa4fc090ca37970 Gerrit-Change-Number: 12532 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:05 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 760 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 86d8d15..6da5ab6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -91,6 +91,7 @@ osmocom/gsm/gsm23003.h \ osmocom/gsm/gsm29118.h \ osmocom/gsm/gsm48.h \ + osmocom/gsm/gsm48_arfcn_range_encode.h \ osmocom/gsm/gsm48_ie.h \ osmocom/gsm/gsm_utils.h \ osmocom/gsm/gsup.h \ diff --git a/include/osmocom/gsm/gsm48_arfcn_range_encode.h b/include/osmocom/gsm/gsm48_arfcn_range_encode.h new file mode 100644 index 0000000..146c853 --- /dev/null +++ b/include/osmocom/gsm/gsm48_arfcn_range_encode.h @@ -0,0 +1,25 @@ +/*! \file gsm48_arfcn_range_encode.h */ + +#pragma once + +#include + +enum osmo_gsm48_range { + OSMO_GSM48_ARFCN_RANGE_INVALID = -1, + OSMO_GSM48_ARFCN_RANGE_128 = 127, + OSMO_GSM48_ARFCN_RANGE_256 = 255, + OSMO_GSM48_ARFCN_RANGE_512 = 511, + OSMO_GSM48_ARFCN_RANGE_1024 = 1023, +}; + +#define OSMO_GSM48_RANGE_ENC_MAX_ARFCNS 29 + +int osmo_gsm48_range_enc_determine_range(const int *arfcns, int size, int *f0_out); +int osmo_gsm48_range_enc_arfcns(enum osmo_gsm48_range rng, const int *arfcns, int sze, int *out, int idx); +int osmo_gsm48_range_enc_find_index(enum osmo_gsm48_range rng, const int *arfcns, int size); +int osmo_gsm48_range_enc_filter_arfcns(int *arfcns, const int sze, const int f0, int *f0_included); + +int osmo_gsm48_range_enc_128(uint8_t *chan_list, int f0, int *w); +int osmo_gsm48_range_enc_256(uint8_t *chan_list, int f0, int *w); +int osmo_gsm48_range_enc_512(uint8_t *chan_list, int f0, int *w); +int osmo_gsm48_range_enc_1024(uint8_t *chan_list, int f0, int f0_incl, int *w); diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 3d2c560..c4b5fce 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -21,7 +21,8 @@ BUILT_SOURCES = gsm0503_conv.c libgsmint_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ - gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \ + gsm_utils.c rsl.c gsm48.c gsm48_arfcn_range_encode.c \ + gsm48_ie.c gsm0808.c sysinfo.c \ gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c gsm0414.c \ lapd_core.c lapdm.c kasumi.c gsm29205.c gsm_04_08_gprs.c \ diff --git a/src/gsm/gsm48_arfcn_range_encode.c b/src/gsm/gsm48_arfcn_range_encode.c new file mode 100644 index 0000000..6423a9a --- /dev/null +++ b/src/gsm/gsm48_arfcn_range_encode.c @@ -0,0 +1,321 @@ +/* gsm 04.08 system information (si) encoding and decoding + * 3gpp ts 04.08 version 7.21.0 release 1998 / etsi ts 100 940 v7.21.0 */ + +/* + * (C) 2012 Holger Hans Peter Freyther + * (C) 2012 by On-Waves + * 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 + +static inline int greatest_power_of_2_lesser_or_equal_to(int index) +{ + int power_of_2 = 1; + + do { + power_of_2 *= 2; + } while (power_of_2 <= index); + + /* now go back one step */ + return power_of_2 / 2; +} + +static inline int mod(int data, int range) +{ + int res = data % range; + while (res < 0) + res += range; + return res; +} + +/** + * Determine at which index to split the ARFCNs to create an + * equally size partition for the given range. Return -1 if + * no such partition exists. + */ +int osmo_gsm48_range_enc_find_index(enum osmo_gsm48_range range, const int *freqs, const int size) +{ + int i, j, n; + + const int RANGE_DELTA = (range - 1) / 2; + + for (i = 0; i < size; ++i) { + n = 0; + for (j = 0; j < size; ++j) { + if (mod(freqs[j] - freqs[i], range) <= RANGE_DELTA) + n += 1; + } + + if (n - 1 == (size - 1) / 2) + return i; + } + + return -1; +} + +/* Worker for range_enc_arfcns(), do not call directly. */ +static int _range_enc_arfcns(enum osmo_gsm48_range range, + const int *arfcns, int size, int *out, + const int index) +{ + int split_at; + int i; + + /* + * The below is a GNU extension and we can remove it when + * we move to a quicksort like in-situ swap with the pivot. + */ + int arfcns_left[size / 2]; + int arfcns_right[size / 2]; + int l_size; + int r_size; + int l_origin; + int r_origin; + + /* Now do the processing */ + split_at = osmo_gsm48_range_enc_find_index(range, arfcns, size); + if (split_at < 0) + return -EINVAL; + + /* we now know where to split */ + out[index] = 1 + arfcns[split_at]; + + /* calculate the work that needs to be done for the leafs */ + l_origin = mod(arfcns[split_at] + ((range - 1) / 2) + 1, range); + r_origin = mod(arfcns[split_at] + 1, range); + for (i = 0, l_size = 0, r_size = 0; i < size; ++i) { + if (mod(arfcns[i] - l_origin, range) < range / 2) + arfcns_left[l_size++] = mod(arfcns[i] - l_origin, range); + if (mod(arfcns[i] - r_origin, range) < range / 2) + arfcns_right[r_size++] = mod(arfcns[i] - r_origin, range); + } + + /* + * Now recurse and we need to make this iterative... but as the + * tree is balanced the stack will not be too deep. + */ + if (l_size) + osmo_gsm48_range_enc_arfcns(range / 2, arfcns_left, l_size, + out, index + greatest_power_of_2_lesser_or_equal_to(index + 1)); + if (r_size) + osmo_gsm48_range_enc_arfcns((range - 1) / 2, arfcns_right, r_size, + out, index + (2 * greatest_power_of_2_lesser_or_equal_to(index + 1))); + return 0; +} + +/** + * Range encode the ARFCN list. + * \param range The range to use. + * \param arfcns The list of ARFCNs + * \param size The size of the list of ARFCNs + * \param out Place to store the W(i) output. + */ +int osmo_gsm48_range_enc_arfcns(enum osmo_gsm48_range range, + const int *arfcns, int size, int *out, + const int index) +{ + if (size <= 0) + return 0; + + if (size == 1) { + out[index] = 1 + arfcns[0]; + return 0; + } + + return _range_enc_arfcns(range, arfcns, size, out, index); +} + +/* + * The easiest is to use f0 == arfcns[0]. This means that under certain + * circumstances we can encode less ARFCNs than possible with an optimal f0. + * + * TODO: Solve the optimisation problem and pick f0 so that the max distance + * is the smallest. Taking into account the modulo operation. I think picking + * size/2 will be the optimal arfcn. + */ +/** + * This implements the range determination as described in GSM 04.08 J4. The + * result will be a base frequency f0 and the range to use. Note that for range + * 1024 encoding f0 always refers to ARFCN 0 even if it is not an element of + * the arfcns list. + * + * \param[in] arfcns The input frequencies, they must be sorted, lowest number first + * \param[in] size The length of the array + * \param[out] f0 The selected F0 base frequency. It might not be inside the list + */ +int osmo_gsm48_range_enc_determine_range(const int *arfcns, const int size, int *f0) +{ + int max = 0; + + /* + * Go for the easiest. And pick arfcns[0] == f0. + */ + max = arfcns[size - 1] - arfcns[0]; + *f0 = arfcns[0]; + + if (max < 128 && size <= 29) + return OSMO_GSM48_ARFCN_RANGE_128; + if (max < 256 && size <= 22) + return OSMO_GSM48_ARFCN_RANGE_256; + if (max < 512 && size <= 18) + return OSMO_GSM48_ARFCN_RANGE_512; + if (max < 1024 && size <= 17) { + *f0 = 0; + return OSMO_GSM48_ARFCN_RANGE_1024; + } + + return OSMO_GSM48_ARFCN_RANGE_INVALID; +} + +static void write_orig_arfcn(uint8_t *chan_list, int f0) +{ + chan_list[0] |= (f0 >> 9) & 1; + chan_list[1] = (f0 >> 1); + chan_list[2] = (f0 & 1) << 7; +} + +static void write_all_wn(uint8_t *chan_list, int bit_offs, + int *w, int w_size, int w1_len) +{ + int octet_offs = 0; /* offset into chan_list */ + int wk_len = w1_len; /* encoding size in bits of w[k] */ + int k; /* 1 based */ + int level = 0; /* tree level, top level = 0 */ + int lvl_left = 1; /* nodes per tree level */ + + /* W(2^i) to W(2^(i+1)-1) are on w1_len-i bits when present */ + + for (k = 1; k <= w_size; k++) { + int wk_left = wk_len; + + while (wk_left > 0) { + int cur_bits = 8 - bit_offs; + int cur_mask; + int wk_slice; + + if (cur_bits > wk_left) + cur_bits = wk_left; + + cur_mask = ((1 << cur_bits) - 1); + + /* advance */ + wk_left -= cur_bits; + bit_offs += cur_bits; + + /* right aligned wk data for current out octet */ + wk_slice = (w[k-1] >> wk_left) & cur_mask; + + /* cur_bits now contains the number of bits + * that are to be copied from wk to the chan_list. + * wk_left is set to the number of bits that must + * not yet be copied. + * bit_offs points after the bit area that is going to + * be overwritten: + * + * wk_left + * | + * v + * wk: WWWWWWWWWWW + * |||||<-- wk_slice, cur_bits=5 + * --WWWWW- + * ^ + * | + * bit_offs + */ + + chan_list[octet_offs] &= ~(cur_mask << (8 - bit_offs)); + chan_list[octet_offs] |= wk_slice << (8 - bit_offs); + + /* adjust output */ + if (bit_offs == 8) { + bit_offs = 0; + octet_offs += 1; + } + } + + /* adjust bit sizes */ + lvl_left -= 1; + if (!lvl_left) { + /* completed tree level, advance to next */ + level += 1; + lvl_left = 1 << level; + wk_len -= 1; + } + } +} + +int osmo_gsm48_range_enc_128(uint8_t *chan_list, int f0, int *w) +{ + chan_list[0] = 0x8C; + write_orig_arfcn(chan_list, f0); + + write_all_wn(&chan_list[2], 1, w, 28, 7); + return 0; +} + +int osmo_gsm48_range_enc_256(uint8_t *chan_list, int f0, int *w) +{ + chan_list[0] = 0x8A; + write_orig_arfcn(chan_list, f0); + + write_all_wn(&chan_list[2], 1, w, 21, 8); + return 0; +} + +int osmo_gsm48_range_enc_512(uint8_t *chan_list, int f0, int *w) +{ + chan_list[0] = 0x88; + write_orig_arfcn(chan_list, f0); + + write_all_wn(&chan_list[2], 1, w, 17, 9); + return 0; +} + +int osmo_gsm48_range_enc_1024(uint8_t *chan_list, int f0, int f0_included, int *w) +{ + chan_list[0] = 0x80 | (f0_included << 2); + + write_all_wn(&chan_list[0], 6, w, 16, 10); + return 0; +} + +int osmo_gsm48_range_enc_filter_arfcns(int *arfcns, const int size, const int f0, int *f0_included) +{ + int i, j = 0; + *f0_included = 0; + + for (i = 0; i < size; ++i) { + /* + * Appendix J.4 says the following: + * All frequencies except F(0), minus F(0) + 1. + * I assume we need to exclude it here. + */ + if (arfcns[i] == f0) { + *f0_included = 1; + continue; + } + + arfcns[j++] = mod(arfcns[i] - (f0 + 1), 1024); + } + + return j; +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index cdcbcc9..922ac01 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -518,6 +518,15 @@ osmo_apn_to_str; osmo_apn_from_str; +osmo_gsm48_range_enc_determine_range; +osmo_gsm48_range_enc_arfcns; +osmo_gsm48_range_enc_find_index; +osmo_gsm48_range_enc_filter_arfcns; +osmo_gsm48_range_enc_128; +osmo_gsm48_range_enc_256; +osmo_gsm48_range_enc_512; +osmo_gsm48_range_enc_1024; + osmo_gsup_encode; osmo_gsup_decode; osmo_gsup_message_type_names; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 37ef3f1..6902e8e 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -609,6 +610,338 @@ printf("\n"); } +struct { + int range; + int arfcns_num; + int arfcns[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS]; +} arfcn_test_ranges[] = { + {OSMO_GSM48_ARFCN_RANGE_512, 12, + { 1, 12, 31, 51, 57, 91, 97, 98, 113, 117, 120, 125 }}, + {OSMO_GSM48_ARFCN_RANGE_512, 17, + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 }}, + {OSMO_GSM48_ARFCN_RANGE_512, 18, + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 }}, + {OSMO_GSM48_ARFCN_RANGE_512, 18, + { 1, 17, 31, 45, 58, 79, 81, 97, + 113, 127, 213, 277, 287, 311, 331, 391, + 417, 511 }}, + {OSMO_GSM48_ARFCN_RANGE_512, 6, + { 1, 17, 31, 45, 58, 79 }}, + {OSMO_GSM48_ARFCN_RANGE_512, 6, + { 10, 17, 31, 45, 58, 79 }}, + {OSMO_GSM48_ARFCN_RANGE_1024, 17, + { 0, 17, 31, 45, 58, 79, 81, 97, + 113, 127, 213, 277, 287, 311, 331, 391, + 1023 }}, + {OSMO_GSM48_ARFCN_RANGE_1024, 16, + { 17, 31, 45, 58, 79, 81, 97, 113, + 127, 213, 277, 287, 311, 331, 391, 1023 }}, + {-1} +}; + +static int test_single_range_encoding(int range, const int *orig_arfcns, int arfcns_num, int silent) +{ + int arfcns[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS]; + int w[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS]; + int f0_included = 0; + int rc, f0; + uint8_t chan_list[16] = {0}; + struct gsm_sysinfo_freq dec_freq[1024] = {{0}}; + int dec_arfcns[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS] = {0}; + int dec_arfcns_count = 0; + int arfcns_used = 0; + int i; + + arfcns_used = arfcns_num; + memmove(arfcns, orig_arfcns, sizeof(arfcns)); + + f0 = range == OSMO_GSM48_ARFCN_RANGE_1024 ? 0 : arfcns[0]; + /* + * Manipulate the ARFCN list according to the rules in J4 depending + * on the selected range. + */ + arfcns_used = osmo_gsm48_range_enc_filter_arfcns(arfcns, arfcns_used, f0, &f0_included); + + memset(w, 0, sizeof(w)); + osmo_gsm48_range_enc_arfcns(range, arfcns, arfcns_used, w, 0); + + if (!silent) + printf("range=%d, arfcns_used=%d, f0=%d, f0_included=%d\n", range, arfcns_used, f0, f0_included); + + /* Select the range and the amount of bits needed */ + switch (range) { + case OSMO_GSM48_ARFCN_RANGE_128: + osmo_gsm48_range_enc_128(chan_list, f0, w); + break; + case OSMO_GSM48_ARFCN_RANGE_256: + osmo_gsm48_range_enc_256(chan_list, f0, w); + break; + case OSMO_GSM48_ARFCN_RANGE_512: + osmo_gsm48_range_enc_512(chan_list, f0, w); + break; + case OSMO_GSM48_ARFCN_RANGE_1024: + osmo_gsm48_range_enc_1024(chan_list, f0, f0_included, w); + break; + default: + return 1; + }; + + if (!silent) + printf("chan_list = %s\n", + osmo_hexdump(chan_list, sizeof(chan_list))); + + rc = gsm48_decode_freq_list(dec_freq, chan_list, sizeof(chan_list), + 0xfe, 1); + if (rc != 0) { + printf("Cannot decode freq list, rc = %d\n", rc); + return 1; + } + + for (i = 0; i < ARRAY_SIZE(dec_freq); i++) { + if (dec_freq[i].mask && + dec_arfcns_count < ARRAY_SIZE(dec_arfcns)) + dec_arfcns[dec_arfcns_count++] = i; + } + + if (!silent) { + printf("Decoded freqs %d (expected %d)\n", + dec_arfcns_count, arfcns_num); + printf("Decoded: "); + for (i = 0; i < dec_arfcns_count; i++) { + printf("%d ", dec_arfcns[i]); + if (dec_arfcns[i] != orig_arfcns[i]) + printf("(!= %d) ", orig_arfcns[i]); + } + printf("\n"); + } + + if (dec_arfcns_count != arfcns_num) { + printf("Wrong number of arfcns\n"); + return 1; + } + + if (memcmp(dec_arfcns, orig_arfcns, sizeof(dec_arfcns)) != 0) { + printf("Decoding error, got wrong freqs\n"); + printf(" w = "); + for (i = 0; i < ARRAY_SIZE(w); i++) + printf("%d ", w[i]); + printf("\n"); + return 1; + } + + return 0; +} + +static void test_random_range_encoding(int range, int max_arfcn_num) +{ + int arfcns_num = 0; + int test_idx; + int rc, max_count; + int num_tests = 1024; + + printf("Random range test: range %d, max num ARFCNs %d\n", + range, max_arfcn_num); + + srandom(1); + + for (max_count = 1; max_count < max_arfcn_num; max_count++) { + for (test_idx = 0; test_idx < num_tests; test_idx++) { + int count; + int i; + int min_freq = 0; + + int rnd_arfcns[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS] = {0}; + char rnd_arfcns_set[1024] = {0}; + + if (range < OSMO_GSM48_ARFCN_RANGE_1024) + min_freq = random() % (1023 - range); + + for (count = max_count; count; ) { + int arfcn = min_freq + random() % (range + 1); + OSMO_ASSERT(arfcn < ARRAY_SIZE(rnd_arfcns_set)); + + if (!rnd_arfcns_set[arfcn]) { + rnd_arfcns_set[arfcn] = 1; + count -= 1; + } + } + + arfcns_num = 0; + for (i = 0; i < ARRAY_SIZE(rnd_arfcns_set); i++) + if (rnd_arfcns_set[i]) + rnd_arfcns[arfcns_num++] = i; + + rc = test_single_range_encoding(range, rnd_arfcns, + arfcns_num, 1); + if (rc != 0) { + printf("Failed on test %d, range %d, num ARFCNs %d\n", + test_idx, range, max_count); + test_single_range_encoding(range, rnd_arfcns, + arfcns_num, 0); + return; + } + } + } +} + +static void test_range_encoding() +{ + int *arfcns; + int arfcns_num = 0; + int test_idx; + int range; + + for (test_idx = 0; arfcn_test_ranges[test_idx].arfcns_num > 0; test_idx++) + { + arfcns_num = arfcn_test_ranges[test_idx].arfcns_num; + arfcns = &arfcn_test_ranges[test_idx].arfcns[0]; + range = arfcn_test_ranges[test_idx].range; + + printf("Range test %d: range %d, num ARFCNs %d\n", + test_idx, range, arfcns_num); + + test_single_range_encoding(range, arfcns, arfcns_num, 0); + } + + test_random_range_encoding(OSMO_GSM48_ARFCN_RANGE_128, 29); + test_random_range_encoding(OSMO_GSM48_ARFCN_RANGE_256, 22); + test_random_range_encoding(OSMO_GSM48_ARFCN_RANGE_512, 18); + test_random_range_encoding(OSMO_GSM48_ARFCN_RANGE_1024, 16); +} + +static int freqs1[] = { + 12, 70, 121, 190, 250, 320, 401, 475, 520, 574, 634, 700, 764, 830, 905, 980 +}; + +static int freqs2[] = { + 402, 460, 1, 67, 131, 197, 272, 347, +}; + +static int freqs3[] = { + 68, 128, 198, 279, 353, 398, 452, + +}; + +static int w_out[] = { + 122, 2, 69, 204, 75, 66, 60, 70, 83, 3, 24, 67, 54, 64, 70, 9, +}; + +static int range128[] = { + 1, 1 + 127, +}; + +static int range256[] = { + 1, 1 + 128, +}; + +static int range512[] = { + 1, 1+ 511, +}; + + +#define VERIFY(res, cmp, wanted) \ + if (!(res cmp wanted)) { \ + printf("ASSERT failed: %s:%d Wanted: %d %s %d\n", \ + __FILE__, __LINE__, (int) res, # cmp, (int) wanted); \ + } + +static void test_arfcn_filter() +{ + int arfcns[50], i, res, f0_included; + for (i = 0; i < ARRAY_SIZE(arfcns); ++i) + arfcns[i] = (i + 1) * 2; + + /* check that the arfcn is taken out. f0_included is only set for Range1024 */ + f0_included = 24; + res = osmo_gsm48_range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns), arfcns[0], &f0_included); + VERIFY(res, ==, ARRAY_SIZE(arfcns) - 1); + VERIFY(f0_included, ==, 1); + for (i = 0; i < res; ++i) + VERIFY(arfcns[i], ==, ((i+2) * 2) - (2+1)); + + /* check with range1024, ARFCN 0 is included */ + for (i = 0; i < ARRAY_SIZE(arfcns); ++i) + arfcns[i] = i * 2; + res = osmo_gsm48_range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns), 0, &f0_included); + VERIFY(res, ==, ARRAY_SIZE(arfcns) - 1); + VERIFY(f0_included, ==, 1); + for (i = 0; i < res; ++i) + VERIFY(arfcns[i], ==, (i + 1) * 2 - 1); + + /* check with range1024, ARFCN 0 not included */ + for (i = 0; i < ARRAY_SIZE(arfcns); ++i) + arfcns[i] = (i + 1) * 2; + res = osmo_gsm48_range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns), 0, &f0_included); + VERIFY(res, ==, ARRAY_SIZE(arfcns)); + VERIFY(f0_included, ==, 0); + for (i = 0; i < res; ++i) + VERIFY(arfcns[i], ==, ((i + 1) * 2) - 1); +} + +static void test_print_encoding() +{ + int rc; + int w[17]; + uint8_t chan_list[16]; + memset(chan_list, 0x23, sizeof(chan_list)); + + for (rc = 0; rc < ARRAY_SIZE(w); ++rc) + switch (rc % 3) { + case 0: + w[rc] = 0xAAAA; + break; + case 1: + w[rc] = 0x5555; + break; + case 2: + w[rc] = 0x9696; + break; + } + + osmo_gsm48_range_enc_512(chan_list, (1 << 9) | 0x96, w); + + printf("Range512: %s\n", osmo_hexdump(chan_list, ARRAY_SIZE(chan_list))); +} + +static void test_si_range_helpers() +{ + int ws[(sizeof(freqs1)/sizeof(freqs1[0]))]; + int i, f0 = 0xFFFFFF; + + memset(&ws[0], 0x23, sizeof(ws)); + + i = osmo_gsm48_range_enc_find_index(1023, freqs1, ARRAY_SIZE(freqs1)); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs1[i] : -1); + VERIFY(i, ==, 2); + + i = osmo_gsm48_range_enc_find_index(511, freqs2, ARRAY_SIZE(freqs2)); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs2[i] : -1); + VERIFY(i, ==, 2); + + i = osmo_gsm48_range_enc_find_index(511, freqs3, ARRAY_SIZE(freqs3)); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs3[i] : -1); + VERIFY(i, ==, 0); + + osmo_gsm48_range_enc_arfcns(1023, freqs1, ARRAY_SIZE(freqs1), ws, 0); + + for (i = 0; i < sizeof(freqs1)/sizeof(freqs1[0]); ++i) { + printf("w[%d]=%d\n", i, ws[i]); + VERIFY(ws[i], ==, w_out[i]); + } + + i = osmo_gsm48_range_enc_determine_range(range128, ARRAY_SIZE(range128), &f0); + VERIFY(i, ==, OSMO_GSM48_ARFCN_RANGE_128); + VERIFY(f0, ==, 1); + + i = osmo_gsm48_range_enc_determine_range(range256, ARRAY_SIZE(range256), &f0); + VERIFY(i, ==, OSMO_GSM48_ARFCN_RANGE_256); + VERIFY(f0, ==, 1); + + i = osmo_gsm48_range_enc_determine_range(range512, ARRAY_SIZE(range512), &f0); + VERIFY(i, ==, OSMO_GSM48_ARFCN_RANGE_512); + VERIFY(f0, ==, 1); +} + int main(int argc, char **argv) { test_bearer_cap(); @@ -619,5 +952,10 @@ test_ra_cap(); test_lai_encode_decode(); + test_si_range_helpers(); + test_arfcn_filter(); + test_print_encoding(); + test_range_encoding(); + return EXIT_SUCCESS; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0c13555..8f6630b 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -282,3 +282,67 @@ Encoded 21 63 54 00 17 gsm48_decode_lai2() gives 123-456-23 (3-digit MNC) passed +Element is: 2 => freqs[i] = 121 +Element is: 2 => freqs[i] = 1 +Element is: 0 => freqs[i] = 68 +w[0]=122 +w[1]=2 +w[2]=69 +w[3]=204 +w[4]=75 +w[5]=66 +w[6]=60 +w[7]=70 +w[8]=83 +w[9]=3 +w[10]=24 +w[11]=67 +w[12]=54 +w[13]=64 +w[14]=70 +w[15]=9 +Range512: 89 4b 2a 95 65 95 55 2c a9 55 aa 55 6a 95 59 55 +Range test 0: range 511, num ARFCNs 12 +range=511, arfcns_used=11, f0=1, f0_included=1 +chan_list = 88 00 98 34 85 36 7c 50 22 dc 5e ec 00 00 00 00 +Decoded freqs 12 (expected 12) +Decoded: 1 12 31 51 57 91 97 98 113 117 120 125 +Range test 1: range 511, num ARFCNs 17 +range=511, arfcns_used=16, f0=1, f0_included=1 +chan_list = 88 00 82 7f 01 3f 7e 04 0b ff ff fc 10 41 07 e0 +Decoded freqs 17 (expected 17) +Decoded: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 +Range test 2: range 511, num ARFCNs 18 +range=511, arfcns_used=17, f0=1, f0_included=1 +chan_list = 88 00 82 7f 01 7f 7e 04 0b ff ff fc 10 41 07 ff +Decoded freqs 18 (expected 18) +Decoded: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 +Range test 3: range 511, num ARFCNs 18 +range=511, arfcns_used=17, f0=1, f0_included=1 +chan_list = 88 00 94 3a 44 32 d7 2a 43 2a 13 94 e5 38 39 f6 +Decoded freqs 18 (expected 18) +Decoded: 1 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 417 511 +Range test 4: range 511, num ARFCNs 6 +range=511, arfcns_used=5, f0=1, f0_included=1 +chan_list = 88 00 8b 3c 88 b9 6b 00 00 00 00 00 00 00 00 00 +Decoded freqs 6 (expected 6) +Decoded: 1 17 31 45 58 79 +Range test 5: range 511, num ARFCNs 6 +range=511, arfcns_used=5, f0=10, f0_included=1 +chan_list = 88 05 08 fc 88 b9 6b 00 00 00 00 00 00 00 00 00 +Decoded freqs 6 (expected 6) +Decoded: 10 17 31 45 58 79 +Range test 6: range 1023, num ARFCNs 17 +range=1023, arfcns_used=16, f0=0, f0_included=1 +chan_list = 84 71 e4 ab b9 58 05 cb 39 17 fd b0 75 62 0f 2f +Decoded freqs 17 (expected 17) +Decoded: 0 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 1023 +Range test 7: range 1023, num ARFCNs 16 +range=1023, arfcns_used=16, f0=0, f0_included=0 +chan_list = 80 71 e4 ab b9 58 05 cb 39 17 fd b0 75 62 0f 2f +Decoded freqs 16 (expected 16) +Decoded: 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 1023 +Random range test: range 127, max num ARFCNs 29 +Random range test: range 255, max num ARFCNs 22 +Random range test: range 511, max num ARFCNs 18 +Random range test: range 1023, max num ARFCNs 16 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:08 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... port rest octets encoding code from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports osmo-bsc code for encoding SI rest octets. The conversion was a bit tricky in some places because some functions receive a 'struct gsm_bts' parameter in osmo-bsc. In this libosmocore version, such functions expect parameters which correspond to the individual fields of 'struct gsm_bts' which are used by these functions. Several structs from osmo-bsc's system_information.h are now also declared in libosmocore headers, with an added osmo_ prefix to avoid collisions with existing definitions in osmo-bsc. Some helpers were ported from osmo-bsc's system_information.c to libosmocore's gsm48_rest_octets.c. Contrary to osmo-bsc's implementation they are now only visible within this file. Unfortunately, this code ported from osmo-bsc lacks unit tests. Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Related: OS#3075 --- M include/Makefile.am M include/osmocom/gprs/protocol/gsm_04_60.h A include/osmocom/gsm/gsm48_rest_octets.h A src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 5 files changed, 1,084 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 6da5ab6..25a6d75 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -93,6 +93,7 @@ osmocom/gsm/gsm48.h \ osmocom/gsm/gsm48_arfcn_range_encode.h \ osmocom/gsm/gsm48_ie.h \ + osmocom/gsm/gsm48_rest_octets.h \ osmocom/gsm/gsm_utils.h \ osmocom/gsm/gsup.h \ osmocom/gsm/gsup_sms.h \ diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h index 5d5fca9..f592b14 100644 --- a/include/osmocom/gprs/protocol/gsm_04_60.h +++ b/include/osmocom/gprs/protocol/gsm_04_60.h @@ -312,3 +312,42 @@ #endif } __attribute__ ((packed)); #endif + +/* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */ +enum osmo_gprs_nmo { + GPRS_NMO_I = 0, /* CS pagin on GPRS paging or traffic channel */ + GPRS_NMO_II = 1, /* all paging on CCCH */ + GPRS_NMO_III = 2, /* no paging coordination */ +}; + +/* TS 04.60 12.24 */ +struct osmo_gprs_cell_options { + enum osmo_gprs_nmo nmo; + /* T3168: wait for packet uplink assignment message */ + uint32_t t3168; /* in milliseconds */ + /* T3192: wait for release of the TBF after reception of the final block */ + uint32_t t3192; /* in milliseconds */ + uint32_t drx_timer_max;/* in seconds */ + uint32_t bs_cv_max; + uint8_t supports_egprs_11bit_rach; + bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */ + + uint8_t ext_info_present; + struct { + uint8_t egprs_supported; + uint8_t use_egprs_p_ch_req; + uint8_t bep_period; + uint8_t pfc_supported; + uint8_t dtm_supported; + uint8_t bss_paging_coordination; + } ext_info; +}; + +/* TS 04.60 Table 12.9.2 */ +struct osmo_gprs_power_ctrl_pars { + uint8_t alpha; + uint8_t t_avg_w; + uint8_t t_avg_t; + uint8_t pc_meas_chan; + uint8_t n_avg_i; +}; diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h new file mode 100644 index 0000000..6280b6a --- /dev/null +++ b/include/osmocom/gsm/gsm48_rest_octets.h @@ -0,0 +1,87 @@ +#pragma once + +#include +#include +#include + +/* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1: + 4-bit index is used (2#1111 = 10#15) */ +#define SI2Q_MAX_NUM 16 +/* length in bits (for single SI2quater message) */ +#define SI2Q_MAX_LEN 160 +#define SI2Q_MIN_LEN 18 + +/* generate SI1 rest octets */ +int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net); +int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list, + size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list, + struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset); +int osmo_gsm48_rest_octets_si2ter(uint8_t *data); +int osmo_gsm48_rest_octets_si2bis(uint8_t *data); +int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net); + +struct osmo_gsm48_si_selection_params { + uint16_t penalty_time:5, + temp_offs:3, + cell_resel_off:6, + cbq:1, + present:1; +}; + +struct osmo_gsm48_si_power_offset { + uint8_t power_offset:2, + present:1; +}; + +struct osmo_gsm48_si3_gprs_ind { + uint8_t si13_position:1, + ra_colour:3, + present:1; +}; + +struct osmo_gsm48_lsa_params { + uint32_t prio_thr:3, + lsa_offset:3, + mcc:12, + mnc:12; + unsigned int present; +}; + +struct osmo_gsm48_si_ro_info { + struct osmo_gsm48_si_selection_params selection_params; + struct osmo_gsm48_si_power_offset power_offset; + bool si2ter_indicator; + bool early_cm_ctrl; + struct { + uint8_t where:3, + present:1; + } scheduling; + struct osmo_gsm48_si3_gprs_ind gprs_ind; + /* SI 3 specific */ + bool early_cm_restrict_3g; + bool si2quater_indicator; + /* SI 4 specific */ + struct osmo_gsm48_lsa_params lsa_params; + uint16_t cell_id; + uint8_t break_ind; /* do we have SI7 + SI8 ? */ +}; + +/* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */ +int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3); + +/* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ +int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len); + +struct osmo_gsm48_si13_info { + struct osmo_gprs_cell_options cell_opts; + struct osmo_gprs_power_ctrl_pars pwr_ctrl_pars; + uint8_t bcch_change_mark; + uint8_t si_change_field; + uint8_t rac; + uint8_t spgc_ccch_sup; + uint8_t net_ctrl_ord; + uint8_t prio_acc_thr; +}; + +/* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ +int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13); diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c new file mode 100644 index 0000000..619dc6d --- /dev/null +++ b/src/gsm/gsm48_rest_octets.c @@ -0,0 +1,949 @@ +/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface, + * rest octet handling according to + * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */ + +/* (C) 2009 by Harald Welte + * + * 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 + +/* generate SI1 rest octets */ +int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 1; + + if (nch_pos) { + bitvec_set_bit(&bv, H); + bitvec_set_uint(&bv, *nch_pos, 5); + } else + bitvec_set_bit(&bv, L); + + if (is1800_net) + bitvec_set_bit(&bv, L); + else + bitvec_set_bit(&bv, H); + + bitvec_spare_padding(&bv, 6); + return bv.data_len; +} + +/* Append Repeated E-UTRAN Neighbour Cell to bitvec: see 3GPP TS 44.018 Table 10.5.2.33b.1 */ +static inline bool append_eutran_neib_cell(struct bitvec *bv, const struct osmo_earfcn_si2q *e, size_t *e_offset, + uint8_t budget) +{ + unsigned i, skip = 0; + int16_t rem = budget - 6; /* account for mandatory stop bit and THRESH_E-UTRAN_high */ + uint8_t earfcn_budget; + + if (budget <= 6) + return false; + + OSMO_ASSERT(budget <= SI2Q_MAX_LEN); + + /* first we have to properly adjust budget requirements */ + if (e->prio_valid) /* E-UTRAN_PRIORITY: 3GPP TS 45.008*/ + rem -= 4; + else + rem--; + + if (e->thresh_lo_valid) /* THRESH_E-UTRAN_low: */ + rem -= 6; + else + rem--; + + if (e->qrxlm_valid) /* E-UTRAN_QRXLEVMIN: */ + rem -= 6; + else + rem--; + + if (rem < 0) + return false; + + /* now we can proceed with actually adding EARFCNs within adjusted budget limit */ + for (i = 0; i < e->length; i++) { + if (e->arfcn[i] != OSMO_EARFCN_INVALID) { + if (skip < *e_offset) { + skip++; /* ignore EARFCNs added on previous calls */ + } else { + earfcn_budget = 17; /* compute budget per-EARFCN */ + if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i]) + earfcn_budget++; + else + earfcn_budget += 4; + + if (rem - earfcn_budget < 0) + break; + else { + (*e_offset)++; + rem -= earfcn_budget; + + if (rem < 0) + return false; + + bitvec_set_bit(bv, 1); /* EARFCN: */ + bitvec_set_uint(bv, e->arfcn[i], 16); + + if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i]) + bitvec_set_bit(bv, 0); + else { /* Measurement Bandwidth: 9.1.54 */ + bitvec_set_bit(bv, 1); + bitvec_set_uint(bv, e->meas_bw[i], 3); + } + } + } + } + } + + /* stop bit - end of EARFCN + Measurement Bandwidth sequence */ + bitvec_set_bit(bv, 0); + + /* Note: we don't support different EARFCN arrays each with different priority, threshold etc. */ + + if (e->prio_valid) { + /* E-UTRAN_PRIORITY: 3GPP TS 45.008*/ + bitvec_set_bit(bv, 1); + bitvec_set_uint(bv, e->prio, 3); + } else + bitvec_set_bit(bv, 0); + + /* THRESH_E-UTRAN_high */ + bitvec_set_uint(bv, e->thresh_hi, 5); + + if (e->thresh_lo_valid) { + /* THRESH_E-UTRAN_low: */ + bitvec_set_bit(bv, 1); + bitvec_set_uint(bv, e->thresh_lo, 5); + } else + bitvec_set_bit(bv, 0); + + if (e->qrxlm_valid) { + /* E-UTRAN_QRXLEVMIN: */ + bitvec_set_bit(bv, 1); + bitvec_set_uint(bv, e->qrxlm, 5); + } else + bitvec_set_bit(bv, 0); + + return true; +} + +static inline void append_earfcn(struct bitvec *bv, const struct osmo_earfcn_si2q *e, size_t *e_offset, uint8_t budget) +{ + bool appended; + unsigned int old = bv->cur_bit; /* save current position to make rollback possible */ + int rem = budget - 25; + if (rem <= 0) + return; + + OSMO_ASSERT(budget <= SI2Q_MAX_LEN); + + /* Additions in Rel-5: */ + bitvec_set_bit(bv, H); + /* No 3G Additional Measurement Param. Descr. */ + bitvec_set_bit(bv, 0); + /* No 3G ADDITIONAL MEASUREMENT Param. Descr. 2 */ + bitvec_set_bit(bv, 0); + /* Additions in Rel-6: */ + bitvec_set_bit(bv, H); + /* 3G_CCN_ACTIVE */ + bitvec_set_bit(bv, 0); + /* Additions in Rel-7: */ + bitvec_set_bit(bv, H); + /* No 700_REPORTING_OFFSET */ + bitvec_set_bit(bv, 0); + /* No 810_REPORTING_OFFSET */ + bitvec_set_bit(bv, 0); + /* Additions in Rel-8: */ + bitvec_set_bit(bv, H); + + /* Priority and E-UTRAN Parameters Description */ + bitvec_set_bit(bv, 1); + + /* No Serving Cell Priority Parameters Descr. */ + bitvec_set_bit(bv, 0); + /* No 3G Priority Parameters Description */ + bitvec_set_bit(bv, 0); + /* E-UTRAN Parameters Description */ + bitvec_set_bit(bv, 1); + + /* E-UTRAN_CCN_ACTIVE */ + bitvec_set_bit(bv, 0); + /* E-UTRAN_Start: 9.1.54 */ + bitvec_set_bit(bv, 1); + /* E-UTRAN_Stop: 9.1.54 */ + bitvec_set_bit(bv, 1); + + /* No E-UTRAN Measurement Parameters Descr. */ + bitvec_set_bit(bv, 0); + /* No GPRS E-UTRAN Measurement Param. Descr. */ + bitvec_set_bit(bv, 0); + + /* Note: each of next 3 "repeated" structures might be repeated any + (0, 1, 2...) times - we only support 1 and 0 */ + + /* Repeated E-UTRAN Neighbour Cells */ + bitvec_set_bit(bv, 1); + + appended = append_eutran_neib_cell(bv, e, e_offset, rem); + if (!appended) { /* appending is impossible within current budget: rollback */ + bv->cur_bit = old; + return; + } + + /* stop bit - end of Repeated E-UTRAN Neighbour Cells sequence: */ + bitvec_set_bit(bv, 0); + + /* Note: following 2 repeated structs are not supported ATM */ + /* stop bit - end of Repeated E-UTRAN Not Allowed Cells sequence: */ + bitvec_set_bit(bv, 0); + /* stop bit - end of Repeated E-UTRAN PCID to TA mapping sequence: */ + bitvec_set_bit(bv, 0); + + /* Priority and E-UTRAN Parameters Description ends here */ + /* No 3G CSG Description */ + bitvec_set_bit(bv, 0); + /* No E-UTRAN CSG Description */ + bitvec_set_bit(bv, 0); + /* No Additions in Rel-9: */ + bitvec_set_bit(bv, L); +} + +static int range_encode(enum osmo_gsm48_range r, int *arfcns, int arfcns_used, int *w, + int f0, uint8_t *chan_list) +{ + /* + * Manipulate the ARFCN list according to the rules in J4 depending + * on the selected range. + */ + int rc, f0_included; + + osmo_gsm48_range_enc_filter_arfcns(arfcns, arfcns_used, f0, &f0_included); + + rc = osmo_gsm48_range_enc_arfcns(r, arfcns, arfcns_used, w, 0); + if (rc < 0) + return rc; + + /* Select the range and the amount of bits needed */ + switch (r) { + case OSMO_GSM48_ARFCN_RANGE_128: + return osmo_gsm48_range_enc_range128(chan_list, f0, w); + case OSMO_GSM48_ARFCN_RANGE_256: + return osmo_gsm48_range_enc_range256(chan_list, f0, w); + case OSMO_GSM48_ARFCN_RANGE_512: + return osmo_gsm48_range_enc_range512(chan_list, f0, w); + case OSMO_GSM48_ARFCN_RANGE_1024: + return osmo_gsm48_range_enc_range1024(chan_list, f0, f0_included, w); + default: + return -ERANGE; + }; + + return f0_included; +} + +static inline int f0_helper(int *sc, size_t length, uint8_t *chan_list) +{ + int w[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS] = { 0 }; + + return range_encode(OSMO_GSM48_ARFCN_RANGE_1024, sc, length, w, 0, chan_list); +} + +/* Return p(n) for given NR_OF_TDD_CELLS - see Table 9.1.54.1a, 3GPP TS 44.018 */ +static unsigned range1024_p(unsigned n) +{ + switch (n) { + case 0: return 0; + case 1: return 10; + case 2: return 19; + case 3: return 28; + case 4: return 36; + case 5: return 44; + case 6: return 52; + case 7: return 60; + case 8: return 67; + case 9: return 74; + case 10: return 81; + case 11: return 88; + case 12: return 95; + case 13: return 102; + case 14: return 109; + case 15: return 116; + case 16: return 122; + default: return 0; + } +} + +/* Estimate how many bits it'll take to append single FDD UARFCN */ +static inline int append_utran_fdd_length(uint16_t u, const int *sc, size_t sc_len, size_t length) +{ + uint8_t chan_list[16] = { 0 }; + int tmp[sc_len], f0; + + memcpy(tmp, sc, sizeof(tmp)); + + f0 = f0_helper(tmp, length, chan_list); + if (f0 < 0) + return f0; + + return 21 + range1024_p(length); +} + +/* Append single FDD UARFCN */ +static inline int append_utran_fdd(struct bitvec *bv, uint16_t u, int *sc, size_t length) +{ + uint8_t chan_list[16] = { 0 }; + int f0 = f0_helper(sc, length, chan_list); + + if (f0 < 0) + return f0; + + /* Repeated UTRAN FDD Neighbour Cells */ + bitvec_set_bit(bv, 1); + + /* FDD-ARFCN */ + bitvec_set_bit(bv, 0); + bitvec_set_uint(bv, u, 14); + + /* FDD_Indic0: parameter value '0000000000' is a member of the set? */ + bitvec_set_bit(bv, f0); + /* NR_OF_FDD_CELLS */ + bitvec_set_uint(bv, length, 5); + + f0 = bv->cur_bit; + bitvec_add_range1024(bv, (struct gsm48_range_1024 *)chan_list); + bv->cur_bit = f0 + range1024_p(length); + + return 21 + range1024_p(length); +} + +static inline int try_adding_uarfcn(struct bitvec *bv, uint16_t *scramble_list, + size_t uarfcn_length, size_t *u_offset, + uint16_t uarfcn, uint8_t num_sc, uint8_t start_pos, uint8_t budget) +{ + int i, k, rc, a[uarfcn_length]; + + if (budget < 23) + return -ENOMEM; + + /* copy corresponding Scrambling Codes: range encoder make in-place modifications */ + for (i = start_pos, k = 0; i < num_sc; a[k++] = scramble_list[i++]); + + /* estimate bit length requirements */ + rc = append_utran_fdd_length(uarfcn, a, uarfcn_length, k); + if (rc < 0) + return rc; /* range encoder failure */ + + if (budget - rc <= 0) + return -ENOMEM; /* we have ran out of budget in current SI2q */ + + /* compute next offset */ + *u_offset += k; + + return budget - append_utran_fdd(bv, uarfcn, a, k); +} + +/* Append multiple FDD UARFCNs */ +static inline void append_uarfcns(struct bitvec *bv, const uint16_t *uarfcn_list, size_t *u_offset, + size_t uarfcn_length, uint16_t *scramble_list, uint8_t budget) +{ + int i, rem = budget - 7, st = *u_offset; /* account for constant bits right away */ + uint16_t cu = uarfcn_list[*u_offset]; /* caller ensures that length is positive */ + + OSMO_ASSERT(budget <= SI2Q_MAX_LEN); + + if (budget <= 7) + return; + + /* 3G Neighbour Cell Description */ + bitvec_set_bit(bv, 1); + /* No Index_Start_3G */ + bitvec_set_bit(bv, 0); + /* No Absolute_Index_Start_EMR */ + bitvec_set_bit(bv, 0); + + /* UTRAN FDD Description */ + bitvec_set_bit(bv, 1); + /* No Bandwidth_FDD */ + bitvec_set_bit(bv, 0); + + for (i = *u_offset; i <= uarfcn_length; i++) + if (uarfcn_list[i] != cu) { /* we've reached new UARFCN */ + rem = try_adding_uarfcn(bv, scramble_list, uarfcn_length, u_offset, cu, i, st, rem); + if (rem < 0) + break; + + if (i < uarfcn_length) { + cu = uarfcn_list[i]; + st = i; + } else + break; + } + + /* stop bit - end of Repeated UTRAN FDD Neighbour Cells */ + bitvec_set_bit(bv, 0); + + /* UTRAN TDD Description */ + bitvec_set_bit(bv, 0); +} + +static size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e) +{ + unsigned i, ret = 0; + + if (!e) + return 0; + + for (i = 0; i < e->length; i++) + if (e->arfcn[i] != OSMO_EARFCN_INVALID) + ret++; + + return ret; +} + +/* generate SI2quater rest octets: 3GPP TS 44.018 ? 10.5.2.33b */ +int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list, + size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list, + struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset) +{ + int rc; + struct bitvec bv; + + if (si2q_count < si2q_index) + return -EINVAL; + + bv.data = data; + bv.data_len = 20; + bitvec_zero(&bv); + + /* BA_IND: Set to '0' as that's what we use for SI2xxx type, + * whereas '1' is used for SI5xxx type messages. The point here + * is to be able to correlate whether a given MS measurement + * report was using the neighbor cells advertised in SI2 or in + * SI5, as those two could very well be different */ + bitvec_set_bit(&bv, 0); + /* 3G_BA_IND */ + bitvec_set_bit(&bv, 1); + /* MP_CHANGE_MARK */ + bitvec_set_bit(&bv, 0); + + /* SI2quater_INDEX */ + bitvec_set_uint(&bv, si2q_index, 4); + /* SI2quater_COUNT */ + bitvec_set_uint(&bv, si2q_count, 4); + + /* No Measurement_Parameters Description */ + bitvec_set_bit(&bv, 0); + /* No GPRS_Real Time Difference Description */ + bitvec_set_bit(&bv, 0); + /* No GPRS_BSIC Description */ + bitvec_set_bit(&bv, 0); + /* No GPRS_REPORT PRIORITY Description */ + bitvec_set_bit(&bv, 0); + /* No GPRS_MEASUREMENT_Parameters Description */ + bitvec_set_bit(&bv, 0); + /* No NC Measurement Parameters */ + bitvec_set_bit(&bv, 0); + /* No extension (length) */ + bitvec_set_bit(&bv, 0); + + rc = SI2Q_MAX_LEN - (bv.cur_bit + 3); + if (rc > 0 && uarfcn_length - *u_offset > 0) + append_uarfcns(&bv, uarfcn_list, u_offset, uarfcn_length, scramble_list, rc); + else /* No 3G Neighbour Cell Description */ + bitvec_set_bit(&bv, 0); + + /* No 3G Measurement Parameters Description */ + bitvec_set_bit(&bv, 0); + /* No GPRS_3G_MEASUREMENT Parameters Descr. */ + bitvec_set_bit(&bv, 0); + + rc = SI2Q_MAX_LEN - bv.cur_bit; + if (rc > 0 && si2q_earfcn_count(si2quater_neigh_list) - *e_offset > 0) + append_earfcn(&bv, si2quater_neigh_list, e_offset, rc); + else /* No Additions in Rel-5: */ + bitvec_set_bit(&bv, L); + + bitvec_spare_padding(&bv, (bv.data_len * 8) - 1); + return bv.data_len; +} + +/* Append selection parameters to bitvec */ +static void append_selection_params(struct bitvec *bv, + const struct osmo_gsm48_si_selection_params *sp) +{ + if (sp->present) { + bitvec_set_bit(bv, H); + bitvec_set_bit(bv, sp->cbq); + bitvec_set_uint(bv, sp->cell_resel_off, 6); + bitvec_set_uint(bv, sp->temp_offs, 3); + bitvec_set_uint(bv, sp->penalty_time, 5); + } else + bitvec_set_bit(bv, L); +} + +/* Append power offset to bitvec */ +static void append_power_offset(struct bitvec *bv, + const struct osmo_gsm48_si_power_offset *po) +{ + if (po->present) { + bitvec_set_bit(bv, H); + bitvec_set_uint(bv, po->power_offset, 2); + } else + bitvec_set_bit(bv, L); +} + +/* Append GPRS indicator to bitvec */ +static void append_gprs_ind(struct bitvec *bv, + const struct osmo_gsm48_si3_gprs_ind *gi) +{ + if (gi->present) { + bitvec_set_bit(bv, H); + bitvec_set_uint(bv, gi->ra_colour, 3); + /* 0 == SI13 in BCCH Norm, 1 == SI13 sent on BCCH Ext */ + bitvec_set_bit(bv, gi->si13_position); + } else + bitvec_set_bit(bv, L); +} + +/* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */ +int osmo_gsm48_rest_octets_si2ter(uint8_t *data) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 4; + + /* No SI2ter_MP_CHANGE_MARK */ + bitvec_set_bit(&bv, L); + + bitvec_spare_padding(&bv, (bv.data_len * 8) - 1); + + return bv.data_len; +} + +/* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */ +int osmo_gsm48_rest_octets_si2bis(uint8_t *data) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 1; + + bitvec_spare_padding(&bv, (bv.data_len * 8) - 1); + + return bv.data_len; +} + +/* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */ +int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 4; + + /* Optional Selection Parameters */ + append_selection_params(&bv, &si3->selection_params); + + /* Optional Power Offset */ + append_power_offset(&bv, &si3->power_offset); + + /* Do we have a SI2ter on the BCCH? */ + if (si3->si2ter_indicator) + bitvec_set_bit(&bv, H); + else + bitvec_set_bit(&bv, L); + + /* Early Classmark Sending Control */ + if (si3->early_cm_ctrl) + bitvec_set_bit(&bv, H); + else + bitvec_set_bit(&bv, L); + + /* Do we have a SI Type 9 on the BCCH? */ + if (si3->scheduling.present) { + bitvec_set_bit(&bv, H); + bitvec_set_uint(&bv, si3->scheduling.where, 3); + } else + bitvec_set_bit(&bv, L); + + /* GPRS Indicator */ + append_gprs_ind(&bv, &si3->gprs_ind); + + /* 3G Early Classmark Sending Restriction. If H, then controlled by + * early_cm_ctrl above */ + if (si3->early_cm_restrict_3g) + bitvec_set_bit(&bv, L); + else + bitvec_set_bit(&bv, H); + + if (si3->si2quater_indicator) { + bitvec_set_bit(&bv, H); /* indicator struct present */ + bitvec_set_uint(&bv, 0, 1); /* message is sent on BCCH Norm */ + } + + bitvec_spare_padding(&bv, (bv.data_len*8)-1); + return bv.data_len; +} + +static int append_lsa_params(struct bitvec *bv, + const struct osmo_gsm48_lsa_params *lsa_params) +{ + /* FIXME */ + return -1; +} + +/* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ +int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = len; + + /* SI4 Rest Octets O */ + append_selection_params(&bv, &si4->selection_params); + append_power_offset(&bv, &si4->power_offset); + append_gprs_ind(&bv, &si4->gprs_ind); + + if (0 /* FIXME */) { + /* H and SI4 Rest Octets S */ + bitvec_set_bit(&bv, H); + + /* LSA Parameters */ + if (si4->lsa_params.present) { + bitvec_set_bit(&bv, H); + append_lsa_params(&bv, &si4->lsa_params); + } else + bitvec_set_bit(&bv, L); + + /* Cell Identity */ + if (1) { + bitvec_set_bit(&bv, H); + bitvec_set_uint(&bv, si4->cell_id, 16); + } else + bitvec_set_bit(&bv, L); + + /* LSA ID Information */ + if (0) { + bitvec_set_bit(&bv, H); + /* FIXME */ + } else + bitvec_set_bit(&bv, L); + } else { + /* L and break indicator */ + bitvec_set_bit(&bv, L); + bitvec_set_bit(&bv, si4->break_ind ? H : L); + } + + return bv.data_len; +} + + +/* GSM 04.18 ETSI TS 101 503 V8.27.0 (2006-05) + + ::= +{L | H } +{L | H } +{ < DTM_support : bit == L > I < DTM_support : bit == H > +< RAC : bit (8) > +< MAX_LAPDm : bit (3) > } +< Band indicator > +{ L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > } +; +*/ +int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 1; + + /* no PCH/NCH info */ + bitvec_set_bit(&bv, L); + /* no VBS/VGCS options */ + bitvec_set_bit(&bv, L); + /* no DTM_support */ + bitvec_set_bit(&bv, L); + /* band indicator */ + if (is1800_net) + bitvec_set_bit(&bv, L); + else + bitvec_set_bit(&bv, H); + /* no GPRS_MS_TXPWR_MAX_CCH */ + bitvec_set_bit(&bv, L); + + bitvec_spare_padding(&bv, (bv.data_len * 8) - 1); + return bv.data_len; +} + +/* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a: + < GPRS Mobile Allocation IE > ::= + < HSN : bit (6) > + { 0 | 1 < RFL number list : < RFL number list struct > > } + { 0 < MA_LENGTH : bit (6) > + < MA_BITMAP: bit (val(MA_LENGTH) + 1) > + | 1 { 0 | 1 > } } ; + + < RFL number list struct > :: = + < RFL_NUMBER : bit (4) > + { 0 | 1 < RFL number list struct > } ; + < ARFCN index list struct > ::= + < ARFCN_INDEX : bit(6) > + { 0 | 1 < ARFCN index list struct > } ; + */ +static int append_gprs_mobile_alloc(struct bitvec *bv) +{ + /* Hopping Sequence Number */ + bitvec_set_uint(bv, 0, 6); + + if (0) { + /* We want to use a RFL number list */ + bitvec_set_bit(bv, 1); + /* FIXME: RFL number list */ + } else + bitvec_set_bit(bv, 0); + + if (0) { + /* We want to use a MA_BITMAP */ + bitvec_set_bit(bv, 0); + /* FIXME: MA_LENGTH, MA_BITMAP, ... */ + } else { + bitvec_set_bit(bv, 1); + if (0) { + /* We want to provide an ARFCN index list */ + bitvec_set_bit(bv, 1); + /* FIXME */ + } else + bitvec_set_bit(bv, 0); + } + return 0; +} + +static int encode_t3192(unsigned int t3192) +{ + /* See also 3GPP TS 44.060 + Table 12.24.2: GPRS Cell Options information element details */ + if (t3192 == 0) + return 3; + else if (t3192 <= 80) + return 4; + else if (t3192 <= 120) + return 5; + else if (t3192 <= 160) + return 6; + else if (t3192 <= 200) + return 7; + else if (t3192 <= 500) + return 0; + else if (t3192 <= 1000) + return 1; + else if (t3192 <= 1500) + return 2; + else + return -EINVAL; +} + +static int encode_drx_timer(unsigned int drx) +{ + if (drx == 0) + return 0; + else if (drx == 1) + return 1; + else if (drx == 2) + return 2; + else if (drx <= 4) + return 3; + else if (drx <= 8) + return 4; + else if (drx <= 16) + return 5; + else if (drx <= 32) + return 6; + else if (drx <= 64) + return 7; + else + return -EINVAL; +} + +/* GPRS Cell Options as per TS 04.60 Chapter 12.24 + < GPRS Cell Options IE > ::= + < NMO : bit(2) > + < T3168 : bit(3) > + < T3192 : bit(3) > + < DRX_TIMER_MAX: bit(3) > + < ACCESS_BURST_TYPE: bit > + < CONTROL_ACK_TYPE : bit > + < BS_CV_MAX: bit(4) > + { 0 | 1 < PAN_DEC : bit(3) > + < PAN_INC : bit(3) > + < PAN_MAX : bit(3) > + { 0 | 1 < Extension Length : bit(6) > + < bit (val(Extension Length) + 1 + & { < Extension Information > ! { bit ** = } } ; + < Extension Information > ::= + { 0 | 1 < EGPRS_PACKET_CHANNEL_REQUEST : bit > + < BEP_PERIOD : bit(4) > } + < PFC_FEATURE_MODE : bit > + < DTM_SUPPORT : bit > + + ** ; + */ +static int append_gprs_cell_opt(struct bitvec *bv, + const struct osmo_gprs_cell_options *gco) +{ + int t3192, drx_timer_max; + + t3192 = encode_t3192(gco->t3192); + if (t3192 < 0) + return t3192; + + drx_timer_max = encode_drx_timer(gco->drx_timer_max); + if (drx_timer_max < 0) + return drx_timer_max; + + bitvec_set_uint(bv, gco->nmo, 2); + + /* See also 3GPP TS 44.060 + Table 12.24.2: GPRS Cell Options information element details */ + bitvec_set_uint(bv, gco->t3168 / 500 - 1, 3); + + bitvec_set_uint(bv, t3192, 3); + bitvec_set_uint(bv, drx_timer_max, 3); + /* ACCESS_BURST_TYPE: Hard-code 8bit */ + bitvec_set_bit(bv, 0); + /* CONTROL_ACK_TYPE: */ + bitvec_set_bit(bv, gco->ctrl_ack_type_use_block); + bitvec_set_uint(bv, gco->bs_cv_max, 4); + + if (0) { + /* hard-code no PAN_{DEC,INC,MAX} */ + bitvec_set_bit(bv, 0); + } else { + /* copied from ip.access BSC protocol trace */ + bitvec_set_bit(bv, 1); + bitvec_set_uint(bv, 1, 3); /* DEC */ + bitvec_set_uint(bv, 1, 3); /* INC */ + bitvec_set_uint(bv, 15, 3); /* MAX */ + } + + if (!gco->ext_info_present) { + /* no extension information */ + bitvec_set_bit(bv, 0); + } else { + /* extension information */ + bitvec_set_bit(bv, 1); + if (!gco->ext_info.egprs_supported) { + /* 6bit length of extension */ + bitvec_set_uint(bv, (1 + 3)-1, 6); + /* EGPRS supported in the cell */ + bitvec_set_bit(bv, 0); + } else { + /* 6bit length of extension */ + bitvec_set_uint(bv, (1 + 5 + 3)-1, 6); + /* EGPRS supported in the cell */ + bitvec_set_bit(bv, 1); + + /* 1bit EGPRS PACKET CHANNEL REQUEST */ + if (gco->supports_egprs_11bit_rach == 0) { + bitvec_set_bit(bv, + gco->ext_info.use_egprs_p_ch_req); + } else { + bitvec_set_bit(bv, 0); + } + + /* 4bit BEP PERIOD */ + bitvec_set_uint(bv, gco->ext_info.bep_period, 4); + } + bitvec_set_bit(bv, gco->ext_info.pfc_supported); + bitvec_set_bit(bv, gco->ext_info.dtm_supported); + bitvec_set_bit(bv, gco->ext_info.bss_paging_coordination); + } + + return 0; +} + +static void append_gprs_pwr_ctrl_pars(struct bitvec *bv, + const struct osmo_gprs_power_ctrl_pars *pcp) +{ + bitvec_set_uint(bv, pcp->alpha, 4); + bitvec_set_uint(bv, pcp->t_avg_w, 5); + bitvec_set_uint(bv, pcp->t_avg_t, 5); + bitvec_set_uint(bv, pcp->pc_meas_chan, 1); + bitvec_set_uint(bv, pcp->n_avg_i, 4); +} + +/* Generate SI13 Rest Octests (04.08 Chapter 10.5.2.37b) */ +int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 20; + + if (0) { + /* No rest octets */ + bitvec_set_bit(&bv, L); + } else { + bitvec_set_bit(&bv, H); + bitvec_set_uint(&bv, si13->bcch_change_mark, 3); + bitvec_set_uint(&bv, si13->si_change_field, 4); + if (1) { + bitvec_set_bit(&bv, 0); + } else { + bitvec_set_bit(&bv, 1); + bitvec_set_uint(&bv, si13->bcch_change_mark, 2); + append_gprs_mobile_alloc(&bv); + } + /* PBCCH not present in cell: + it shall never be indicated according to 3GPP TS 44.018 Table 10.5.2.37b.1 */ + bitvec_set_bit(&bv, 0); + bitvec_set_uint(&bv, si13->rac, 8); + bitvec_set_bit(&bv, si13->spgc_ccch_sup); + bitvec_set_uint(&bv, si13->prio_acc_thr, 3); + bitvec_set_uint(&bv, si13->net_ctrl_ord, 2); + append_gprs_cell_opt(&bv, &si13->cell_opts); + append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars); + + /* 3GPP TS 44.018 Release 6 / 10.5.2.37b */ + bitvec_set_bit(&bv, H); /* added Release 99 */ + /* claim our SGSN is compatible with Release 99, as EDGE and EGPRS + * was only added in this Release */ + bitvec_set_bit(&bv, 1); + } + bitvec_spare_padding(&bv, (bv.data_len*8)-1); + return bv.data_len; +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 922ac01..a903787 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -273,6 +273,14 @@ gsm48_push_l3hdr; gsm48_att_tlvdef; gsm48_cc_msg_name; +gsm48_rest_octets_si1; +gsm48_rest_octets_si2quater; +gsm48_rest_octets_si2ter; +gsm48_rest_octets_si2bis; +gsm48_rest_octets_si6; +gsm48_rest_octets_si3; +gsm48_rest_octets_si4; +gsm48_rest_octets_si13; gsm48_rr_msg_name; gsm48_cc_state_name; gsm48_construct_ra; -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:22 +0000 Subject: Change in osmo-msc[master]: use osmo_lu_type_name() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12523 ) Change subject: use osmo_lu_type_name() from libosmocore ...................................................................... use osmo_lu_type_name() from libosmocore Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err 10 files changed, 63 insertions(+), 72 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: 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 686194f..9ccc5d5 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -308,14 +308,6 @@ return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]); } -/* FIXME: to libosmogsm */ -static const struct value_string lupd_names[] = { - { GSM48_LUPD_NORMAL, "NORMAL" }, - { GSM48_LUPD_PERIODIC, "PERIODIC" }, - { GSM48_LUPD_IMSI_ATT, "IMSI ATTACH" }, - { 0, NULL } -}; - /* Chapter 9.2.15: Receive Location Updating Request. * Keep this function non-static for direct invocation by unit tests. */ int mm_rx_loc_upd_req(struct ran_conn *conn, struct msgb *msg) @@ -342,7 +334,7 @@ LOGP(DMM, LOGL_ERROR, "Cannot accept another LU, conn already busy establishing authenticity;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); return -EINVAL; } @@ -350,15 +342,14 @@ LOGP(DMM, LOGL_ERROR, "Cannot accept another LU, conn already established;" " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); return -EINVAL; } ran_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, - get_value_string(lupd_names, lu->type)); + gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index e834e91..e50df6d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -452,7 +452,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -897,7 +897,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) @@ -1096,7 +1096,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1325,7 +1325,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2011,7 +2011,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 69ad9a2..32d9f6b 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -504,7 +504,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1036,7 +1036,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1269,7 +1269,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1491,7 +1491,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2220,7 +2220,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2712,7 +2712,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 1a3d67c..cb7d026 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -89,7 +89,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -171,7 +171,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -320,7 +320,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -468,7 +468,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -617,7 +617,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -697,7 +697,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -847,7 +847,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -925,7 +925,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1004,7 +1004,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1086,7 +1086,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 7e49d01..03718e5 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -10,7 +10,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -98,7 +98,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 8e99883..76004cd 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -10,7 +10,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -118,7 +118,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -356,7 +356,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -556,7 +556,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f865d87..1d7da68 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -324,7 +324,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -641,7 +641,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) @@ -823,7 +823,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1004,7 +1004,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1211,7 +1211,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1378,7 +1378,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1577,7 +1577,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1739,7 +1739,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1939,7 +1939,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -2167,7 +2167,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 76431fb..0963d66 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -45,7 +45,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -160,7 +160,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -194,7 +194,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED @@ -282,7 +282,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -411,7 +411,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -535,7 +535,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -669,7 +669,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x8: cm_service) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -724,7 +724,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -916,7 +916,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1096,7 +1096,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1252,7 +1252,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x20: trans_sms) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -1315,7 +1315,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -1554,7 +1554,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 1b33b2d..ff52aa3 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -101,7 +101,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -216,7 +216,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -362,7 +362,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:591536962) diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 5dcdbbe..7454b50 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -9,7 +9,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) @@ -205,7 +205,7 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH DMM LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) -- To view, visit https://gerrit.osmocom.org/12523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7 Gerrit-Change-Number: 12523 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:23 +0000 Subject: Change in osmo-msc[master]: add LOG_RAN_CONN() to use the conn->fi->id for context In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12470 ) Change subject: add LOG_RAN_CONN() to use the conn->fi->id for context ...................................................................... add LOG_RAN_CONN() to use the conn->fi->id for context For each conn, set a default logging category, to distinguish categories for BSSMAP and RANAP based conns. LOG_RAN_CONN(): log with the conn's default category, LOG_RAN_CONN_CAT(): log with a manually set category (mostly for keeping previous DMM logging on the same category). In some places, replace LOGP() using manual context with LOG_RAN_CONN(), and remove the manual context info, now provided by the conn->fi->id. This is loosely related to inter-BSC and inter-MSC handover: to speed up refactoring, I want to avoid the need for manual logging context and just use this LOG_RAN_CONN(). Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 19 files changed, 295 insertions(+), 262 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index b1b6c1c..2d11cca 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -25,14 +25,6 @@ #include #include -#define LOGPCONN(conn, level, fmt, args...) \ - LOGP(DBSSAP, level, "(subscr %s, conn_id %d) " fmt, \ - vlr_subscr_name(conn ? conn->vsub : NULL), conn ? conn->a.conn_id : -1, \ - ## args) - -#define LOGPBSCCONN(conn, level, fmt, args...) \ - LOGP(DBSSAP, level, "(conn_id %u) " fmt, conn ? conn->conn_id : (uint32_t)(-1), ## args) - /* A struct to keep a context information about the BSCs we are associated with */ struct bsc_context { struct llist_head list; diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index 4aa771e..d134c30 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -8,6 +8,12 @@ #include #include +#define LOG_RAN_CONN(conn, level, fmt, args ...) \ + LOG_RAN_CONN_CAT(conn, (conn) ? (conn)->log_subsys : DMSC, level, fmt, ## args) + +#define LOG_RAN_CONN_CAT(conn, subsys, level, fmt, args ...) \ + LOGPFSMSL((conn)? (conn)->fi : NULL, subsys, level, fmt, ## args) + enum ran_conn_fsm_event { /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ RAN_CONN_E_COMPLETE_LAYER_3, @@ -107,6 +113,8 @@ /* connected via 2G or 3G? */ enum osmo_rat_type via_ran; + /* whether to log on DBSSAP, DIUCS, ... */ + int log_subsys; uint16_t lac; struct geran_encr geran_encr; diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index ee938aa..0811734 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -40,9 +40,12 @@ #include #include #include +#include #include +#define LOGPCONN LOG_RAN_CONN + /* A pointer to the GSM network we work with. By the current paradigm, * there can only be one gsm_network per MSC. The pointer is set once * when calling a_init() */ @@ -86,7 +89,7 @@ llist_for_each_entry_safe(conn, conn_temp, &active_connections, list) { if (conn->conn_id == conn_id) { - LOGPBSCCONN(conn, LOGL_DEBUG, "Removing A-interface conn\n"); + LOGP(DBSSAP, LOGL_DEBUG, "(conn%u) Removing A-interface conn\n", conn->conn_id); llist_del(&conn->list); talloc_free(conn); } diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 491f8d0..41af93c 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -35,11 +35,14 @@ #include #include #include +#include #include #define IP_V4_ADDR_LEN 4 +#define LOGPCONN LOG_RAN_CONN + /* * Helper functions to lookup and allocate subscribers */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 9ccc5d5..60da275 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -331,25 +331,25 @@ gsm48_mi_to_string(mi_string, sizeof(mi_string), lu->mi, lu->mi_len); if (ran_conn_is_establishing_auth_ciph(conn)) { - LOGP(DMM, LOGL_ERROR, - "Cannot accept another LU, conn already busy establishing authenticity;" - " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, + "Cannot accept another LU, conn already busy establishing authenticity;" + " extraneous LOCATION UPDATING REQUEST: MI=%s LU-type=%s\n", + osmo_mi_name(lu->mi, lu->mi_len), osmo_lu_type_name(lu->type)); return -EINVAL; } if (ran_conn_is_accepted(conn)) { - LOGP(DMM, LOGL_ERROR, - "Cannot accept another LU, conn already established;" - " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, + "Cannot accept another LU, conn already established;" + " extraneous LOCATION UPDATING REQUEST: MI=%s LU-type=%s\n", + osmo_mi_name(lu->mi, lu->mi_len), osmo_lu_type_name(lu->type)); return -EINVAL; } ran_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); - DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", - gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type)); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "LOCATION UPDATING REQUEST: MI=%s LU-type=%s\n", + osmo_mi_name(lu->mi, lu->mi_len), osmo_lu_type_name(lu->type)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len); @@ -383,7 +383,7 @@ imsi = NULL; break; default: - DEBUGPC(DMM, "unknown mobile identity type\n"); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_ERROR, "unknown mobile identity type\n"); tmsi = GSM_RESERVED_TMSI; imsi = NULL; break; @@ -392,7 +392,7 @@ gsm48_decode_lai2(&lu->lai, &old_lai); new_lai.plmn = conn->network->plmn; new_lai.lac = conn->lac; - DEBUGP(DMM, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac); is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU); lu_fsm = vlr_loc_update(conn->fi, @@ -405,7 +405,7 @@ is_utran, net->vlr->cfg.assign_tmsi); if (!lu_fsm) { - DEBUGP(DRR, "%s: Can't start LU FSM\n", mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "Can't start LU FSM\n"); return 0; } @@ -414,9 +414,7 @@ * already have been called and completed. Has an error occured? */ if (!conn->vsub || conn->vsub->lu_fsm != lu_fsm) { - LOGP(DRR, LOGL_ERROR, - "%s: internal error during Location Updating attempt\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "internal error during Location Updating attempt\n"); return -EIO; } @@ -587,7 +585,7 @@ ptr8[2] = dst; } - DEBUGP(DMM, "-> MM INFO\n"); + LOG_RAN_CONN(conn, LOGL_DEBUG, "Tx MM INFO\n"); return gsm48_conn_sendmsg(msg, conn, NULL); } @@ -607,7 +605,7 @@ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_auth_req *ar = (struct gsm48_auth_req *) msgb_put(msg, sizeof(*ar)); - DEBUGP(DMM, "-> AUTH REQ (rand = %s)\n", osmo_hexdump_nospc(rand, 16)); + DEBUGP(DMM, "Tx AUTH REQ (rand = %s)\n", osmo_hexdump_nospc(rand, 16)); if (autn) DEBUGP(DMM, " AUTH REQ (autn = %s)\n", osmo_hexdump_nospc(autn, 16)); @@ -716,21 +714,23 @@ lai.lac = conn->lac; if (msg->data_len < sizeof(struct gsm48_service_request*)) { - LOGP(DMM, LOGL_ERROR, "<- CM SERVICE REQUEST wrong sized message\n"); + LOG_RAN_CONN(conn, LOGL_ERROR, "Rx CM SERVICE REQUEST: wrong message size (%u < %zu)\n", + msg->data_len, sizeof(struct gsm48_service_request*)); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } if (msg->data_len < req->mi_len + 6) { - LOGP(DMM, LOGL_ERROR, "<- CM SERVICE REQUEST does not fit in packet\n"); + LOG_RAN_CONN(conn, LOGL_ERROR, "Rx CM SERVICE REQUEST: message does not fit in packet\n"); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } gsm48_mi_to_string(mi_string, sizeof(mi_string), mi, mi_len); + mi_type = mi[0] & GSM_MI_TYPE_MASK; - DEBUGP(DMM, "<- CM SERVICE REQUEST serv_type=0x%02x MI(%s)=%s\n", - req->cm_service_type, gsm48_mi_type_name(mi_type), mi_string); + LOG_RAN_CONN_CAT(conn, DMM, LOGL_DEBUG, "Rx CM SERVICE REQUEST cm_service_type=0x%02x MI(%s)=%s\n", + req->cm_service_type, gsm48_mi_type_name(mi_type), mi_string); switch (mi_type) { case GSM_MI_TYPE_IMSI: @@ -740,12 +740,12 @@ case GSM_MI_TYPE_IMEI: if (req->cm_service_type == GSM48_CMSERV_EMERGENCY) { /* We don't do emergency calls by IMEI */ - LOGP(DMM, LOGL_NOTICE, "<- CM SERVICE REQUEST(IMEI=%s) rejected\n", mi_string); + LOG_RAN_CONN(conn, LOGL_NOTICE, "Tx CM SERVICE REQUEST REJECT\n"); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_IMEI_NOT_ACCEPTED); } /* fall-through for non-emergency setup */ default: - DEBUGPC(DMM, "mi_type is not expected: %d\n", mi_type); + LOG_RAN_CONN(conn, LOGL_ERROR, "mi_type is not expected: %d\n", mi_type); return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_INCORRECT_MESSAGE); } @@ -789,8 +789,7 @@ /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ if (!conn->vsub) { - LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a CM Service Request\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "subscriber not allowed to do a CM Service Request\n"); return -EIO; } @@ -1172,9 +1171,8 @@ return 0; } - DEBUGP(DRR, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); - ran_conn_update_id(conn, COMPLETE_LAYER3_PAGING_RESP, mi_string); + LOG_RAN_CONN_CAT(conn, DRR, LOGL_DEBUG, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU); vlr_proc_acc_req(conn->fi, @@ -1189,8 +1187,7 @@ /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ if (!conn->vsub) { - LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a Paging Response\n", - mi_string); + LOG_RAN_CONN(conn, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); return -EIO; } @@ -1762,11 +1759,11 @@ OSMO_ASSERT(vsub); if (conn->vsub) { if (conn->vsub == vsub) - LOGPCONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", - vlr_subscr_name(vsub)); + LOG_RAN_CONN(conn, LOGL_NOTICE, "msc_vlr_subscr_assoc(): conn already associated with %s\n", + vlr_subscr_name(vsub)); else { - LOGPCONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," - " cannot associate with %s\n", vlr_subscr_name(vsub)); + LOG_RAN_CONN(conn, LOGL_ERROR, "msc_vlr_subscr_assoc(): conn already associated with a subscriber," + " cannot associate with %s\n", vlr_subscr_name(vsub)); return -EINVAL; } } diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index d6349eb..714907f 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -651,6 +651,18 @@ .fi = fi, }; + switch (via_ran) { + case OSMO_RAT_GERAN_A: + conn->log_subsys = DBSSAP; + break; + case OSMO_RAT_UTRAN_IU: + conn->log_subsys = DRANAP; + break; + default: + conn->log_subsys = DMSC; + break; + } + fi->priv = conn; llist_add_tail(&conn->entry, &network->ran_conns); return conn; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 059b4a8..c5c275a 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -187,7 +187,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -281,7 +281,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -420,8 +420,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -610,7 +610,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -717,7 +717,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -869,8 +869,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1047,7 +1047,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1141,7 +1141,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1235,7 +1235,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1360,8 +1360,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1550,7 +1550,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1657,7 +1657,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1764,7 +1764,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1902,8 +1902,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -2080,7 +2080,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -2219,8 +2219,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -2409,7 +2409,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 8a75e6a..d410d1a 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -184,7 +184,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -390,8 +390,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -576,8 +576,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -769,8 +769,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -955,8 +955,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -1114,8 +1114,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1288,7 +1288,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1456,8 +1456,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 23/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 23/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1630,7 +1630,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index e50df6d..118dee6 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -170,7 +170,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -287,8 +287,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -452,8 +452,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -649,7 +649,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -766,8 +766,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -897,8 +897,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=TMSI-0x03020100 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1096,8 +1096,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1325,8 +1325,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1586,8 +1586,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1728,7 +1728,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -1845,8 +1845,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) @@ -2011,8 +2011,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 32d9f6b..ec3efe9 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -174,7 +174,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -315,8 +315,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -504,8 +504,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -706,7 +706,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -847,8 +847,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -1036,8 +1036,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1269,8 +1269,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1491,8 +1491,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -1756,8 +1756,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth+Ciph @@ -1910,7 +1910,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -2041,8 +2041,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth+Ciph @@ -2220,8 +2220,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -2279,6 +2279,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH @@ -2288,6 +2289,9 @@ lu_result_sent == 0 - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Found A subscriber for conn_id 0 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 @@ -2382,7 +2386,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -2523,8 +2527,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -2712,8 +2716,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -2771,6 +2775,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH @@ -2780,6 +2785,9 @@ lu_result_sent == 0 - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Found A subscriber for conn_id 0 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(LU:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 @@ -2874,7 +2882,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -3015,8 +3023,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph @@ -3063,6 +3071,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM MSISDN:42342: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_AUTH_CIPH}: Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH @@ -3071,6 +3080,9 @@ DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 DMSC Looking for A subscriber: conn_id 0 +DBSSAP RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Found A subscriber for conn_id 0 +DBSSAP RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP DT1 CLASSMARK UPDATE +DBSSAP RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Rx BSSMAP CLASSMARK UPDATE DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event RAN_CONN_E_CLASSMARK_UPDATE DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to RAN_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND MSISDN:42342 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index cb7d026..252bed9 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -89,8 +89,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -171,8 +171,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -320,8 +320,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -468,8 +468,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -617,8 +617,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -697,8 +697,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -847,8 +847,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -925,8 +925,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -1004,8 +1004,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1086,8 +1086,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 03718e5..980665a 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -98,8 +98,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 76004cd..ca67ae4 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -10,8 +10,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -118,8 +118,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) @@ -260,7 +260,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -356,8 +356,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -556,8 +556,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph @@ -615,6 +615,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Tx BSSMAP CLASSMARK REQUEST to BSC BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_WAIT_CLASSMARK_UPDATE DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 1d7da68..4f59208 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -122,7 +122,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -199,8 +199,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -324,8 +324,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -473,7 +473,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=50462976 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(TMSI)=50462976 DMM RAN_conn(CM_SERVICE_REQ:50462976){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:50462976) @@ -550,8 +550,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(TMSI)=50462976 DMM RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:50462976){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(TMSI)=50462976 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -641,8 +641,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=TMSI-0x03020100 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976) DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -823,8 +823,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1004,8 +1004,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1211,8 +1211,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1378,8 +1378,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1577,8 +1577,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1739,8 +1739,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1939,8 +1939,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -2167,8 +2167,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 0963d66..7443d06 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -45,8 +45,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -60,7 +60,7 @@ DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --GERAN-A--> MS DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 -DRR 901700000004620: internal error during Location Updating attempt +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: internal error during Location Updating attempt DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 lu_result_sent == 2 @@ -160,8 +160,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -194,7 +194,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED @@ -282,8 +282,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -316,7 +316,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM Cannot accept CM Service Request, conn already busy establishing authenticity DMM -> CM SERVICE Reject cause: 22 DMSC msc_tx 3 bytes to IMSI:901700000004620 via GERAN-A @@ -411,8 +411,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -535,8 +535,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -637,7 +637,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -669,7 +669,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH +DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_ACCEPTED}: Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x8: cm_service) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -724,8 +724,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -826,7 +826,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -858,7 +858,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_ACCEPTED}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM MSISDN:46071: re-using already accepted connection DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_ACCEPTED}: Updated ID - sending CM Service Accept for MSISDN:46071 @@ -916,8 +916,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1018,7 +1018,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -1096,8 +1096,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1212,8 +1212,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -1252,7 +1252,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) -DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH +DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_ACCEPTED}: Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH DREF MSISDN:46071: MSC conn use - dtap == 1 (0x20: trans_sms) lu_result_sent == 0 llist_count(&net->ran_conns) == 1 @@ -1315,8 +1315,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1431,8 +1431,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) @@ -1471,7 +1471,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_ACCEPTED}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM MSISDN:46071: re-using already accepted connection DREF MSISDN:46071: MSC conn use + cm_service == 3 (0x2a: dtap,cm_service,trans_sms) DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_ACCEPTED}: Updated ID @@ -1554,8 +1554,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -1670,8 +1670,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index ff52aa3..a7ebdee 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -57,7 +57,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -71,7 +71,7 @@ DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --GERAN-A--> MS -DRR 901700000004620: subscriber not allowed to do a CM Service Request +DBSSAP RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_RELEASING}: subscriber not allowed to do a CM Service Request DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 - conn was released @@ -101,8 +101,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -216,8 +216,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -362,8 +362,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=TMSI-0x23422342 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:591536962) DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 7454b50..45302bc 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -115,7 +115,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000004620) @@ -205,8 +205,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH -DMM LU/new-LAC: 1/23 +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620) DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) @@ -336,8 +336,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000004620 DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000004620 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 3f781d7..c2c691f 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -9,8 +9,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -182,7 +182,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -300,8 +300,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth (no Ciph) @@ -466,8 +466,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -651,7 +651,7 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000010650 +DMM RAN_conn{RAN_CONN_S_NEW}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000010650 DMM RAN_conn(CM_SERVICE_REQ:901700000010650){RAN_CONN_S_NEW}: Updated ID DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(CM_SERVICE_REQ:901700000010650) @@ -782,8 +782,8 @@ DMM RAN_conn{RAN_CONN_S_NEW}: Allocated DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) -DRR PAGING RESPONSE: MI(IMSI)=901700000010650 DMM RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: Updated ID +DRR RAN_conn(PAGING_RESP:901700000010650){RAN_CONN_S_NEW}: PAGING RESPONSE: MI(IMSI)=901700000010650 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Allocated DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of RAN_conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph @@ -961,8 +961,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1172,8 +1172,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1395,8 +1395,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1493,8 +1493,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1591,8 +1591,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1689,8 +1689,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph @@ -1787,8 +1787,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=GERAN Auth (no Ciph) @@ -1885,8 +1885,8 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: Updated ID -DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000010650 type=NORMAL -DMM LU/new-LAC: 0/23 +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM RAN_conn(LU:901700000010650){RAN_CONN_S_NEW}: LU/new-LAC: 0/23 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000010650) DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index d3e338a..39d7e42 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -511,6 +511,11 @@ .description = "MNCC API for Call Control application", .enabled = 1, .loglevel = LOGL_DEBUG, }, + [DBSSAP] = { + .name = "DBSSAP", + .description = "BSSAP Protocol (A Interface)", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, }; static struct log_info info = { -- To view, visit https://gerrit.osmocom.org/12470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a Gerrit-Change-Number: 12470 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:23 +0000 Subject: Change in osmo-msc[master]: rx CM Service Req: reject double use sooner In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12471 ) Change subject: rx CM Service Req: reject double use sooner ...................................................................... rx CM Service Req: reject double use sooner When a CM Service Req is being rejected, we should do so before changing the state of the current conn. Concerning multiple CM Service Requests: in fact we should store multiple requests, but first fix the status quo of rejecting multiple requests. Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 2 files changed, 9 insertions(+), 9 deletions(-) Approvals: Harald Welte: 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 60da275..646e9a0 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -726,6 +726,14 @@ GSM48_REJECT_INCORRECT_MESSAGE); } + if (ran_conn_is_establishing_auth_ciph(conn)) { + LOG_RAN_CONN(conn, LOGL_ERROR, + "Cannot accept CM Service Request, conn already busy establishing authenticity\n"); + msc_vlr_tx_cm_serv_rej(conn, GSM48_REJECT_CONGESTION); + return -EINVAL; + /* or should we accept and note down the service request anyway? */ + } + gsm48_mi_to_string(mi_string, sizeof(mi_string), mi, mi_len); mi_type = mi[0] & GSM_MI_TYPE_MASK; @@ -764,13 +772,6 @@ if (ran_conn_is_accepted(conn)) return cm_serv_reuse_conn(conn, mi_p); - if (ran_conn_is_establishing_auth_ciph(conn)) { - LOGP(DMM, LOGL_ERROR, - "Cannot accept CM Service Request, conn already busy establishing authenticity\n"); - msc_vlr_tx_cm_serv_rej(conn, GSM48_REJECT_CONGESTION); - return -EINVAL; - /* or should we accept and note down the service request anyway? */ - } ran_conn_update_id(conn, COMPLETE_LAYER3_CM_SERVICE_REQ, mi_string); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 7443d06..b9e38fa 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -316,8 +316,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) -DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Rx CM SERVICE REQUEST cm_service_type=0x08 MI(IMSI)=901700000004620 -DMM Cannot accept CM Service Request, conn already busy establishing authenticity +DBSSAP RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Cannot accept CM Service Request, conn already busy establishing authenticity DMM -> CM SERVICE Reject cause: 22 DMSC msc_tx 3 bytes to IMSI:901700000004620 via GERAN-A - DTAP --GERAN-A--> MS: GSM48_MT_MM_CM_SERV_REJ: 052216 -- To view, visit https://gerrit.osmocom.org/12471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39209ee6662694aa054a2fc0d21eae76fb33e2f1 Gerrit-Change-Number: 12471 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:23 +0000 Subject: Change in osmo-msc[master]: refactor log ctx for vlr_subscr and ran_conn In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12402 ) Change subject: refactor log ctx for vlr_subscr and ran_conn ...................................................................... refactor log ctx for vlr_subscr and ran_conn ran_conn_get_conn_id(): instead of a talloc allocated string, return a static buffer in ran_conn_get_conn_id(). So far this function had no callers. Refactor ran_conn_update_id() API: during early L3-Complete, when no subscriber is associated yet, update the FSM Id by the MI type seen in the L3 Complete message: ran_conn_update_id_from_mi(). Later on set the vsub and re-update. Call vlr.ops->subscr_update when the TMSI is updated, so that log context includes the TMSI from then on. Enrich context for vlr_subscr_name and ran_conn fi name. Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(IMSI-901700000014706:MSISDN-2023:TMSI-0x08BDE4EC:GERAN-A-3:PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. Print TMSI and TMSInew in uppercase hexadecimal, which is the typical representation in the telecom world. When showing the RAN conn id GERAN_A-00000017 becomes GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter and might suggest hexadecimal format. - 'GERAN-A' and 'UTRAN-Iu' are the strings defined by osmo_rat_type_name(). Depends: I7798c3ef983c2e333b2b9cbffef6f366f370bd81 (libosmocore) Depends: Ica25919758ef6cba8348da199b0ae7e0ba628798 (libosmocore) Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/iu_dummy.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 18 files changed, 11,763 insertions(+), 11,406 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 13 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:24 +0000 Subject: Change in osmo-msc[master]: mm_rx_id_resp(): use osmo_mi_name() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12522 ) Change subject: mm_rx_id_resp(): use osmo_mi_name() ...................................................................... mm_rx_id_resp(): use osmo_mi_name() Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_rest.err 5 files changed, 18 insertions(+), 20 deletions(-) Approvals: Harald Welte: 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 980f668..4baf996 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -290,8 +290,8 @@ static int mm_rx_id_resp(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); - uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; - char mi_string[GSM48_MI_SIZE]; + uint8_t *mi = gh->data+1; + uint8_t mi_len = gh->data[0]; if (!conn->vsub) { LOGP(DMM, LOGL_ERROR, @@ -299,13 +299,11 @@ return -EINVAL; } - gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); - DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n", - gsm48_mi_type_name(mi_type), mi_string); + DEBUGP(DMM, "IDENTITY RESPONSE: MI=%s\n", osmo_mi_name(mi, mi_len)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data); - return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]); + return vlr_subscr_rx_id_resp(conn->vsub, mi, mi_len); } /* Chapter 9.2.15: Receive Location Updating Request. diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index afa9d97..fddfe07 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1258,7 +1258,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK @@ -1489,7 +1489,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 611d62a..65e182c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1196,7 +1196,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK @@ -1655,7 +1655,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 8df3db5..3e28468 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -937,7 +937,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK @@ -1120,7 +1120,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK @@ -1262,7 +1262,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275 +DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275 DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1() @@ -1431,7 +1431,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275 +DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275 DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1() @@ -1520,7 +1520,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK @@ -1632,7 +1632,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275 +DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275 DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1() @@ -1798,7 +1798,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI-SV)=5234234234234276 +DMM IDENTITY RESPONSE: MI=IMEI-SV-5234234234234276 DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=5234234234234276 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1() @@ -2006,7 +2006,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275 +DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275 DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1() @@ -2095,7 +2095,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 42ce1e0..6d98408 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -402,7 +402,7 @@ MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF TMSI-0x23422342: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMSI)=901700000004620 +DMM IDENTITY RESPONSE: MI=IMSI-901700000004620 DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMSI}: Received Event VLR_ULA_E_ID_IMSI DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 -- To view, visit https://gerrit.osmocom.org/12522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59 Gerrit-Change-Number: 12522 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:25 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12403 ) Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... tweak fsm_msc_mgcp FSM and FI name Instead of MGW(MGW_99) use a name of msc-mgcp(MSISDN:2331_GERAN_A:00000017_trans99) 1. The FSM is communication towards an MGW, not the MGW itself. When reading combined logging (gsmtap_log), it is confusing to read 'MGW' in a log coming from the MSC. The API is also called msc_mgcp_*. 2. Calling the FSM instance 'MGW_' again doesn't make sense. 3. Indicate 'trans' before the trans_id (trans_id was already shown, but not indicated what it was). 4. Also indicate the actual subscriber's identification. 5. Also indicate the RAN connection and conn_id. This comes up while trying to understand a call coming in on an already established call: parsing the log with a human brain is near torture without this info, taking extremely long to get grips on. Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 --- M src/libmsc/msc_mgcp.c 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 08a1db0..5c88880 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -941,7 +941,7 @@ /* State machine definition */ static struct osmo_fsm fsm_msc_mgcp = { - .name = "MGW", + .name = "msc-mgcp", .states = fsm_msc_mgcp_states, .num_states = ARRAY_SIZE(fsm_msc_mgcp_states), .log_subsys = DMGCP, @@ -977,7 +977,6 @@ int msc_mgcp_call_assignment(struct gsm_trans *trans) { struct mgcp_ctx *mgcp_ctx; - char name[32]; static bool fsm_registered = false; struct ran_conn *conn; struct mgcp_client *mgcp; @@ -1007,9 +1006,6 @@ conn->iu.rab_id = next_iu_rab_id++; #endif - if (snprintf(name, sizeof(name), "MGW_%i", trans->transaction_id) >= sizeof(name)) - return -EINVAL; - /* Register the fsm description (if not already done) */ if (fsm_registered == false) { osmo_fsm_register(&fsm_msc_mgcp); @@ -1027,8 +1023,10 @@ vlr_subscr_name(trans->vsub), osmo_quote_str(mgcp_client_rtpbridge_wildcard(mgcp), -1)); return -EINVAL; } - mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, name); + mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, NULL); OSMO_ASSERT(mgcp_ctx->fsm); + osmo_fsm_inst_update_id_f(mgcp_ctx->fsm, "%s_%s_trans%d", + vlr_subscr_name(trans->vsub), ran_conn_get_conn_id(conn), trans->transaction_id); mgcp_ctx->fsm->priv = mgcp_ctx; mgcp_ctx->mgcp = mgcp; mgcp_ctx->trans = trans; -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 12 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:25 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... err log: fully log MS supported A5 algos on mismatch Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 --- M src/libmsc/gsm_04_08.c 1 file changed, 38 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: 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 4baf996..7a485c7 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -118,6 +118,41 @@ return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } +static const char *classmark_a5_name(const struct gsm_classmark *cm) +{ + static char buf[128]; + char cm1[42]; + char cm2[42]; + char cm3[42]; + + if (cm->classmark1_set) + snprintf(cm1, sizeof(cm1), "cm1{a5/1=%s}", + cm->classmark1.a5_1 ? "not-supported":"supported" /* inverted logic */); + else + snprintf(cm1, sizeof(cm1), "no-cm1"); + + if (cm->classmark2_len >= 3) + snprintf(cm2, sizeof(cm2), " cm2{0x%x=%s%s}", + cm->classmark2[2], + cm->classmark2[2] & 0x1 ? " A5/2" : "", + cm->classmark2[2] & 0x2 ? " A5/3" : ""); + else + snprintf(cm2, sizeof(cm2), " no-cm2"); + + if (cm->classmark3_len >= 1) + snprintf(cm3, sizeof(cm3), " cm3{0x%x=%s%s%s%s}", + cm->classmark3[0], + cm->classmark3[0] & (1 << 0) ? " A5/4" : "", + cm->classmark3[0] & (1 << 1) ? " A5/5" : "", + cm->classmark3[0] & (1 << 2) ? " A5/6" : "", + cm->classmark3[0] & (1 << 3) ? " A5/7" : ""); + else + snprintf(cm3, sizeof(cm3), " no-cm3"); + + snprintf(buf, sizeof(buf), "%s%s%s", cm1, cm2, cm3); + return buf; +} + /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher. * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not @@ -1617,8 +1652,9 @@ if (ei.perm_algo_len == 0) { LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " - "between MSC-configured and MS-supported A5 algorithms\n", - vlr_subscr_name(conn->vsub)); + "between MSC-configured and MS-supported A5 algorithms. MSC: %x MS: %s\n", + vlr_subscr_name(conn->vsub), net->a5_encryption_mask, + classmark_a5_name(&conn->vsub->classmark)); return -ENOTSUP; } -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 13 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:25 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12405 ) Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... msc_vlr_tests: tweak logging in verbose mode Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 39d7e42..44ecc50 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1021,11 +1021,16 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, _log_lines? 1 : 0); + log_set_print_filename(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); - if (cmdline_opts.verbose) + if (cmdline_opts.verbose) { log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); + 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_use_color(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + } net = test_net(msc_vlr_tests_ctx); -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 13 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 09:51:26 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 09:51:26 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc.c: drop non-sensible error message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12456 ) Change subject: gsm_04_08_cc.c: drop non-sensible error message ...................................................................... gsm_04_08_cc.c: drop non-sensible error message Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index be9a451..7172184 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1659,8 +1659,6 @@ uint32_t addr = inet_addr(trans->conn->rtp.local_addr_cn); uint16_t port = trans->conn->rtp.local_port_cn; - LOGP(DMNCC, LOGL_ERROR, "RTP create for non-existing trans\n"); - if (addr == INADDR_NONE) { LOGP(DMNCC, LOGL_ERROR, "(subscriber:%s) external MNCC is signalling invalid IP-Address\n", -- To view, visit https://gerrit.osmocom.org/12456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icbf099e418281eb908e7916503f178ab7ea26ffe Gerrit-Change-Number: 12456 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:01:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:01:16 +0000 Subject: Change in osmocom-bb[master]: bsic decoding of neighbour cells in dedicated mode and partially succ... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/5490 ) Change subject: bsic decoding of neighbour cells in dedicated mode and partially success in synchronized handover ...................................................................... Patch Set 1: sent a follow-up to the submitter and the mailing list. -- To view, visit https://gerrit.osmocom.org/5490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib01460b796d2107c4599d327e184eb42340999d2 Gerrit-Change-Number: 5490 Gerrit-PatchSet: 1 Gerrit-Owner: Muhammad Awais Aslam Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 12 Jan 2019 10:01:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:04:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:04:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move make artifacts to build subdir In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/7405 ) Change subject: Move make artifacts to build subdir ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Id9ca176869ce6b80ccf2b2fff6554b121e1aa85c Gerrit-Change-Number: 7405 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:17:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:17:04 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Abandoned no progress since september on a trivial change for obscure operating systems we don't support anyway :/ -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:25:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:25:17 +0000 Subject: Change in osmo-ci[master]: add maintainer email to simtrace project In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12176 ) Change subject: add maintainer email to simtrace project ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 Gerrit-Change-Number: 12176 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 12 Jan 2019 10:25:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:25:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:25:19 +0000 Subject: Change in osmo-ci[master]: add maintainer email to simtrace project In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12176 ) Change subject: add maintainer email to simtrace project ...................................................................... add maintainer email to simtrace project Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index eb5db88..2fa40d9 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -364,6 +364,7 @@ cmd: > # keep first line with less indent to preserve newlines ./contrib/jenkins.sh --publish + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de - gapk -- To view, visit https://gerrit.osmocom.org/12176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 Gerrit-Change-Number: 12176 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 10:26:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 12 Jan 2019 10:26:00 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: Fix nullpointer deref In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12481 ) Change subject: gsm_04_08: Fix nullpointer deref ...................................................................... gsm_04_08: Fix nullpointer deref The pointers conn, conn->vsub and conn->vsub->last_tuple are checked, but before the check those pointers are already dereferenced during assignment. This defeats the purpose of the check. Lets dereference those pointers after the check. Fixes: CID#190404 Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e --- M src/libmsc/gsm_04_08.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Pau Espin Pedrol: 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 7a485c7..adc946e 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1603,12 +1603,12 @@ int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { - struct gsm_network *net = conn->network; + struct gsm_network *net; struct gsm0808_encrypt_info ei; int i, j = 0; int request_classmark = 0; int request_classmark_for_a5_n = 0; - struct vlr_auth_tuple *tuple = conn->vsub->last_tuple; + struct vlr_auth_tuple *tuple; if (!conn || !conn->vsub || !conn->vsub->last_tuple) { /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() @@ -1617,6 +1617,9 @@ return -EINVAL; } + net = conn->network; + tuple = conn->vsub->last_tuple; + for (i = 0; i < 8; i++) { int supported; -- To view, visit https://gerrit.osmocom.org/12481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice4992606f3799eac13154ec0b9f53e46d2e178e Gerrit-Change-Number: 12481 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 13:25:12 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sat, 12 Jan 2019 13:25:12 +0000 Subject: Change in openbsc[master]: Don't send SMS STATUS REPORT locally if the ESME accepted it. Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12538 Change subject: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Don't send SMS STATUS REPORT locally if the ESME accepted it. Backport of https://gerrit.osmocom.org/11792/ When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. In the case of the ESME mirroring the report back to us, this would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. Some MS then display the REPORT to the user as if it were a normal SMS. With this patch, we check if it is the sms_report that has had receiver set in sms_route_mt_sms() and not the original SMS we are reporting on, which of course already has receiver set. Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 --- M openbsc/src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/38/12538/1 diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 25ef487..d5619b2 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -697,7 +697,7 @@ } /* No route via SMPP, send the GSM 03.40 status-report now. */ - if (gsms->receiver) + if (sms_report->receiver) gsm340_rx_sms_submit(sms_report); LOGP(DLSMS, LOGL_NOTICE, "Status report has been sent\n"); -- To view, visit https://gerrit.osmocom.org/12538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 Gerrit-Change-Number: 12538 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 12 14:22:37 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 Jan 2019 14:22:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#807?= In-Reply-To: <246684672.533.1547286523468.JavaMail.jenkins@jenkins.osmocom.org> References: <246684672.533.1547286523468.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <472357616.535.1547302957960.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sat Jan 12 15:10:07 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 Jan 2019 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#368?= In-Reply-To: <1540500245.517.1547219407359.JavaMail.jenkins@jenkins.osmocom.org> References: <1540500245.517.1547219407359.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1726919671.536.1547305807368.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Jan 12 15:18:05 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 15:18:05 +0000 Subject: Change in docker-playground[master]: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12537 ) Change subject: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe Gerrit-Change-Number: 12537 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 12 Jan 2019 15:18:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 15:18:40 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 15:18:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12536 ) Change subject: BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB ...................................................................... BTS_Tests.ttcn: fix: use TRXC interface of the BTS side, not BB It was observed that 'BTS_Tests.TC_rach_max_ta' started to fail with the following reason: "BTS_Tests.ttcn:1091 : RACH passed but was expected to be dropped: -2560". My initial assumption was that the test case basically sends FAKE_TOA command on a wrong TRXC interface, and it was confirmed using trx_sniff.py: # TRXD of the BB side $ ./trx_sniff.py -p 6700 [DEBUG] trx_sniff.py:110 L1 -> TRX burst: fn=616 tn=0 pwr=0 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=597 tn=0 rssi=-60 toa256=-2560 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=598 tn=0 rssi=-60 toa256=-2560 ... # TRXD of the BTS side (Uplink bursts only) $ ./trx_sniff.py -p 5700 --direction L1 [DEBUG] trx_sniff.py:110 TRX -> L1 burst: fn=719 tn=0 rssi=-60 toa256=0 and additionally be enriching logging messages of fake_trx.py: [DEBUG] fake_trx.py:186 (trx at 0.0.0.0:6700) Recv FAKE_TOA cmd Sending FAKE_* commands on TRXC interface of the BB side affects the bursts being forwarded to this side, so we should use the TRXC interface of the BTS side to simulate Uplink delay. The reason why the test case has been passing some time ago is that there was a bug in fake_trx.py, that has been fixed recently. This patch makes 'BTS_Tests.TC_rach_max_ta' green again ;) Change-Id: I7736abd85407c186856be9f1a22613a1fa6e0c32 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0de787a..f7caac2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -50,8 +50,8 @@ charstring mp_rsl_ip := "127.0.0.2"; integer mp_rsl_port := 3003; integer mp_trx0_arfcn := 871; - charstring mp_bb_trxc_ip := "127.0.0.1"; - integer mp_bb_trxc_port := 6701; + charstring mp_bts_trxc_ip := "127.0.0.1"; + integer mp_bts_trxc_port := 5701; charstring mp_pcu_socket := PCU_SOCK_DEFAULT; charstring mp_ctrl_ip := "127.0.0.1"; integer mp_ctrl_port := 4238; @@ -81,8 +81,8 @@ port L1CTL_PT L1CTL; /* TRXC port (for classic tests) */ - port TRXC_CODEC_PT BB_TRXC; - var integer g_bb_trxc_conn_id; + port TRXC_CODEC_PT BTS_TRXC; + var integer g_bts_trxc_conn_id; /* VTY connections to both BTS and BSC */ port TELNETasp_PT BTSVTY; @@ -123,8 +123,8 @@ type component ConnHdlr extends RSL_DchanHdlr { port L1CTL_PT L1CTL; - port TRXC_CODEC_PT BB_TRXC; - var integer g_bb_trxc_conn_id; + port TRXC_CODEC_PT BTS_TRXC; + var integer g_bts_trxc_conn_id; timer g_Tguard; timer g_Tmeas_exp := 2.0; /* >= 103 SACCH multiframe ~ 500ms */ @@ -316,7 +316,7 @@ }; /* FIXME: FACCH/H is unreliable with calypso firmware, see OS#3653 */ - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { g_AllChanTypes := { /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), @@ -358,11 +358,11 @@ map(self:PCU, system:PCU); f_init_pcu(PCU, id, g_pcu_conn_id, g_pcu_last_info); - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { var TrxcMessage ret; /* start with a default moderate timing offset equalling TA=2 */ f_main_trxc_connect(); - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); } } @@ -418,24 +418,24 @@ } private function f_trxc_connect() runs on ConnHdlr { - map(self:BB_TRXC, system:BB_TRXC); + map(self:BTS_TRXC, system:BTS_TRXC); var Result res; - res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, + res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC, mp_bts_trxc_ip, mp_bts_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } - g_bb_trxc_conn_id := res.connId; + g_bts_trxc_conn_id := res.connId; } private function f_trxc_fake_rssi(uint8_t rssi) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); } private function f_trx_fake_toffs256(int16_t toffs256) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); } /* first function started in ConnHdlr component */ @@ -447,7 +447,7 @@ map(self:L1CTL, system:L1CTL); f_connect_reset(L1CTL); - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { f_trxc_connect(); } @@ -1060,20 +1060,20 @@ } private function f_main_trxc_connect() runs on test_CT { - map(self:BB_TRXC, system:BB_TRXC); + map(self:BTS_TRXC, system:BTS_TRXC); var Result res; - res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, + res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC, mp_bts_trxc_ip, mp_bts_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } - g_bb_trxc_conn_id := res.connId; + g_bts_trxc_conn_id := res.connId; } private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT { var TrxcMessage ret; /* tell fake_trx to use a given timing offset for all bursts */ - ret := f_TRXC_transceive(BB_TRXC, g_bb_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); f_sleep(0.5); /* Transmit RACH request + wait for confirmation */ @@ -1415,7 +1415,7 @@ f_l1_tune(L1CTL); RSL.clear; - if (mp_bb_trxc_port != -1) { + if (mp_bts_trxc_port != -1) { f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp)); f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); } -- To view, visit https://gerrit.osmocom.org/12536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7736abd85407c186856be9f1a22613a1fa6e0c32 Gerrit-Change-Number: 12536 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 12 15:18:46 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 12 Jan 2019 15:18:46 +0000 Subject: Change in docker-playground[master]: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12537 ) Change subject: BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter ...................................................................... BTS_Tests.cfg: use the new 'mp_bts_trxc_ip' parameter In I7736abd85407c186856be9f1a22613a1fa6e0c32 'mp_bb_trxc_ip' was renamed to 'mp_bts_trxc_ip'. Let's correct the config. Depends-On: (TTCN) I7736abd85407c186856be9f1a22613a1fa6e0c32 Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 2f5d752..da1c908 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -9,7 +9,7 @@ [MODULE_PARAMETERS] BTS_Tests.mp_rsl_ip := "172.18.9.10" -BTS_Tests.mp_bb_trxc_ip := "172.18.9.21" +BTS_Tests.mp_bts_trxc_ip := "172.18.9.21" BTS_Tests.mp_pcu_socket := "/data/unix/pcu_sock" L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" -- To view, visit https://gerrit.osmocom.org/12537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I886b652ddfb1afbfcf15f99672cca1d63fd714fe Gerrit-Change-Number: 12537 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 12 19:52:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:52:52 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c3a459e3c4cc_815ed4680379350@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_8.0/i586 Package network:osmocom:nightly/libusrp failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 90s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 90s] no -I../../firmware/include -c delay.c -o delay.rel [ 90s] /bin/bash: no: command not found [ 90s] Makefile:514: recipe for target 'delay.rel' failed [ 90s] make[4]: *** [delay.rel] Error 127 [ 90s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 90s] Makefile:392: recipe for target 'all-recursive' failed [ 90s] make[3]: *** [all-recursive] Error 1 [ 90s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 90s] Makefile:617: recipe for target 'all-recursive' failed [ 90s] make[2]: *** [all-recursive] Error 1 [ 90s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 90s] Makefile:537: recipe for target 'all' failed [ 90s] make[1]: *** [all] Error 2 [ 90s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 90s] dh_auto_build: make -j1 returned exit code 2 [ 90s] debian/rules:13: recipe for target 'build' failed [ 90s] make: *** [build] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 90s] [ 90s] build81 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:52:40 UTC 2019. [ 90s] [ 90s] ### VM INTERACTION START ### [ 91s] Powering off. [ 91s] [ 83.437354] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] build81 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:52:42 UTC 2019. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:52:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:52:35 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c3a459db24fd_815ed46803792df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_8.0/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 81s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 81s] no -I../../firmware/include -c delay.c -o delay.rel [ 81s] /bin/bash: no: command not found [ 81s] Makefile:514: recipe for target 'delay.rel' failed [ 81s] make[4]: *** [delay.rel] Error 127 [ 81s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 81s] Makefile:392: recipe for target 'all-recursive' failed [ 81s] make[3]: *** [all-recursive] Error 1 [ 81s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 81s] Makefile:617: recipe for target 'all-recursive' failed [ 81s] make[2]: *** [all-recursive] Error 1 [ 81s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 81s] Makefile:537: recipe for target 'all' failed [ 81s] make[1]: *** [all] Error 2 [ 81s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 81s] dh_auto_build: make -j1 returned exit code 2 [ 81s] debian/rules:13: recipe for target 'build' failed [ 81s] make: *** [build] Error 2 [ 81s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 81s] [ 81s] build73 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:52:31 UTC 2019. [ 81s] [ 81s] ### VM INTERACTION START ### [ 82s] Powering off. [ 82s] [ 73.714087] reboot: Power down [ 82s] ### VM INTERACTION END ### [ 82s] [ 82s] build73 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:52:33 UTC 2019. [ 82s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:01 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c3a45f62e39b_815ed46803794d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 162s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 162s] no -I../../firmware/include -c delay.c -o delay.rel [ 162s] /bin/bash: no: command not found [ 162s] Makefile:528: recipe for target 'delay.rel' failed [ 162s] make[4]: *** [delay.rel] Error 127 [ 162s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 162s] Makefile:404: recipe for target 'all-recursive' failed [ 162s] make[3]: *** [all-recursive] Error 1 [ 162s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 162s] Makefile:628: recipe for target 'all-recursive' failed [ 162s] make[2]: *** [all-recursive] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 162s] Makefile:549: recipe for target 'all' failed [ 162s] make[1]: *** [all] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: make -j1 returned exit code 2 [ 162s] debian/rules:13: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 162s] [ 162s] lamb28 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:53:48 UTC 2019. [ 162s] [ 162s] ### VM INTERACTION START ### [ 165s] [ 154.613865] sysrq: SysRq : Power Off [ 165s] [ 154.620831] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb28 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:53:51 UTC 2019. [ 165s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:18 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c3a45f6ceb0c_815ed46803796e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 173s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 173s] no -I../../firmware/include -c delay.c -o delay.rel [ 173s] /bin/bash: no: command not found [ 173s] Makefile:528: recipe for target 'delay.rel' failed [ 173s] make[4]: *** [delay.rel] Error 127 [ 173s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 173s] Makefile:404: recipe for target 'all-recursive' failed [ 173s] make[3]: *** [all-recursive] Error 1 [ 173s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 173s] Makefile:628: recipe for target 'all-recursive' failed [ 173s] make[2]: *** [all-recursive] Error 1 [ 173s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 173s] Makefile:549: recipe for target 'all' failed [ 173s] make[1]: *** [all] Error 2 [ 173s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 173s] dh_auto_build: make -j1 returned exit code 2 [ 173s] debian/rules:13: recipe for target 'build' failed [ 173s] make: *** [build] Error 2 [ 173s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 173s] [ 173s] lamb55 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:53:59 UTC 2019. [ 173s] [ 173s] ### VM INTERACTION START ### [ 176s] [ 163.650286] sysrq: SysRq : Power Off [ 176s] [ 163.659654] reboot: Power down [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] lamb55 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:02 UTC 2019. [ 176s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:18 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c3a45f75f0a4_815ed46803797d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_16.04/i586 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 170s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 170s] no -I../../firmware/include -c delay.c -o delay.rel [ 170s] /bin/bash: no: command not found [ 170s] Makefile:528: recipe for target 'delay.rel' failed [ 170s] make[4]: *** [delay.rel] Error 127 [ 170s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 170s] Makefile:404: recipe for target 'all-recursive' failed [ 170s] make[3]: *** [all-recursive] Error 1 [ 170s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 170s] Makefile:628: recipe for target 'all-recursive' failed [ 170s] make[2]: *** [all-recursive] Error 1 [ 170s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 170s] Makefile:549: recipe for target 'all' failed [ 170s] make[1]: *** [all] Error 2 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] dh_auto_build: make -j1 returned exit code 2 [ 170s] debian/rules:13: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] cumulus2 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:01 UTC 2019. [ 170s] [ 170s] ### VM INTERACTION START ### [ 173s] [ 161.403583] sysrq: SysRq : Power Off [ 173s] [ 161.425814] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] cumulus2 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:04 UTC 2019. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:18 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c3a45f67c301_815ed468037955e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 177s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 177s] no -I../../firmware/include -c delay.c -o delay.rel [ 177s] /bin/bash: no: command not found [ 177s] Makefile:528: recipe for target 'delay.rel' failed [ 177s] make[4]: *** [delay.rel] Error 127 [ 177s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 177s] Makefile:404: recipe for target 'all-recursive' failed [ 177s] make[3]: *** [all-recursive] Error 1 [ 177s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 177s] Makefile:628: recipe for target 'all-recursive' failed [ 177s] make[2]: *** [all-recursive] Error 1 [ 177s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 177s] Makefile:549: recipe for target 'all' failed [ 177s] make[1]: *** [all] Error 2 [ 177s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 177s] dh_auto_build: make -j1 returned exit code 2 [ 177s] debian/rules:13: recipe for target 'build' failed [ 177s] make: *** [build] Error 2 [ 177s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 177s] [ 177s] lamb01 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:53:59 UTC 2019. [ 177s] [ 177s] ### VM INTERACTION START ### [ 180s] [ 169.657771] sysrq: SysRq : Power Off [ 180s] [ 169.665031] reboot: Power down [ 180s] ### VM INTERACTION END ### [ 180s] [ 180s] lamb01 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:02 UTC 2019. [ 180s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:35 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c3a461160cad_815ed468037989@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_17.10/i586 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 187s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 187s] no -I../../firmware/include -c delay.c -o delay.rel [ 187s] /bin/bash: no: command not found [ 187s] Makefile:528: recipe for target 'delay.rel' failed [ 187s] make[4]: *** [delay.rel] Error 127 [ 187s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 187s] Makefile:404: recipe for target 'all-recursive' failed [ 187s] make[3]: *** [all-recursive] Error 1 [ 187s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 187s] Makefile:628: recipe for target 'all-recursive' failed [ 187s] make[2]: *** [all-recursive] Error 1 [ 187s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 187s] Makefile:549: recipe for target 'all' failed [ 187s] make[1]: *** [all] Error 2 [ 187s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 187s] dh_auto_build: make -j1 returned exit code 2 [ 187s] debian/rules:13: recipe for target 'build' failed [ 187s] make: *** [build] Error 2 [ 187s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 187s] [ 187s] lamb17 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:25 UTC 2019. [ 187s] [ 187s] ### VM INTERACTION START ### [ 190s] [ 178.944300] sysrq: SysRq : Power Off [ 190s] [ 178.952429] reboot: Power down [ 190s] ### VM INTERACTION END ### [ 190s] [ 190s] lamb17 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:29 UTC 2019. [ 190s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:52 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c3a4611e1562_815ed4680379935@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 213s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 213s] no -I../../firmware/include -c delay.c -o delay.rel [ 213s] /bin/bash: no: command not found [ 213s] Makefile:528: recipe for target 'delay.rel' failed [ 213s] make[4]: *** [delay.rel] Error 127 [ 213s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 213s] Makefile:404: recipe for target 'all-recursive' failed [ 213s] make[3]: *** [all-recursive] Error 1 [ 213s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 213s] Makefile:628: recipe for target 'all-recursive' failed [ 213s] make[2]: *** [all-recursive] Error 1 [ 213s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 213s] Makefile:549: recipe for target 'all' failed [ 213s] make[1]: *** [all] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] dh_auto_build: make -j1 returned exit code 2 [ 213s] debian/rules:13: recipe for target 'build' failed [ 213s] make: *** [build] Error 2 [ 213s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 213s] [ 213s] lamb59 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:35 UTC 2019. [ 213s] [ 213s] ### VM INTERACTION START ### [ 217s] [ 204.953428] sysrq: SysRq : Power Off [ 217s] [ 204.960202] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] lamb59 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:39 UTC 2019. [ 217s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:54:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:54:52 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c3a4612517ee_815ed4680380058@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_18.04/i586 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 218s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 218s] no -I../../firmware/include -c delay.c -o delay.rel [ 218s] /bin/bash: no: command not found [ 218s] Makefile:528: recipe for target 'delay.rel' failed [ 218s] make[4]: *** [delay.rel] Error 127 [ 218s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 218s] Makefile:404: recipe for target 'all-recursive' failed [ 218s] make[3]: *** [all-recursive] Error 1 [ 218s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 218s] Makefile:628: recipe for target 'all-recursive' failed [ 218s] make[2]: *** [all-recursive] Error 1 [ 218s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 218s] Makefile:549: recipe for target 'all' failed [ 218s] make[1]: *** [all] Error 2 [ 218s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 218s] dh_auto_build: make -j1 returned exit code 2 [ 218s] debian/rules:13: recipe for target 'build' failed [ 218s] make: *** [build] Error 2 [ 218s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 218s] [ 218s] lamb55 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:39 UTC 2019. [ 218s] [ 218s] ### VM INTERACTION START ### [ 221s] [ 208.331949] sysrq: SysRq : Power Off [ 221s] [ 208.336549] reboot: Power down [ 221s] ### VM INTERACTION END ### [ 221s] [ 221s] lamb55 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:54:43 UTC 2019. [ 221s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 19:55:27 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 19:55:27 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c3a46312eada_815ed46803801f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/i586 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 235s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 235s] no -I../../firmware/include -c delay.c -o delay.rel [ 235s] /bin/bash: no: command not found [ 235s] Makefile:528: recipe for target 'delay.rel' failed [ 235s] make[4]: *** [delay.rel] Error 127 [ 235s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 235s] Makefile:404: recipe for target 'all-recursive' failed [ 235s] make[3]: *** [all-recursive] Error 1 [ 235s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 235s] Makefile:628: recipe for target 'all-recursive' failed [ 235s] make[2]: *** [all-recursive] Error 1 [ 235s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 235s] Makefile:549: recipe for target 'all' failed [ 235s] make[1]: *** [all] Error 2 [ 235s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 235s] dh_auto_build: make -j1 returned exit code 2 [ 235s] debian/rules:13: recipe for target 'build' failed [ 235s] make: *** [build] Error 2 [ 235s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 235s] [ 235s] cloud124 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:55:15 UTC 2019. [ 235s] [ 235s] ### VM INTERACTION START ### [ 238s] [ 210.948212] sysrq: SysRq : Power Off [ 238s] [ 210.953505] reboot: Power down [ 239s] ### VM INTERACTION END ### [ 239s] [ 239s] cloud124 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 19:55:20 UTC 2019. [ 239s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 12 21:19:44 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 21:19:44 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c3a5a0131083_815ed4680383146@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/armv7l Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 273s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/lib' [ 273s] no -I../../firmware/include -c delay.c -o delay.rel [ 273s] /bin/bash: no: command not found [ 273s] Makefile:528: recipe for target 'delay.rel' failed [ 273s] make[4]: *** [delay.rel] Error 127 [ 273s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 273s] Makefile:404: recipe for target 'all-recursive' failed [ 273s] make[3]: *** [all-recursive] Error 1 [ 273s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 273s] Makefile:628: recipe for target 'all-recursive' failed [ 273s] make[2]: *** [all-recursive] Error 1 [ 273s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 273s] Makefile:549: recipe for target 'all' failed [ 273s] make[1]: *** [all] Error 2 [ 273s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 273s] dh_auto_build: make -j1 returned exit code 2 [ 273s] debian/rules:13: recipe for target 'build' failed [ 273s] make: *** [build] Error 2 [ 273s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 273s] [ 273s] armbuild01 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 21:19:25 UTC 2019. [ 273s] [ 273s] ### VM INTERACTION START ### [ 276s] [ 248.770365] SysRq : Power Off [ 276s] [ 248.771449] reboot: Power down [ 277s] ### VM INTERACTION END ### [ 277s] [ 277s] armbuild01 failed "build libusrp_3.4.2.20190112.dsc" at Sat Jan 12 21:19:29 UTC 2019. [ 277s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jan 12 22:38:29 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 12 Jan 2019 22:38:29 +0000 Subject: Change in openbsc[master]: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12538 ) Change subject: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 Gerrit-Change-Number: 12538 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 12 Jan 2019 22:38:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 12 22:49:44 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Jan 2019 22:49:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c3a6f189b69e_815ed4680385032@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 36s] [63/71] preinstalling libblkid1... [ 37s] [64/71] preinstalling libmount1... [ 37s] [65/71] preinstalling bash... [ 38s] [66/71] preinstalling mount... [ 38s] [67/71] preinstalling util-linux... [ 38s] [68/71] preinstalling sysvinit-utils... [ 39s] [69/71] preinstalling e2fsprogs... [ 39s] [70/71] preinstalling sysv-rc... [ 39s] [71/71] preinstalling initscripts... [ 40s] [ 40s] [1/1] preinstalling libdevmapper1.02.1... [ 41s] copying packages... [ 47s] reordering...cycle: libc6 -> libgcc1 [ 47s] breaking dependency libgcc1 -> libc6 [ 47s] cycle: debhelper -> dh-autoreconf [ 47s] breaking dependency debhelper -> dh-autoreconf [ 47s] cycle: dh-strip-nondeterminism -> debhelper [ 47s] breaking dependency debhelper -> dh-strip-nondeterminism [ 47s] done [ 48s] objdump: /boot/zImage.guest: file format not recognized [ 51s] booting kvm... [ 51s] ### VM INTERACTION START ### [ 51s] linux64 /usr/bin/qemu-system-arm -nodefaults -no-reboot -nographic -vga none -cpu host -enable-kvm -M virt -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/zImage.guest -initrd /boot/initrd -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyAMA0 init=/.build/build -m 1020 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-device,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-device,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 1 [ 51s] /usr/bin/qemu-system-arm: /usr/bin/qemu-system-arm: cannot execute binary file [ 51s] ### VM INTERACTION END ### [ 51s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 51s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:15:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 09:15:17 +0000 Subject: Change in libusrp[master]: debian: Add 'sdcc' package to BuildDepends Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12539 Change subject: debian: Add 'sdcc' package to BuildDepends ...................................................................... debian: Add 'sdcc' package to BuildDepends We recently re-introduced building the USRP1 FX2 firmware using SDCC. This needs to be listed as requirement for building the package, otherwise build are failing. Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/39/12539/1 diff --git a/debian/control b/debian/control index 7982c27..54bc7af 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ doxygen, libtool, pkg-config, + sdcc, libusb-1.0-0-dev, libboost-all-dev Standards-Version: 3.9.8 -- To view, visit https://gerrit.osmocom.org/12539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887 Gerrit-Change-Number: 12539 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:26:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:26:51 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: fix trx_list cross-reference Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12540 Change subject: trx_toolkit/burst_fwd.py: fix trx_list cross-reference ...................................................................... trx_toolkit/burst_fwd.py: fix trx_list cross-reference It was discovered that using an empty list as default argument value does result into the cross-reference, i.e. all instances of BurstForwarder would reference the same trx_list object. This is not an expected behaviour, let's fix this. Change-Id: Id71185de05b0ebc5adb105b10fad2cbde5f800b1 --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/12540/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 38ce18f..164271f 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -43,9 +43,12 @@ """ - def __init__(self, trx_list = []): + def __init__(self, trx_list = None): # List of Transceiver instances - self.trx_list = trx_list + if trx_list is not None: + self.trx_list = trx_list + else: + self.trx_list = [] def add_trx(self, trx): if trx in self.trx_list: -- To view, visit https://gerrit.osmocom.org/12540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id71185de05b0ebc5adb105b10fad2cbde5f800b1 Gerrit-Change-Number: 12540 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:26:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:26:51 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add support for child transceivers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12541 Change subject: trx_toolkit/transceiver.py: add support for child transceivers ...................................................................... trx_toolkit/transceiver.py: add support for child transceivers A BTS can (optionally) have more than one transceiver. In this case additional (let's say child) transceivers basically share the same clock source of the first transceiver, and being powered on / off as soon as the first transceiver is powered on / off. Change-Id: I7e97b7f32dde7ab74779133e9d7504f1d0fce60c --- M src/target/trx_toolkit/transceiver.py A src/target/trx_toolkit/trx_list.py 2 files changed, 100 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/12541/1 diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index edd4d31..57ca531 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -4,7 +4,7 @@ # TRX Toolkit # Transceiver implementation # -# (C) 2018 by Vadim Yanitskiy +# (C) 2018-2019 by Vadim Yanitskiy # # All Rights Reserved # @@ -27,6 +27,7 @@ from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface from udp_link import UDPLink +from trx_list import TRXList class Transceiver: """ Base transceiver implementation. @@ -54,6 +55,21 @@ NOTE: we don't store the associated channel combinations, as they are only useful for burst detection and demodulation. + == Child transceivers + + A BTS can (optionally) have more than one transceiver. In this case + additional (let's say child) transceivers basically share the same + clock source of the first transceiver, so UDP port mapping is a bit + different, for example: + + (trx_0) clck=5700, ctrl=5701, data=5702, + (trx_1) ctrl=5703, data=5704, + (trx_2) ctrl=5705, data=5706. + ... + + As soon as the first transceiver is powered on / off, + all child transceivers are also powered on / off. + == Clock distribution (optional) The clock indications are not expected by L1 when transceiver @@ -75,21 +91,26 @@ """ def __init__(self, bind_addr, remote_addr, base_port, - clck_gen = None, pwr_meas = None): + child_idx = 0, clck_gen = None, pwr_meas = None): # Connection info self.remote_addr = remote_addr self.bind_addr = bind_addr self.base_port = base_port + self.child_idx = child_idx + + # Child transceiver cannot have its own clock + if clck_gen is not None and child_idx > 0: + raise TypeError("Child transceiver cannot have its own clock") # Init DATA interface self.data_if = DATAInterface( - remote_addr, base_port + 102, - bind_addr, base_port + 2) + remote_addr, base_port + child_idx * 2 + 102, + bind_addr, base_port + child_idx * 2 + 2) # Init CTRL interface self.ctrl_if = CTRLInterfaceTRX(self, - remote_addr, base_port + 101, - bind_addr, base_port + 1) + remote_addr, base_port + child_idx * 2 + 101, + bind_addr, base_port + child_idx * 2 + 1) # Init optional CLCK interface self.clck_gen = clck_gen @@ -111,12 +132,22 @@ # List of active (configured) timeslots self.ts_list = [] + # List of child transceivers + self.child_trx_list = TRXList() + # To be overwritten if required, # no custom command handlers by default def ctrl_cmd_handler(self, request): return None def power_event_handler(self, event): + # Update child transceivers + for trx in self.child_trx_list.trx_list: + if event == "POWERON": + trx.running = True + else: + trx.running = False + # Trigger clock generator if required if self.clck_gen is not None: clck_links = self.clck_gen.clck_links diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py new file mode 100644 index 0000000..7bea560 --- /dev/null +++ b/src/target/trx_toolkit/trx_list.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Transceiver list implementation +# +# (C) 2019 by Vadim Yanitskiy +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +class TRXList: + """ Transceiver list implementation. + + This class is a simple wrapper around generic Python's list. + The aim is to simplify management of multiple Transceiver + instances, e.g. appending, removing and finding them. + + """ + + def __init__(self): + self.trx_list = [] + + def __getitem__(self, i): + return self.trx_list[i] + + def find_trx(self, remote_addr, base_port, child_idx = 0): + for trx in self.trx_list: + if trx.remote_addr != remote_addr: + continue + if trx.base_port != base_port: + continue + if trx.child_idx != child_idx: + continue + return trx + + return None + + def add_trx(self, trx): + if trx in self.trx_list: + raise IndexError("TRX '%s' is already in the list" % trx) + if self.find_trx(trx.remote_addr, trx.base_port, trx.child_idx): + raise IndexError("TRX '%s' has duplicate in the list" % trx) + + self.trx_list.append(trx) + + def del_trx(self, trx): + if trx not in self.trx_list: + raise IndexError("TRX '%s' is not in the list" % trx) + self.trx_list.remove(trx) -- To view, visit https://gerrit.osmocom.org/12541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7e97b7f32dde7ab74779133e9d7504f1d0fce60c Gerrit-Change-Number: 12541 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:26:52 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:26:52 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12542 Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... trx_toolkit/fake_trx.py: handle multiple transceivers Since Ice44e2b22566b3652ef6d43896055963b13ab185 is merged, the class hierarchy has become much more flexible, so it's possible to create multiple Transceiver / FakeTRX instances and distribute bursts using a single instance of BurstForwarder. This change introduces a new command line option, that can be used to specify additional transceivers. Please note that fake_trx.py still initializes a pair of BTS and BB transceivers by default. The new option has the following format: --trx REMOTE_ADDR:BASE_PORT[/TRX_NUM] Some examples for IPv4 and IPv6: --trx 127.0.0.1:5703 --trx [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6703 If optional TRX_NUM > 0 is specified, e.g.: --trx 127.0.0.1:5700/1 then this transceiver is considered as a child of another one. See I7e97b7f32dde7ab74779133e9d7504f1d0fce60c for details. Change-Id: I504e7fb7d9058f8333aeab7fb9fd77c9d9f70570 --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 81 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/12542/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 46b413a..0f473d0 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -30,11 +30,13 @@ import random import select import sys +import re from app_common import ApplicationBase from burst_fwd import BurstForwarder from transceiver import Transceiver from clck_gen import CLCKGen +from trx_list import TRXList from fake_pm import FakePM class FakeTRX(Transceiver): @@ -270,6 +272,34 @@ # Configure logging self.app_init_logging(self.argv) + # List of all transceivers + self.trx_list = TRXList() + + def append_trx(self, remote_addr, base_port): + trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, + clck_gen = self.clck_gen, pwr_meas = self.fake_pm) + self.trx_list.add_trx(trx) + + def append_child_trx(self, remote_addr, base_port, child_idx): + # Index 0 corresponds to the first transceiver + if child_idx is 0: + self.append_trx(remote_addr, base_port) + return + + # Find 'parent' transceiver for a new child + trx_parent = self.trx_list.find_trx(remote_addr, base_port) + if trx_parent is None: + raise IndexError("Couldn't find parent transceiver " + "for '%s:%d/%d'" % (remote_addr, base_port, child_idx)) + + # Allocate a new child + trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, + child_idx = child_idx, pwr_meas = self.fake_pm) + self.trx_list.add_trx(trx_child) + + # Link a new 'child' with its 'parent' + trx_parent.child_trx_list.add_trx(trx_child) + def run(self): # Init shared clock generator self.clck_gen = CLCKGen([]) @@ -280,49 +310,44 @@ self.fake_pm = FakePM(-120, -105, -75, -50) # Init TRX instance for BTS - self.bts_trx = FakeTRX(self.argv.trx_bind_addr, - self.argv.bts_addr, self.argv.bts_base_port, - clck_gen = self.clck_gen) + self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) # Init TRX instance for BB - self.bb_trx = FakeTRX(self.argv.trx_bind_addr, - self.argv.bb_addr, self.argv.bb_base_port, - pwr_meas = self.fake_pm) + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + + # Additional transceivers (optional) + if self.argv.trx_list is not None: + for trx_def in self.argv.trx_list: + (addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx) # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder() - self.burst_fwd.add_trx(self.bts_trx) - self.burst_fwd.add_trx(self.bb_trx) + self.burst_fwd = BurstForwarder(self.trx_list) + + # Compose list of to be monitored sockets + self.sock_list = [] + for trx in self.trx_list: + self.sock_list.append(trx.ctrl_if.sock) + self.sock_list.append(trx.data_if.sock) log.info("Init complete") # Enter main loop while True: - socks = [self.bts_trx.ctrl_if.sock, self.bb_trx.ctrl_if.sock, - self.bts_trx.data_if.sock, self.bb_trx.data_if.sock] - # Wait until we get any data on any socket - r_event, w_event, x_event = select.select(socks, [], []) + r_event, _, _ = select.select(self.sock_list, [], []) - # Downlink: BTS -> BB - if self.bts_trx.data_if.sock in r_event: - msg = self.bts_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bts_trx, msg) + # Iterate over all transceivers + for trx in self.trx_list: + # DATA interface + if trx.data_if.sock in r_event: + msg = trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(trx, msg) - # Uplink: BB -> BTS - if self.bb_trx.data_if.sock in r_event: - msg = self.bb_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bb_trx, msg) - - # CTRL commands from BTS - if self.bts_trx.ctrl_if.sock in r_event: - self.bts_trx.ctrl_if.handle_rx() - - # CTRL commands from BB - if self.bb_trx.ctrl_if.sock in r_event: - self.bb_trx.ctrl_if.handle_rx() + # CTRL interface + if trx.ctrl_if.sock in r_event: + trx.ctrl_if.handle_rx() def shutdown(self): log.info("Shutting down...") @@ -330,6 +355,25 @@ # Stop clock generator self.clck_gen.stop() + # Parses a TRX definition of the following + # format: REMOTE_ADDR:BIND_PORT[/TRX_NUM] + # e.g. [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5700/5 + # e.g. 127.0.0.1:5700 or 127.0.0.1:5700/1 + @staticmethod + def trx_def(val): + try: + result = re.match("(.+):([0-9]+)(\/[0-9]+)?", val) + (addr, port, idx) = result.groups() + except: + raise argparse.ArgumentTypeError("Invalid TRX definition: %s" % val) + + if idx is not None: + idx = int(idx[1:]) + else: + idx = 0 + + return (addr, int(port), idx) + def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", description = "Virtual Um-interface (fake transceiver)") @@ -354,6 +398,12 @@ dest = "bb_base_port", type = int, default = 6700, help = "Set BB base port number (default %(default)s)") + mtrx_group = parser.add_argument_group("Additional transceivers") + mtrx_group.add_argument("--trx", + metavar = "REMOTE_ADDR:BASE_PORT[/TRX_NUM]", + dest = "trx_list", type = self.trx_def, action = "append", + help = "Add a transceiver for BTS or MS (e.g. 127.0.0.1:5703)") + argv = parser.parse_args() # Make sure there is no overlap between ports -- To view, visit https://gerrit.osmocom.org/12542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I504e7fb7d9058f8333aeab7fb9fd77c9d9f70570 Gerrit-Change-Number: 12542 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:26:52 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:26:52 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12543 Change subject: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM ...................................................................... trx_toolkit/fake_trx.py: fix: update trx_list of FakePM It seems in Ice44e2b22566b3652ef6d43896055963b13ab185 I forgot to do this, so all measurements triggered by MEASURE command were incorrect (always noise). Let's fix this! Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/12543/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 0f473d0..0bf9266 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -308,6 +308,7 @@ # Noise: -120 .. -105 # BTS: -75 .. -50 self.fake_pm = FakePM(-120, -105, -75, -50) + self.fake_pm.trx_list = self.trx_list # Init TRX instance for BTS self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) -- To view, visit https://gerrit.osmocom.org/12543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c Gerrit-Change-Number: 12543 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:31:50 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:31:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: fix trx_list cross-reference In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12540 ) Change subject: trx_toolkit/burst_fwd.py: fix trx_list cross-reference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id71185de05b0ebc5adb105b10fad2cbde5f800b1 Gerrit-Change-Number: 12540 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 13 Jan 2019 09:31:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:31:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:31:55 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: fix trx_list cross-reference In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12540 ) Change subject: trx_toolkit/burst_fwd.py: fix trx_list cross-reference ...................................................................... trx_toolkit/burst_fwd.py: fix trx_list cross-reference It was discovered that using an empty list as default argument value does result into the cross-reference, i.e. all instances of BurstForwarder would reference the same trx_list object. This is not an expected behaviour, let's fix this. Change-Id: Id71185de05b0ebc5adb105b10fad2cbde5f800b1 --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 38ce18f..164271f 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -43,9 +43,12 @@ """ - def __init__(self, trx_list = []): + def __init__(self, trx_list = None): # List of Transceiver instances - self.trx_list = trx_list + if trx_list is not None: + self.trx_list = trx_list + else: + self.trx_list = [] def add_trx(self, trx): if trx in self.trx_list: -- To view, visit https://gerrit.osmocom.org/12540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id71185de05b0ebc5adb105b10fad2cbde5f800b1 Gerrit-Change-Number: 12540 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:36:02 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:36:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/12542 ) Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... Abandoned Duplicate of Ibff31fb3a958a714c828d0dea7e87d47f778fd80. My bad, I forgot to update Change-Id after 'git reset'... -- To view, visit https://gerrit.osmocom.org/12542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I504e7fb7d9058f8333aeab7fb9fd77c9d9f70570 Gerrit-Change-Number: 12542 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:39:03 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:39:03 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12325 ) Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 Gerrit-Change-Number: 12325 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 13 Jan 2019 09:39:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 09:44:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 09:44:23 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12543 ) Change subject: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c Gerrit-Change-Number: 12543 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 13 Jan 2019 09:44:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:29:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:29:04 +0000 Subject: Change in libusrp[master]: debian: Add 'sdcc' package to BuildDepends In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12539 ) Change subject: debian: Add 'sdcc' package to BuildDepends ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887 Gerrit-Change-Number: 12539 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 13 Jan 2019 12:29:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:29:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:29:06 +0000 Subject: Change in libusrp[master]: debian: Add 'sdcc' package to BuildDepends In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12539 ) Change subject: debian: Add 'sdcc' package to BuildDepends ...................................................................... debian: Add 'sdcc' package to BuildDepends We recently re-introduced building the USRP1 FX2 firmware using SDCC. This needs to be listed as requirement for building the package, otherwise build are failing. Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 7982c27..54bc7af 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ doxygen, libtool, pkg-config, + sdcc, libusb-1.0-0-dev, libboost-all-dev Standards-Version: 3.9.8 -- To view, visit https://gerrit.osmocom.org/12539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887 Gerrit-Change-Number: 12539 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:30:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:30:04 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add support for child transceivers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12541 ) Change subject: trx_toolkit/transceiver.py: add support for child transceivers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e97b7f32dde7ab74779133e9d7504f1d0fce60c Gerrit-Change-Number: 12541 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 13 Jan 2019 12:30:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:30:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:30:27 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12543 ) Change subject: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c Gerrit-Change-Number: 12543 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 13 Jan 2019 12:30:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:30:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:30:44 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12325 ) Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 Gerrit-Change-Number: 12325 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 13 Jan 2019 12:30:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:31:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:31:44 +0000 Subject: Change in openbsc[master]: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12538 ) Change subject: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 Gerrit-Change-Number: 12538 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 13 Jan 2019 12:31:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 12:31:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 12:31:46 +0000 Subject: Change in openbsc[master]: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12538 ) Change subject: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Don't send SMS STATUS REPORT locally if the ESME accepted it. Backport of https://gerrit.osmocom.org/11792/ When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. In the case of the ESME mirroring the report back to us, this would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. Some MS then display the REPORT to the user as if it were a normal SMS. With this patch, we check if it is the sms_report that has had receiver set in sms_route_mt_sms() and not the original SMS we are reporting on, which of course already has receiver set. Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 --- M openbsc/src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 25ef487..d5619b2 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -697,7 +697,7 @@ } /* No route via SMPP, send the GSM 03.40 status-report now. */ - if (gsms->receiver) + if (sms_report->receiver) gsm340_rx_sms_submit(sms_report); LOGP(DLSMS, LOGL_NOTICE, "Status report has been sent\n"); -- To view, visit https://gerrit.osmocom.org/12538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2136489bd21c4755463278a4048a446e5bc4a9d2 Gerrit-Change-Number: 12538 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 13:04:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 Jan 2019 13:04:29 +0000 Subject: Change in osmo-ci[master]: add osmo-asf4-dfu master and gerrit jobs Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12544 Change subject: add osmo-asf4-dfu master and gerrit jobs ...................................................................... add osmo-asf4-dfu master and gerrit jobs Change-Id: I5bc5ca30809af8d8b472a75a9e02c4964761de38 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/12544/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 20eceef..c4737ff 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -254,6 +254,7 @@ - osmo-sysmon - osmo-remsim - simtrace2 + - osmo-asf4-dfu - gapk - pysim: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 2fa40d9..52e3ca7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -360,6 +360,7 @@ - osmo-sysmon - osmo-remsim + - osmo-asf4-dfu - simtrace2: cmd: > # keep first line with less indent to preserve newlines -- To view, visit https://gerrit.osmocom.org/12544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5bc5ca30809af8d8b472a75a9e02c4964761de38 Gerrit-Change-Number: 12544 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Jan 13 15:10:07 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 13 Jan 2019 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#369?= In-Reply-To: <1726919671.536.1547305807368.JavaMail.jenkins@jenkins.osmocom.org> References: <1726919671.536.1547305807368.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <689089736.552.1547392207316.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.83 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Jan 13 19:55:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 19:55:44 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add support for child transceivers In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12541 ) Change subject: trx_toolkit/transceiver.py: add support for child transceivers ...................................................................... trx_toolkit/transceiver.py: add support for child transceivers A BTS can (optionally) have more than one transceiver. In this case additional (let's say child) transceivers basically share the same clock source of the first transceiver, and being powered on / off as soon as the first transceiver is powered on / off. Change-Id: I7e97b7f32dde7ab74779133e9d7504f1d0fce60c --- M src/target/trx_toolkit/transceiver.py A src/target/trx_toolkit/trx_list.py 2 files changed, 100 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index edd4d31..57ca531 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -4,7 +4,7 @@ # TRX Toolkit # Transceiver implementation # -# (C) 2018 by Vadim Yanitskiy +# (C) 2018-2019 by Vadim Yanitskiy # # All Rights Reserved # @@ -27,6 +27,7 @@ from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface from udp_link import UDPLink +from trx_list import TRXList class Transceiver: """ Base transceiver implementation. @@ -54,6 +55,21 @@ NOTE: we don't store the associated channel combinations, as they are only useful for burst detection and demodulation. + == Child transceivers + + A BTS can (optionally) have more than one transceiver. In this case + additional (let's say child) transceivers basically share the same + clock source of the first transceiver, so UDP port mapping is a bit + different, for example: + + (trx_0) clck=5700, ctrl=5701, data=5702, + (trx_1) ctrl=5703, data=5704, + (trx_2) ctrl=5705, data=5706. + ... + + As soon as the first transceiver is powered on / off, + all child transceivers are also powered on / off. + == Clock distribution (optional) The clock indications are not expected by L1 when transceiver @@ -75,21 +91,26 @@ """ def __init__(self, bind_addr, remote_addr, base_port, - clck_gen = None, pwr_meas = None): + child_idx = 0, clck_gen = None, pwr_meas = None): # Connection info self.remote_addr = remote_addr self.bind_addr = bind_addr self.base_port = base_port + self.child_idx = child_idx + + # Child transceiver cannot have its own clock + if clck_gen is not None and child_idx > 0: + raise TypeError("Child transceiver cannot have its own clock") # Init DATA interface self.data_if = DATAInterface( - remote_addr, base_port + 102, - bind_addr, base_port + 2) + remote_addr, base_port + child_idx * 2 + 102, + bind_addr, base_port + child_idx * 2 + 2) # Init CTRL interface self.ctrl_if = CTRLInterfaceTRX(self, - remote_addr, base_port + 101, - bind_addr, base_port + 1) + remote_addr, base_port + child_idx * 2 + 101, + bind_addr, base_port + child_idx * 2 + 1) # Init optional CLCK interface self.clck_gen = clck_gen @@ -111,12 +132,22 @@ # List of active (configured) timeslots self.ts_list = [] + # List of child transceivers + self.child_trx_list = TRXList() + # To be overwritten if required, # no custom command handlers by default def ctrl_cmd_handler(self, request): return None def power_event_handler(self, event): + # Update child transceivers + for trx in self.child_trx_list.trx_list: + if event == "POWERON": + trx.running = True + else: + trx.running = False + # Trigger clock generator if required if self.clck_gen is not None: clck_links = self.clck_gen.clck_links diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py new file mode 100644 index 0000000..7bea560 --- /dev/null +++ b/src/target/trx_toolkit/trx_list.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Transceiver list implementation +# +# (C) 2019 by Vadim Yanitskiy +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +class TRXList: + """ Transceiver list implementation. + + This class is a simple wrapper around generic Python's list. + The aim is to simplify management of multiple Transceiver + instances, e.g. appending, removing and finding them. + + """ + + def __init__(self): + self.trx_list = [] + + def __getitem__(self, i): + return self.trx_list[i] + + def find_trx(self, remote_addr, base_port, child_idx = 0): + for trx in self.trx_list: + if trx.remote_addr != remote_addr: + continue + if trx.base_port != base_port: + continue + if trx.child_idx != child_idx: + continue + return trx + + return None + + def add_trx(self, trx): + if trx in self.trx_list: + raise IndexError("TRX '%s' is already in the list" % trx) + if self.find_trx(trx.remote_addr, trx.base_port, trx.child_idx): + raise IndexError("TRX '%s' has duplicate in the list" % trx) + + self.trx_list.append(trx) + + def del_trx(self, trx): + if trx not in self.trx_list: + raise IndexError("TRX '%s' is not in the list" % trx) + self.trx_list.remove(trx) -- To view, visit https://gerrit.osmocom.org/12541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7e97b7f32dde7ab74779133e9d7504f1d0fce60c Gerrit-Change-Number: 12541 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 19:55:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 19:55:44 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12325 ) Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... trx_toolkit/fake_trx.py: handle multiple transceivers Since Ice44e2b22566b3652ef6d43896055963b13ab185 is merged, the class hierarchy has become much more flexible, so it's possible to create multiple Transceiver / FakeTRX instances and distribute bursts using a single instance of BurstForwarder. This change introduces a new command line option, that can be used to specify additional transceivers. Please note that fake_trx.py still initializes a pair of BTS and BB transceivers by default. The new option has the following format: --trx REMOTE_ADDR:BASE_PORT[/TRX_NUM] Some examples for IPv4 and IPv6: --trx 127.0.0.1:5703 --trx [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6703 If optional TRX_NUM > 0 is specified, e.g.: --trx 127.0.0.1:5700/1 then this transceiver is considered as a child of another one. See I7e97b7f32dde7ab74779133e9d7504f1d0fce60c for details. Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 81 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 46b413a..0f473d0 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -30,11 +30,13 @@ import random import select import sys +import re from app_common import ApplicationBase from burst_fwd import BurstForwarder from transceiver import Transceiver from clck_gen import CLCKGen +from trx_list import TRXList from fake_pm import FakePM class FakeTRX(Transceiver): @@ -270,6 +272,34 @@ # Configure logging self.app_init_logging(self.argv) + # List of all transceivers + self.trx_list = TRXList() + + def append_trx(self, remote_addr, base_port): + trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, + clck_gen = self.clck_gen, pwr_meas = self.fake_pm) + self.trx_list.add_trx(trx) + + def append_child_trx(self, remote_addr, base_port, child_idx): + # Index 0 corresponds to the first transceiver + if child_idx is 0: + self.append_trx(remote_addr, base_port) + return + + # Find 'parent' transceiver for a new child + trx_parent = self.trx_list.find_trx(remote_addr, base_port) + if trx_parent is None: + raise IndexError("Couldn't find parent transceiver " + "for '%s:%d/%d'" % (remote_addr, base_port, child_idx)) + + # Allocate a new child + trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, + child_idx = child_idx, pwr_meas = self.fake_pm) + self.trx_list.add_trx(trx_child) + + # Link a new 'child' with its 'parent' + trx_parent.child_trx_list.add_trx(trx_child) + def run(self): # Init shared clock generator self.clck_gen = CLCKGen([]) @@ -280,49 +310,44 @@ self.fake_pm = FakePM(-120, -105, -75, -50) # Init TRX instance for BTS - self.bts_trx = FakeTRX(self.argv.trx_bind_addr, - self.argv.bts_addr, self.argv.bts_base_port, - clck_gen = self.clck_gen) + self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) # Init TRX instance for BB - self.bb_trx = FakeTRX(self.argv.trx_bind_addr, - self.argv.bb_addr, self.argv.bb_base_port, - pwr_meas = self.fake_pm) + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + + # Additional transceivers (optional) + if self.argv.trx_list is not None: + for trx_def in self.argv.trx_list: + (addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx) # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder() - self.burst_fwd.add_trx(self.bts_trx) - self.burst_fwd.add_trx(self.bb_trx) + self.burst_fwd = BurstForwarder(self.trx_list) + + # Compose list of to be monitored sockets + self.sock_list = [] + for trx in self.trx_list: + self.sock_list.append(trx.ctrl_if.sock) + self.sock_list.append(trx.data_if.sock) log.info("Init complete") # Enter main loop while True: - socks = [self.bts_trx.ctrl_if.sock, self.bb_trx.ctrl_if.sock, - self.bts_trx.data_if.sock, self.bb_trx.data_if.sock] - # Wait until we get any data on any socket - r_event, w_event, x_event = select.select(socks, [], []) + r_event, _, _ = select.select(self.sock_list, [], []) - # Downlink: BTS -> BB - if self.bts_trx.data_if.sock in r_event: - msg = self.bts_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bts_trx, msg) + # Iterate over all transceivers + for trx in self.trx_list: + # DATA interface + if trx.data_if.sock in r_event: + msg = trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(trx, msg) - # Uplink: BB -> BTS - if self.bb_trx.data_if.sock in r_event: - msg = self.bb_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bb_trx, msg) - - # CTRL commands from BTS - if self.bts_trx.ctrl_if.sock in r_event: - self.bts_trx.ctrl_if.handle_rx() - - # CTRL commands from BB - if self.bb_trx.ctrl_if.sock in r_event: - self.bb_trx.ctrl_if.handle_rx() + # CTRL interface + if trx.ctrl_if.sock in r_event: + trx.ctrl_if.handle_rx() def shutdown(self): log.info("Shutting down...") @@ -330,6 +355,25 @@ # Stop clock generator self.clck_gen.stop() + # Parses a TRX definition of the following + # format: REMOTE_ADDR:BIND_PORT[/TRX_NUM] + # e.g. [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5700/5 + # e.g. 127.0.0.1:5700 or 127.0.0.1:5700/1 + @staticmethod + def trx_def(val): + try: + result = re.match("(.+):([0-9]+)(\/[0-9]+)?", val) + (addr, port, idx) = result.groups() + except: + raise argparse.ArgumentTypeError("Invalid TRX definition: %s" % val) + + if idx is not None: + idx = int(idx[1:]) + else: + idx = 0 + + return (addr, int(port), idx) + def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", description = "Virtual Um-interface (fake transceiver)") @@ -354,6 +398,12 @@ dest = "bb_base_port", type = int, default = 6700, help = "Set BB base port number (default %(default)s)") + mtrx_group = parser.add_argument_group("Additional transceivers") + mtrx_group.add_argument("--trx", + metavar = "REMOTE_ADDR:BASE_PORT[/TRX_NUM]", + dest = "trx_list", type = self.trx_def, action = "append", + help = "Add a transceiver for BTS or MS (e.g. 127.0.0.1:5703)") + argv = parser.parse_args() # Make sure there is no overlap between ports -- To view, visit https://gerrit.osmocom.org/12325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 Gerrit-Change-Number: 12325 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 13 19:55:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 13 Jan 2019 19:55:45 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12543 ) Change subject: trx_toolkit/fake_trx.py: fix: update trx_list of FakePM ...................................................................... trx_toolkit/fake_trx.py: fix: update trx_list of FakePM It seems in Ice44e2b22566b3652ef6d43896055963b13ab185 I forgot to do this, so all measurements triggered by MEASURE command were incorrect (always noise). Let's fix this! Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 0f473d0..0bf9266 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -308,6 +308,7 @@ # Noise: -120 .. -105 # BTS: -75 .. -50 self.fake_pm = FakePM(-120, -105, -75, -50) + self.fake_pm.trx_list = self.trx_list # Init TRX instance for BTS self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) -- To view, visit https://gerrit.osmocom.org/12543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I155f118b2d3e3b23eb148fe7e2630790f8fcd18c Gerrit-Change-Number: 12543 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 00:45:18 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 00:45:18 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12545 Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... trx_toolkit/fake_trx.py: move init code to __init__() Change-Id: I84969630348a189d237cc98354e568421839a37b --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/12545/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 0bf9266..a94f1de 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -275,6 +275,32 @@ # List of all transceivers self.trx_list = TRXList() + # Init shared clock generator + self.clck_gen = CLCKGen([]) + + # Power measurement emulation + # Noise: -120 .. -105 + # BTS: -75 .. -50 + self.fake_pm = FakePM(-120, -105, -75, -50) + self.fake_pm.trx_list = self.trx_list + + # Init TRX instance for BTS + self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) + + # Init TRX instance for BB + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + + # Additional transceivers (optional) + if self.argv.trx_list is not None: + for trx_def in self.argv.trx_list: + (addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx) + + # Burst forwarding between transceivers + self.burst_fwd = BurstForwarder(self.trx_list) + + log.info("Init complete") + def append_trx(self, remote_addr, base_port): trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, clck_gen = self.clck_gen, pwr_meas = self.fake_pm) @@ -301,38 +327,12 @@ trx_parent.child_trx_list.add_trx(trx_child) def run(self): - # Init shared clock generator - self.clck_gen = CLCKGen([]) - - # Power measurement emulation - # Noise: -120 .. -105 - # BTS: -75 .. -50 - self.fake_pm = FakePM(-120, -105, -75, -50) - self.fake_pm.trx_list = self.trx_list - - # Init TRX instance for BTS - self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) - - # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) - - # Additional transceivers (optional) - if self.argv.trx_list is not None: - for trx_def in self.argv.trx_list: - (addr, port, idx) = trx_def - self.append_child_trx(addr, port, idx) - - # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder(self.trx_list) - # Compose list of to be monitored sockets self.sock_list = [] for trx in self.trx_list: self.sock_list.append(trx.ctrl_if.sock) self.sock_list.append(trx.data_if.sock) - log.info("Init complete") - # Enter main loop while True: # Wait until we get any data on any socket -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 00:45:19 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 00:45:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12546 Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages ...................................................................... trx_toolkit/fake_trx.py: enrich TRX logging messages Since fake_trx.py can handle multiple transceivers, it makes sense to print some info in logging messages about transceivers they belong to. This acvieved by defining __str__() for Transceiver. Some examples: [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver... [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 3 files changed, 41 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/12546/1 diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 83d55db..0d4935d 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -59,19 +59,19 @@ # Power control if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") + log.debug("(%s) Recv POWERON CMD" % self.trx) # Ensure transceiver isn't working if self.trx.running: - log.error("Transceiver already started") + log.error("(%s) Transceiver already started" % self.trx) return -1 # Ensure RX / TX freq. are set if (self.trx.rx_freq is None) or (self.trx.tx_freq is None): - log.error("RX / TX freq. are not set") + log.error("(%s) RX / TX freq. are not set" % self.trx) return -1 - log.info("Starting transceiver...") + log.info("(%s) Starting transceiver..." % self.trx) self.trx.running = True # Notify transceiver about that @@ -80,9 +80,9 @@ return 0 elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") + log.debug("(%s) Recv POWEROFF cmd" % self.trx) - log.info("Stopping transceiver...") + log.info("(%s) Stopping transceiver..." % self.trx) self.trx.running = False # Notify transceiver about that @@ -92,26 +92,27 @@ # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") + log.debug("(%s) Recv RXTUNE cmd" % self.trx) # TODO: check freq range self.trx.rx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") + log.debug("(%s) Recv TXTUNE cmd" % self.trx) # TODO: check freq range self.trx.tx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "SETSLOT", 2): - log.debug("Recv SETSLOT cmd") + log.debug("(%s) Recv SETSLOT cmd" % self.trx) # Obtain TS index ts = int(request[1]) if ts not in range(0, 8): - log.error("TS index should be in range: 0..7") + log.error("(%s) TS index should be in " + "range: 0..7" % self.trx) return -1 # Parse TS type @@ -132,13 +133,13 @@ # Power measurement if self.verify_cmd(request, "MEASURE", 1): - log.debug("Recv MEASURE cmd") + log.debug("(%s) Recv MEASURE cmd" % self.trx) # Power Measurement interface is optional # for Transceiver, thus may be uninitialized if self.trx.pwr_meas is None: - log.error("Power Measurement interface " - "is not initialized => rejecting command") + log.error("(%s) Power Measurement interface is not " + "initialized => rejecting command" % self.trx) return -1 # TODO: check freq range @@ -151,5 +152,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) + log.debug("(%s) Ignore CMD %s" % (self.trx, request[0])) return 0 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index a94f1de..ad0e1bb 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -145,8 +145,8 @@ return False if msg.fn % self.burst_drop_period == 0: - log.info("Simulation: dropping burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_drop_period)) + log.info("(%s) Simulation: dropping burst (fn=%u %% %u == 0)" + % (self, msg.fn, self.burst_drop_period)) self.burst_drop_amount -= 1 return True @@ -176,7 +176,7 @@ # Timing Advance # Syntax: CMD SETTA if self.ctrl_if.verify_cmd(request, "SETTA", 1): - log.debug("Recv SETTA cmd") + log.debug("(%s) Recv SETTA cmd" % self) # Store indicated value self.ta = int(request[1]) @@ -185,7 +185,7 @@ # Timing of Arrival simulation # Absolute form: CMD FAKE_TOA elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") + log.debug("(%s) Recv FAKE_TOA cmd" % self) # Parse and apply both base and threshold self.toa256_base = int(request[1]) @@ -195,7 +195,7 @@ # Timing of Arrival simulation # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") + log.debug("(%s) Recv FAKE_TOA cmd" % self) # Parse and apply delta self.toa256_base += int(request[1]) @@ -204,7 +204,7 @@ # RSSI simulation # Absolute form: CMD FAKE_RSSI elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") + log.debug("(%s) Recv FAKE_RSSI cmd" % self) # Parse and apply both base and threshold self.rssi_base = int(request[1]) @@ -214,7 +214,7 @@ # RSSI simulation # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") + log.debug("(%s) Recv FAKE_RSSI cmd" % self) # Parse and apply delta self.rssi_base += int(request[1]) @@ -224,12 +224,13 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") + log.debug("(%s) Recv FAKE_DROP cmd" % self) # Parse / validate amount of bursts num = int(request[1]) if num < 0: - log.error("FAKE_DROP amount shall not be negative") + log.error("(%s) FAKE_DROP amount shall not " + "be negative" % self) return -1 self.burst_drop_amount = num @@ -240,18 +241,20 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") + log.debug("(%s) Recv FAKE_DROP cmd" % self) # Parse / validate amount of bursts num = int(request[1]) if num < 0: - log.error("FAKE_DROP amount shall not be negative") + log.error("(%s) FAKE_DROP amount shall not " + "be negative" % self) return -1 # Parse / validate period period = int(request[2]) if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") + log.error("(%s) FAKE_DROP period shall " + "be greater than zero" % self) return -1 self.burst_drop_amount = num diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 57ca531..4eb210b 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -135,6 +135,13 @@ # List of child transceivers self.child_trx_list = TRXList() + def __str__(self): + desc = "%s:%d" % (self.remote_addr, self.base_port) + if self.child_idx > 0: + desc += "/%d" % self.child_idx + + return desc + # To be overwritten if required, # no custom command handlers by default def ctrl_cmd_handler(self, request): @@ -173,14 +180,14 @@ # Make sure that transceiver is configured and running if not self.running: - log.warning("RX DATA message (%s), but transceiver " - "is not running => dropping..." % msg.desc_hdr()) + log.warning("(%s) RX DATA message (%s), but transceiver " + "is not running => dropping..." % (self, msg.desc_hdr())) return None # Make sure that indicated timeslot is configured if msg.tn not in self.ts_list: - log.warning("RX DATA message (%s), but timeslot " - "is not configured => dropping..." % msg.desc_hdr()) + log.warning("(%s) RX DATA message (%s), but timeslot is not " + "configured => dropping..." % (self, msg.desc_hdr())) return None return msg -- To view, visit https://gerrit.osmocom.org/12546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 Gerrit-Change-Number: 12546 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 00:58:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 00:58:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12547 Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... trx_toolkit/{ctrl,data}_if.py: add init log message Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_if.py 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/12547/1 diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 45bfa2b..a1c19f0 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -27,6 +27,10 @@ from udp_link import UDPLink class CTRLInterface(UDPLink): + def __init__(self, *udp_link_args): + UDPLink.__init__(self, *udp_link_args) + log.debug("Init CTRL interface (%s)" % self.desc_link()) + def handle_rx(self): # Read data from socket data, remote = self.sock.recvfrom(128) diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 0d4935d..26a844f 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -46,7 +46,6 @@ def __init__(self, trx, *udp_link_args): CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface (%s)" % self.desc_link()) # Link with Transceiver instance we belong to self.trx = trx diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index a773c04..b1ba1e5 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -28,6 +28,10 @@ from data_msg import * class DATAInterface(UDPLink): + def __init__(self, *udp_link_args): + UDPLink.__init__(self, *udp_link_args) + log.debug("Init DATA interface (%s)" % self.desc_link()) + def recv_raw_data(self): data, _ = self.sock.recvfrom(512) return data -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 00:58:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 00:58:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add init logging message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12548 Change subject: trx_toolkit/transceiver.py: add init logging message ...................................................................... trx_toolkit/transceiver.py: add init logging message Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd --- M src/target/trx_toolkit/transceiver.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/12548/1 diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 4eb210b..55e4ebd 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -98,6 +98,8 @@ self.base_port = base_port self.child_idx = child_idx + log.info("Init transceiver '%s'" % self) + # Child transceiver cannot have its own clock if clck_gen is not None and child_idx > 0: raise TypeError("Child transceiver cannot have its own clock") -- To view, visit https://gerrit.osmocom.org/12548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd Gerrit-Change-Number: 12548 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 01:01:07 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 01:01:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12545 to look at the new patch set (#2). Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... trx_toolkit/fake_trx.py: move init code to __init__() Change-Id: I84969630348a189d237cc98354e568421839a37b --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/12545/2 -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 01:22:41 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 01:22:41 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add optional transceiver name Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12549 Change subject: trx_toolkit/transceiver.py: add optional transceiver name ...................................................................... trx_toolkit/transceiver.py: add optional transceiver name Since fake_trx.py can handle multiple transceivers, it may be useful to name transceivers. If transceiver has some name, it will appear in logging messages, for example: [INFO] transceiver.py:104 Init transceiver 'BTS at 127.0.0.1:5700' [INFO] transceiver.py:104 Init transceiver 'MS at 127.0.0.1:6700' [INFO] transceiver.py:104 Init transceiver '127.0.0.1:5700/1' This change additionally assigns names to the both default transceivers, and extends the '--trx' option with ability to specify some name, for example: --trx foo at 127.0.0.1:5700 or --trx bar at 127.0.0.1:5700/1 --trx ipv6@[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6700 Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/12549/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 294a819..928333f 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -288,31 +288,34 @@ self.fake_pm.trx_list = self.trx_list # Init TRX instance for BTS - self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) + self.append_trx(self.argv.bts_addr, + self.argv.bts_base_port, name = "BTS") # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + self.append_trx(self.argv.bb_addr, + self.argv.bb_base_port, name = "MS") # Additional transceivers (optional) if self.argv.trx_list is not None: for trx_def in self.argv.trx_list: - (addr, port, idx) = trx_def - self.append_child_trx(addr, port, idx) + (name, addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx, name) # Burst forwarding between transceivers self.burst_fwd = BurstForwarder(self.trx_list) log.info("Init complete") - def append_trx(self, remote_addr, base_port): + def append_trx(self, remote_addr, base_port, name = None): trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - clck_gen = self.clck_gen, pwr_meas = self.fake_pm) + clck_gen = self.clck_gen, pwr_meas = self.fake_pm, + name = name) self.trx_list.add_trx(trx) - def append_child_trx(self, remote_addr, base_port, child_idx): + def append_child_trx(self, remote_addr, base_port, child_idx, name = None): # Index 0 corresponds to the first transceiver if child_idx is 0: - self.append_trx(remote_addr, base_port) + self.append_trx(remote_addr, base_port, name) return # Find 'parent' transceiver for a new child @@ -323,7 +326,7 @@ # Allocate a new child trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - child_idx = child_idx, pwr_meas = self.fake_pm) + child_idx = child_idx, pwr_meas = self.fake_pm, name = name) self.trx_list.add_trx(trx_child) # Link a new 'child' with its 'parent' @@ -363,11 +366,12 @@ # format: REMOTE_ADDR:BIND_PORT[/TRX_NUM] # e.g. [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5700/5 # e.g. 127.0.0.1:5700 or 127.0.0.1:5700/1 + # e.g. foo at 127.0.0.1:5700 or bar at 127.0.0.1:5700/1 @staticmethod def trx_def(val): try: - result = re.match("(.+):([0-9]+)(\/[0-9]+)?", val) - (addr, port, idx) = result.groups() + result = re.match("(.+@)?(.+):([0-9]+)(\/[0-9]+)?", val) + (name, addr, port, idx) = result.groups() except: raise argparse.ArgumentTypeError("Invalid TRX definition: %s" % val) @@ -376,7 +380,11 @@ else: idx = 0 - return (addr, int(port), idx) + # Cut '@' from TRX name + if name is not None: + name = name[:-1] + + return (name, addr, int(port), idx) def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 55e4ebd..fcbb61d 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -90,7 +90,7 @@ """ - def __init__(self, bind_addr, remote_addr, base_port, + def __init__(self, bind_addr, remote_addr, base_port, name = None, child_idx = 0, clck_gen = None, pwr_meas = None): # Connection info self.remote_addr = remote_addr @@ -98,6 +98,9 @@ self.base_port = base_port self.child_idx = child_idx + # Meta info + self.name = name + log.info("Init transceiver '%s'" % self) # Child transceiver cannot have its own clock @@ -141,6 +144,8 @@ desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: desc += "/%d" % self.child_idx + if self.name is not None: + desc = "%s@%s" % (self.name, desc) return desc -- To view, visit https://gerrit.osmocom.org/12549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec Gerrit-Change-Number: 12549 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 08:07:39 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 Jan 2019 08:07:39 +0000 Subject: Change in osmo-bsc[master]: paging: fix nullpointer deref In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12482 to look at the new patch set (#2). Change subject: paging: fix nullpointer deref ...................................................................... paging: fix nullpointer deref In theroy the function T_def_get_entry() may return a nullpointer. In this case we would run straight into a nullpointer dereference problem. However, the requested timer is statically defined and should always be there. However Coverity still reports this as a problem. Lets put an OSMO_ASSERT to make clear that there is no problem here. Fixes: CID#190403 Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 --- M src/osmo-bsc/paging.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/12482/2 -- To view, visit https://gerrit.osmocom.org/12482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 Gerrit-Change-Number: 12482 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 08:07:59 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 Jan 2019 08:07:59 +0000 Subject: Change in libosmocore[master]: gsm29118: fix coverity issues Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12550 Change subject: gsm29118: fix coverity issues ...................................................................... gsm29118: fix coverity issues The function msgb_sgsap_name_put() assignes the return code of osmo_apn_from_str() directly to len. Len is an uint8_t and the return code an int. If osmo_apn_from_str() returns -1. Len would become 0xFF causing a buffer overrun with msgb_tlv_put. Lets use the proper type to catch the return code and check it before using it as length. Change-Id: Ic0bc5114eee47bdcf2300a6e4b0df473d3d1903a Fixes: CID#190405 Fixes: CID#190401 Related: OS#3615 --- M src/gsm/gsm29118.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/12550/1 diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index ca210fb..56e7473 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -196,9 +196,14 @@ { uint8_t buf[APN_MAXLEN]; uint8_t len; + int rc; + /* encoding is like DNS names, which is like APN fields */ memset(buf, 0, sizeof(buf)); - len = osmo_apn_from_str(buf, sizeof(buf), name); + rc = osmo_apn_from_str(buf, sizeof(buf), name); + if (rc < 0) + return -1; + len = (uint8_t)rc; /* Note: While the VLR-Name (see 3GPP TS 29.118, chapter 9.4.22) has * a flexible length, the MME-Name has a fixed size of 55 octets. (see -- To view, visit https://gerrit.osmocom.org/12550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0bc5114eee47bdcf2300a6e4b0df473d3d1903a Gerrit-Change-Number: 12550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 08:09:57 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 Jan 2019 08:09:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SM, but ignore any paging requests from the MSC, make sure that the MSC is not paging indefinitely Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Related: OS#3704 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 68 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: 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 05f8fd9..b72c580 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2012,6 +2012,72 @@ vc_conn.done; } +/* Paging for MT SMS but no response */ +private 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; + var integer page_count := 0; + 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_bssmap_register_imsi(g_pars.imsi, tmsi); + + /* Expect the MSC to page exactly 10 times before giving up */ + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) + { + page_count := page_count + 1; + + if (page_count < 10) { + repeat; + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; + } + } + + /* Wait some time to make sure the MSC is not delivering any further + * paging messages or anything else that could be unexpected. */ + timer T := 20.0; + T.start + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) + { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; + } + [] T.timeout { + setverdict(pass); + } + } + + setverdict(pass); +} +testcase TC_lu_and_mt_sms_paging_and_nothing() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(43); + vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_and_nothing), pars); + f_sleep(2.0); + f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); + vc_conn.done; +} + /* mobile originated SMS from MS/BTS/BSC side to SMPP */ private function f_tc_smpp_mo_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); @@ -4270,6 +4336,7 @@ execute( TC_lu_and_mo_sms() ); execute( TC_lu_and_mt_sms() ); + execute( TC_lu_and_mt_sms_paging_and_nothing() ); execute( TC_smpp_mo_sms() ); execute( TC_smpp_mt_sms() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 8a19d5b..650aefb 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -61,6 +61,7 @@ + -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 08:42:42 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 08:42:42 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12551 Change subject: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py ...................................................................... ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd --- M ttcn3-bts-test/jenkins.sh 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/12551/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index e527cd7..3632ae6 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -51,7 +51,11 @@ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ - bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1" + /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \ + --log-file-name /data/fake_trx.log \ + --log-file-level DEBUG \ + --log-level INFO \ + -R 172.18.9.20 -r 172.18.9.22 echo Starting container with trxcon docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd Gerrit-Change-Number: 12551 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 09:05:40 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 09:05:40 +0000 Subject: Change in docker-playground[master]: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12552 Change subject: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f ...................................................................... .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f Since Ib2335d02ea545aff837aadd49f15b2fdb418c46e, this VTY option is deprecated in osmo-bsc, so let's actualize the config files. Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg 5 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/12552/1 diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 4a69b3a..2550c1b 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -64,7 +64,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index f381ace..cb0059d 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -64,7 +64,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 26d062e..742c2b6 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -70,7 +70,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 25844b4..49855d2 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -74,7 +74,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 13ecd40..b06cf06 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -74,7 +74,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 bts 0 type sysmobts -- To view, visit https://gerrit.osmocom.org/12552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 Gerrit-Change-Number: 12552 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 14 09:42:00 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 Jan 2019 09:42:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#811?= Message-ID: <359699626.568.1547458920525.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.03 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel timer.c:45: warning 158: overflow in implicit constant conversion usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:73: warning 94: comparison is always false due to limited range of data type isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' sdas8051 -plosgff `basename 'eeprom_boot.a51'` ../common/fpga_load.c:181: warning 126: unreachable code board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:01:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:01:23 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12551 ) Change subject: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd Gerrit-Change-Number: 12551 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 14 Jan 2019 10:01:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:01:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:01:42 +0000 Subject: Change in docker-playground[master]: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12552 ) Change subject: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 Gerrit-Change-Number: 12552 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 10:01:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:02:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:02:07 +0000 Subject: Change in osmo-bsc[master]: paging: fix nullpointer deref In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12482 ) Change subject: paging: fix nullpointer deref ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 Gerrit-Change-Number: 12482 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 10:02:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:02:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:02:17 +0000 Subject: Change in osmo-bsc[master]: paging: fix nullpointer deref In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12482 ) Change subject: paging: fix nullpointer deref ...................................................................... paging: fix nullpointer deref In theroy the function T_def_get_entry() may return a nullpointer. In this case we would run straight into a nullpointer dereference problem. However, the requested timer is statically defined and should always be there. However Coverity still reports this as a problem. Lets put an OSMO_ASSERT to make clear that there is no problem here. Fixes: CID#190403 Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 --- M src/osmo-bsc/paging.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 2c9d5cd..066db1c 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -296,6 +296,11 @@ unsigned int to_us, to; struct T_def *d = T_def_get_entry(bts->network->T_defs, 3113); + /* Note: d should always contain a valid pointer since all timers, + * including 3113 are statically pre-defined in + * struct T_def gsm_network_T_defs. */ + OSMO_ASSERT(d); + if (!bts->T3113_dynamic) return d->val; -- To view, visit https://gerrit.osmocom.org/12482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5238132d9d5a1507b9955a0b2dc4b1bced220e8 Gerrit-Change-Number: 12482 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:02:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:02:32 +0000 Subject: Change in libosmocore[master]: gsm29118: fix coverity issues In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12550 ) Change subject: gsm29118: fix coverity issues ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0bc5114eee47bdcf2300a6e4b0df473d3d1903a Gerrit-Change-Number: 12550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 10:02:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:02:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:02:56 +0000 Subject: Change in osmo-ci[master]: add osmo-asf4-dfu master and gerrit jobs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12544 ) Change subject: add osmo-asf4-dfu master and gerrit jobs ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bc5ca30809af8d8b472a75a9e02c4964761de38 Gerrit-Change-Number: 12544 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 14 Jan 2019 10:02:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:03:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 10:03:01 +0000 Subject: Change in osmo-ci[master]: add osmo-asf4-dfu master and gerrit jobs In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12544 ) Change subject: add osmo-asf4-dfu master and gerrit jobs ...................................................................... add osmo-asf4-dfu master and gerrit jobs Change-Id: I5bc5ca30809af8d8b472a75a9e02c4964761de38 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 20eceef..c4737ff 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -254,6 +254,7 @@ - osmo-sysmon - osmo-remsim - simtrace2 + - osmo-asf4-dfu - gapk - pysim: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 2fa40d9..52e3ca7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -360,6 +360,7 @@ - osmo-sysmon - osmo-remsim + - osmo-asf4-dfu - simtrace2: cmd: > # keep first line with less indent to preserve newlines -- To view, visit https://gerrit.osmocom.org/12544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5bc5ca30809af8d8b472a75a9e02c4964761de38 Gerrit-Change-Number: 12544 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:09:13 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:09:13 +0000 Subject: Change in osmo-bsc[master]: Print BTS number on GPRS options error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12553 Change subject: Print BTS number on GPRS options error ...................................................................... Print BTS number on GPRS options error Change-Id: Ia413bd1b375d874cd79a2bf06eb82477417ead1a --- M src/osmo-bsc/bsc_vty.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/12553/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 876273e..791aebe 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2698,7 +2698,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2716,7 +2716,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2738,7 +2738,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2759,7 +2759,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2780,7 +2780,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2801,7 +2801,7 @@ struct in_addr ia; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2834,7 +2834,7 @@ int val = atoi(argv[1]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2871,7 +2871,7 @@ int val = atoi(argv[1]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2893,7 +2893,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2910,7 +2910,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2927,7 +2927,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2947,7 +2947,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/12553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia413bd1b375d874cd79a2bf06eb82477417ead1a Gerrit-Change-Number: 12553 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:10:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:10:15 +0000 Subject: Change in osmo-asf4-dfu[master]: Add git-review config In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12518 ) Change subject: Add git-review config ...................................................................... Add git-review config Change-Id: If28c2f4908f8df96b627fd42b7e122e559d9382a --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..8f5d81d --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-asf4-dfu -- To view, visit https://gerrit.osmocom.org/12518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If28c2f4908f8df96b627fd42b7e122e559d9382a Gerrit-Change-Number: 12518 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:11:12 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:11:12 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore output files In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12495 ) Change subject: ignore output files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 Gerrit-Change-Number: 12495 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 10:11:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:11:18 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:11:18 +0000 Subject: Change in osmo-asf4-dfu[master]: Add .gitignore file In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12517 ) Change subject: Add .gitignore file ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I6d853bc48d904c2567edb2103d590259877bbf87 Gerrit-Change-Number: 12517 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:16:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:16:41 +0000 Subject: Change in libosmocore[master]: LCLS: add allocator function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12491 ) Change subject: LCLS: add allocator function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12491/1/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12491/1/src/gsm/gsm0808_utils.c at 587 PS1, Line 587: r->gcr = talloc_zero(r, struct osmo_gcr_parsed); > please remind me, why again was the gcr member not a static member of the struct osmo_lcls and has t [?] GCR is optional in a sense that it's possible that we might have other osmo-lcls set while GCR is missing. Right now this is indicated by NULL pointer in place of GCR. I can make it static and add bool gcr_available to distinguish between "no GCR" and "GCR is all 0" cases. Which one would be better option? -- To view, visit https://gerrit.osmocom.org/12491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 Gerrit-Change-Number: 12491 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 10:16:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 10:19:37 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 10:19:37 +0000 Subject: Change in osmo-msc[master]: transaction: drop unused ti_flag In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: transaction: drop unused ti_flag ...................................................................... Patch Set 1: (1 comment) > Patch Set 1: Code-Review-2 Could you please clarify why it's better to keep ti_flag parameter? Would be nice to add comment regarding the intention behind this variable or how it might be used in future. https://gerrit.osmocom.org/#/c/12519/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12519/1//COMMIT_MSG at 10 PS1, Line 10: unused > Actually, it's used, but '0'B is always passed. That's what I meant by "unused" - the variable is there but it's value always the same. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 10:19:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 11:05:41 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 Jan 2019 11:05:41 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12554 Change subject: socket: add define for socket name length ...................................................................... socket: add define for socket name length The function osmo_sock_get_name_buf() can be used to write a string representation to a user provided memory. Unfortunately the proper length for the user provided memory is not obvious. To make using osmo_sock_get_name_buf() more practical, add a define constant that defines the length of the required memory. Also use this define in socket.c. Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12554/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 43604ec..d480db7 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -29,6 +29,8 @@ /*! use SO_REUSEADDR on UDP ports (required for multicast) */ #define OSMO_SOCK_F_UDP_REUSEADDR (1 << 5) +#define OSMO_SOCK_NAME_MAXlEN (2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1) + int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 4f3b1ca..ecbf59d 100644 --- a/src/socket.c +++ b/src/socket.c @@ -784,7 +784,7 @@ char *osmo_sock_get_name(void *ctx, int fd) { /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ - char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + char str[OSMO_SOCK_NAME_MAXlEN]; int rc; rc = osmo_sock_get_name_buf(str, sizeof(str), fd); if (rc <= 0) @@ -824,7 +824,7 @@ const char *osmo_sock_get_name2(int fd) { /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ - static char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + static char str[OSMO_SOCK_NAME_MAXlEN]; osmo_sock_get_name_buf(str, sizeof(str), fd); return str; } -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 11:16:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 11:16:24 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#2). Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 5 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/2 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 11:18:23 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 11:18:23 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 2: Updated: support 15 digit version with checksum (and verify the checksum with the Luhn algorithm), add test cases. https://en.wikipedia.org/wiki/Luhn_algorithm -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 11:18:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 11:20:49 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 11:20:49 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#3). Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 5 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/3 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:52:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:52:12 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c at 83 PS3, Line 83: bool I think it may be interesting to the caller *why* it failed validation. So a simple bool value may be too simple. Maybe return negative error codes and 0 on success? Then the negative error codes could have an enum or #defines differentiating the cause. https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c at 93 PS3, Line 93: /* Verify Luhn algorithm (see Wikipedia) : * digit id (i) | 00 01 02 03 04 05 06 07 08 09 10 11 12 13 CHK : * double | x x x x x x x : * do not double | x x x x x x x : */ : : /* Double every second digit and add it to sum */ : for (i = 1; i < 14; i += 2) { : int check = 2 * (imei[i] - '0'); : if (check > 9) : check -= 9; : sum += check; : } the IMEI checksumming function should definitely be a separate function, as it may be useful in other purposes. The osmo_imei_str_valid could then simply call that checksum-generation function and do the compare. -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 12:52:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:52:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:52:40 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12554 ) Change subject: socket: add define for socket name length ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:52:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:53:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:53:22 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12545 ) Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12545/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12545/2//COMMIT_MSG at 7 PS2, Line 7: trx_toolkit/fake_trx.py: move init code to __init__() a good commit log explaines *why* this is done. I can see from the diff easily that it moves code. but not why. -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:53:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:53:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:53:41 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12546 ) Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 Gerrit-Change-Number: 12546 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:53:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:54:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:54:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 2: Code-Review+1 it might avoid confusion if we don't call it CTRL in Osmocom... if not in the code, then maybe at least in logging? TRXCTRL? TRXCTL? -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:54:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:54:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:54:42 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add init logging message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12548 ) Change subject: trx_toolkit/transceiver.py: add init logging message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd Gerrit-Change-Number: 12548 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:54:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:54:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:54:53 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add optional transceiver name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12549 ) Change subject: trx_toolkit/transceiver.py: add optional transceiver name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec Gerrit-Change-Number: 12549 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:54:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 12:55:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 12:55:27 +0000 Subject: Change in osmo-bsc[master]: Print BTS number on GPRS options error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12553 ) Change subject: Print BTS number on GPRS options error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia413bd1b375d874cd79a2bf06eb82477417ead1a Gerrit-Change-Number: 12553 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 12:55:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 13:44:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 13:44:20 +0000 Subject: Change in osmo-bsc[master]: Print BTS number on GPRS options error In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12553 ) Change subject: Print BTS number on GPRS options error ...................................................................... Print BTS number on GPRS options error Change-Id: Ia413bd1b375d874cd79a2bf06eb82477417ead1a --- M src/osmo-bsc/bsc_vty.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 876273e..791aebe 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2698,7 +2698,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2716,7 +2716,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2738,7 +2738,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2759,7 +2759,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2780,7 +2780,7 @@ int idx = atoi(argv[0]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2801,7 +2801,7 @@ struct in_addr ia; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2834,7 +2834,7 @@ int val = atoi(argv[1]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2871,7 +2871,7 @@ int val = atoi(argv[1]); if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2893,7 +2893,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2910,7 +2910,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2927,7 +2927,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } @@ -2947,7 +2947,7 @@ struct gsm_bts *bts = vty->index; if (bts->gprs.mode == BTS_GPRS_NONE) { - vty_out(vty, "%% GPRS not enabled on this BTS%s", VTY_NEWLINE); + vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/12553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia413bd1b375d874cd79a2bf06eb82477417ead1a Gerrit-Change-Number: 12553 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:04:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 14:04:26 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#4). Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Place the Luhn checksum code in a dedicated osmo_luhn() function, so it can be used elsewhere. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/core/utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M src/utils.c M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 7 files changed, 107 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/4 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:06:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 14:06:27 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c at 83 PS3, Line 83: bool > I think it may be interesting to the caller *why* it failed validation. [?] This would be inconsistent with osmo_msisdn_str_valid() and osmo_imsi_str_valid() above, which return booleans. Should I implement it regardless of that? https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c at 93 PS3, Line 93: /* Verify Luhn algorithm (see Wikipedia) : * digit id (i) | 00 01 02 03 04 05 06 07 08 09 10 11 12 13 CHK : * double | x x x x x x x : * do not double | x x x x x x x : */ : : /* Double every second digit and add it to sum */ : for (i = 1; i < 14; i += 2) { : int check = 2 * (imei[i] - '0'); : if (check > 9) : check -= 9; : sum += check; : } > the IMEI checksumming function should definitely be a separate function, as it may be useful in othe [?] Done -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 14:06:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 14 14:22:38 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 Jan 2019 14:22:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#812?= In-Reply-To: <359699626.568.1547458920525.JavaMail.jenkins@jenkins.osmocom.org> References: <359699626.568.1547458920525.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1531265101.570.1547475758867.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:30:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 14:30:34 +0000 Subject: Change in osmo-msc[master]: Fix trans_has_conn() doxygen description Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12555 Change subject: Fix trans_has_conn() doxygen description ...................................................................... Fix trans_has_conn() doxygen description Change-Id: Ica5e498e03d0a157a661e428dfd68739f572d073 --- M src/libmsc/transaction.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/12555/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index f62d6b4..df770ed 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -216,7 +216,7 @@ /*! Check if we have any transaction for given connection * \param[in] conn Connection to check - * \returns 1 in case there is a transaction, 0 otherwise + * \returns transaction pointer if found, NULL otherwise */ struct gsm_trans *trans_has_conn(const struct ran_conn *conn) { -- To view, visit https://gerrit.osmocom.org/12555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica5e498e03d0a157a661e428dfd68739f572d073 Gerrit-Change-Number: 12555 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:31:05 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 14:31:05 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12556 Change subject: Add tests for transaction routines ...................................................................... Add tests for transaction routines Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 --- M configure.ac M tests/Makefile.am M tests/testsuite.at A tests/trans/Makefile.am A tests/trans/trans_test.c A tests/trans/trans_test.err A tests/trans/trans_test.ok 7 files changed, 242 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/12556/1 diff --git a/configure.ac b/configure.ac index a4979cf..d955187 100644 --- a/configure.ac +++ b/configure.ac @@ -257,6 +257,7 @@ tests/Makefile tests/atlocal tests/smpp/Makefile + tests/trans/Makefile tests/sms_queue/Makefile tests/msc_vlr/Makefile doc/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index dc5194c..883df23 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ sms_queue \ msc_vlr \ + trans \ $(NULL) if BUILD_SMPP diff --git a/tests/testsuite.at b/tests/testsuite.at index f27b60c..f3cb740 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -9,6 +9,13 @@ AT_CHECK([$abs_top_builddir/tests/smpp/smpp_test], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([trans]) +AT_KEYWORDS([trans]) +cat $abs_srcdir/trans/trans_test.ok > expout +cat $abs_srcdir/trans/trans_test.err > experr +AT_CHECK([$abs_top_builddir/tests/trans/trans_test], [], [expout], [experr]) +AT_CLEANUP + AT_SETUP([sms_queue_test]) AT_KEYWORDS([sms_queue_test]) cat $abs_srcdir/sms_queue/sms_queue_test.ok > expout diff --git a/tests/trans/Makefile.am b/tests/trans/Makefile.am new file mode 100644 index 0000000..1a05307 --- /dev/null +++ b/tests/trans/Makefile.am @@ -0,0 +1,31 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/libmsc \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +EXTRA_DIST = trans_test.ok trans_test.err + +trans_test_LDADD = \ + $(top_builddir)/src/libmsc/libmsc.a \ + $(top_builddir)/src/libvlr/libvlr.a \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ + -ldbi \ + $(NULL) diff --git a/tests/trans/trans_test.c b/tests/trans/trans_test.c new file mode 100644 index 0000000..42b39c6 --- /dev/null +++ b/tests/trans/trans_test.c @@ -0,0 +1,184 @@ +/* + * (C) 2019 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 + + +static bool wrong_tran(const struct gsm_trans *t, uint8_t ref_id) +{ + if (!t) { + printf("Failed to obtain transaction with expected ID %u.\n", ref_id); + return true; + } + + if (t->transaction_id != ref_id) { + printf("Wrong transaction obtained with ID %u != %u (expected)\n", t->transaction_id, ref_id); + return true; + } + + return false; +} + +static struct gsm_trans *make_tran(struct gsm_network *net, struct vlr_subscr *vsub, uint8_t proto, uint32_t callref) +{ + int trans_id = trans_assign_trans_id(net, vsub, proto, 0); + if (trans_id < 0) { + printf("Failed to get next transaction ID.\n"); + return NULL; + } + + return trans_alloc(net, vsub, proto, trans_id, callref); +} + +static struct ran_conn *make_conn(struct gsm_network *net, struct vlr_subscr *vsub) +{ + struct ran_conn *ran_c = ran_conn_alloc(net, OSMO_RAT_UNKNOWN, 69); + if (ran_c) + ran_c->vsub = vlr_subscr_get(vsub); + return ran_c; +} + +static void test_tran_single(struct gsm_network *net, struct vlr_subscr *vsub, uint32_t base_callref) +{ + struct gsm_trans *t, *x; + struct ran_conn *ran_c; + uint8_t p = GSM48_PDISC_GROUP_CC; + int trans_id; + + printf("\nStarting basic transaction test...\n"); + + ran_c = make_conn(net, vsub); + if (!ran_c) + return; + + t = make_tran(net, vsub, p, base_callref); + if (!t) + return; + + printf("Transaction allocation complete: 0x%X CallRef used.\n", t->callref); + + if (trans_has_conn(ran_c)) + return; + + t->conn = ran_conn_get(ran_c, RAN_CONN_USE_SILENT_CALL); + if (!trans_has_conn(ran_c)) + return; + + printf("Connection %s assigned to transaction.\n", vlr_subscr_name(ran_c->vsub)); + + trans_id = trans_assign_trans_id(net, vsub, p, 0); + if (trans_id < 0) { + printf("Failed to allocate next transaction id.\n"); + return; + } + + if (trans_id == t->transaction_id) { + printf("Transaction id allocated twice.\n"); + return; + } + printf("Next transaction ID: %u\n", trans_id); + + printf("Transaction lookup:\n"); + + x = trans_find_by_callref(net, base_callref); + if (wrong_tran(x, t->transaction_id)) + return; + printf("\tCallRef OK.\n"); + + x = trans_find_by_id(ran_c, p, t->transaction_id); + if (wrong_tran(x, t->transaction_id)) + return; + printf("\tID OK.\n"); + + printf("Transaction cleanup.\n"); + trans_free(t); + + printf("Basic transaction test for CallRef 0x%X complete.\n", base_callref); +} + +static void test_tran_overflow(struct gsm_network *net, struct vlr_subscr *vsub, uint32_t base_callref) +{ + unsigned i, max_t = 32, al; + struct gsm_trans *t; + + printf("\nStarting overflow transaction test...\nAllocating: "); + + for (i = 0; i < max_t; i++) { + t = make_tran(net, vsub, GSM48_PDISC_BCAST_CC, base_callref); + if (!t) + break; + printf("."); + } + + al = i; + printf("\tAllocated %u transactions.\n Cleaning: ", al); + + for (i = 0; i < max_t; i++) { + t = trans_find_by_callref(net, base_callref); + if (!t) + break; + trans_free(t); + printf("."); + } + + printf("\n\tCleared %u transactions.\nOverflow transaction test for CallRef 0x%X complete: %s\n", + i, base_callref, (al != i) ? "FAILED" : "OK"); +} + + +int main(int argc, char **argv) +{ + void *ctx = talloc_named_const(NULL, 0, "trans_test"); + struct gsm_network *net; + struct vlr_subscr *v; + + osmo_init_logging2(ctx, NULL); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename(osmo_stderr_target, 0); + + net = gsm_network_init(ctx, NULL); + if (!net) { + printf("Failed to allocate network struct\n"); + return 1; + } + + ran_conn_init(); + + if (msc_vlr_alloc(net)) { + printf("Failed to allocate VLR\n"); + return 2; + } + + v = vlr_subscr_alloc(net->vlr); + + test_tran_single(net, v, 1); + test_tran_overflow(net, v, 2); + + return EXIT_SUCCESS; +} diff --git a/tests/trans/trans_test.err b/tests/trans/trans_test.err new file mode 100644 index 0000000..19cfbdb --- /dev/null +++ b/tests/trans/trans_test.err @@ -0,0 +1 @@ +unknown: Unknown RAN type, cannot tx release/clear diff --git a/tests/trans/trans_test.ok b/tests/trans/trans_test.ok new file mode 100644 index 0000000..20622bf --- /dev/null +++ b/tests/trans/trans_test.ok @@ -0,0 +1,17 @@ + +Starting basic transaction test... +Transaction allocation complete: 0x1 CallRef used. +Connection unknown assigned to transaction. +Next transaction ID: 1 +Transaction lookup: + CallRef OK. + ID OK. +Transaction cleanup. +Basic transaction test for CallRef 0x1 complete. + +Starting overflow transaction test... +Allocating: .......Failed to get next transaction ID. + Allocated 7 transactions. + Cleaning: ....... + Cleared 7 transactions. +Overflow transaction test for CallRef 0x2 complete: OK -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:34:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 14:34:19 +0000 Subject: Change in osmo-msc[master]: transaction: drop unused ti_flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: transaction: drop unused ti_flag ...................................................................... Patch Set 1: the TI flags purpose is defined in the 3GPP specifications. Vadim has pointed this out. Not sure what else to say? -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 14:34:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:34:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 14:34:33 +0000 Subject: Change in osmo-msc[master]: Fix trans_has_conn() doxygen description In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12555 ) Change subject: Fix trans_has_conn() doxygen description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica5e498e03d0a157a661e428dfd68739f572d073 Gerrit-Change-Number: 12555 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 14:34:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:34:39 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 14:34:39 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 14:34:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:35:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 14:35:22 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 14:35:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:39:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 14:39:57 +0000 Subject: Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid() In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() ...................................................................... gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Place the Luhn checksum code in a dedicated osmo_luhn() function, so it can be used elsewhere. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/core/utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M src/utils.c M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 7 files changed, 107 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 04f2fb4..987080e 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -140,4 +140,6 @@ uint32_t osmo_isqrt32(uint32_t x); +const char osmo_luhn(const char* in, int in_len); + /*! @} */ diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 2f380ae..b5c8dcd 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -93,6 +93,7 @@ bool osmo_imsi_str_valid(const char *imsi); bool osmo_msisdn_str_valid(const char *msisdn); +bool osmo_imei_str_valid(const char *imei, bool with_15th_digit); const char *osmo_mcc_name(uint16_t mcc); const char *osmo_mnc_name(uint16_t mnc, bool mnc_3_digits); diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 4fdad48..1d9cefe 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -31,6 +31,7 @@ #include #include +#include static bool is_n_digits(const char *str, int min_digits, int max_digits) { @@ -71,6 +72,23 @@ return is_n_digits(msisdn, 1, 15); } +/*! Determine whether the given IMEI is valid according to 3GPP TS 23.003, + * Section 6.2.1. It consists of 14 digits, the 15th check digit is not + * intended for digital transmission. + * \param imei IMEI digits in ASCII string representation. + * \param with_15th_digit when true, expect the 15th digit to be present and + * verify it. + * \returns true when the IMEI is valid, false for invalid characters or number + * of digits. + */ +bool osmo_imei_str_valid(const char *imei, bool with_15th_digit) +{ + if (with_15th_digit) + return is_n_digits(imei, 15, 15) && osmo_luhn(imei, 14) == imei[14]; + else + return is_n_digits(imei, 14, 14); +} + /*! Return MCC string as standardized 3-digit with leading zeros. * \param[in] mcc MCC value. * \returns string in static buffer. diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index a903787..331c3f0 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -551,6 +551,7 @@ osmo_imsi_str_valid; osmo_msisdn_str_valid; +osmo_imei_str_valid; osmo_mncc_stringify; osmo_mncc_names; diff --git a/src/utils.c b/src/utils.c index 35d70ac..d1da4fa 100644 --- a/src/utils.c +++ b/src/utils.c @@ -765,4 +765,35 @@ return buf; } +/*! Calculate the Luhn checksum (as used for IMEIs). + * \param[in] in Input digits in ASCII string representation. + * \param[in] in_len Count of digits to use for the input (14 for IMEI). + * \returns checksum char (e.g. '3'); negative on error + */ +const char osmo_luhn(const char* in, int in_len) +{ + int i, sum = 0; + + /* All input must be numbers */ + for (i = 0; i < in_len; i++) { + if (!isdigit(in[i])) + return -EINVAL; + } + + /* Double every second digit and add it to sum */ + for (i = in_len - 1; i >= 0; i -= 2) { + int dbl = (in[i] - '0') * 2; + if (dbl > 9) + dbl -= 9; + sum += dbl; + } + + /* Add other digits to sum */ + for (i = in_len - 2; i >= 0; i -= 2) + sum += in[i] - '0'; + + /* Final checksum */ + return (sum * 9) % 10 + '0'; +} + /*! @} */ diff --git a/tests/gsm23003/gsm23003_test.c b/tests/gsm23003/gsm23003_test.c index 79965cf..eac5a11 100644 --- a/tests/gsm23003/gsm23003_test.c +++ b/tests/gsm23003/gsm23003_test.c @@ -118,6 +118,47 @@ return pass; } +static struct { + bool with_15th_digit; + const char *imei; + bool expect_ok; +} test_imeis[] = { + /* without 15th digit */ + {false, "12345678901234", true}, + {false, "1234567890123", false}, + {false, "123456789012345", false}, + + /* with 15th digit: valid */ + {true, "357613004448485", true}, + {true, "357805023984447", true}, + {true, "352936001349777", true}, + {true, "357663017768551", true}, + + /* with 15th digit: invalid */ + {true, "357613004448480", false}, + {true, "357613004448405", false}, + {true, "357613004448085", false}, + + { NULL, false, false }, +}; + +bool test_valid_imei() +{ + int i; + bool pass = true; + bool ok = true; + printf("----- %s\n", __func__); + + for (i = 0; i < ARRAY_SIZE(test_imeis); i++) { + ok = osmo_imei_str_valid(test_imeis[i].imei, test_imeis[i].with_15th_digit); + pass = pass && (ok == test_imeis[i].expect_ok); + printf("%2d: expect=%s result=%s imei='%s' with_15th_digit=%s\n", + i, BOOL_STR(test_imeis[i].expect_ok), BOOL_STR(ok), + test_imeis[i].imei, test_imeis[i].with_15th_digit ? "true" : "false"); + } + return pass; +} + struct test_mnc_from_str_result { int rc; uint16_t mnc; @@ -248,6 +289,7 @@ pass = pass && test_valid_imsi(); pass = pass && test_valid_msisdn(); + pass = pass && test_valid_imei(); pass = pass && test_mnc_from_str(); pass = pass && test_gummei_name(); pass = pass && test_domain_gen(); diff --git a/tests/gsm23003/gsm23003_test.ok b/tests/gsm23003/gsm23003_test.ok index c64f515..2f7c37f 100644 --- a/tests/gsm23003/gsm23003_test.ok +++ b/tests/gsm23003/gsm23003_test.ok @@ -42,6 +42,18 @@ 17: expect=false result=false msisdn='123456 123456' 18: expect=false result=false msisdn='123456 123456' 19: expect=false result=false msisdn='(null)' +----- test_valid_imei + 0: expect=true result=true imei='12345678901234' with_15th_digit=false + 1: expect=false result=false imei='1234567890123' with_15th_digit=false + 2: expect=false result=false imei='123456789012345' with_15th_digit=false + 3: expect=true result=true imei='357613004448485' with_15th_digit=true + 4: expect=true result=true imei='357805023984447' with_15th_digit=true + 5: expect=true result=true imei='352936001349777' with_15th_digit=true + 6: expect=true result=true imei='357663017768551' with_15th_digit=true + 7: expect=false result=false imei='357613004448480' with_15th_digit=true + 8: expect=false result=false imei='357613004448405' with_15th_digit=true + 9: expect=false result=false imei='357613004448085' with_15th_digit=true +10: expect=false result=false imei='(null)' with_15th_digit=false ----- test_mnc_from_str 0: "0" rc=0 mnc=0 mnc_3_digits=0 pass 1: "00" rc=0 mnc=0 mnc_3_digits=0 pass -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 14:45:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 14:45:21 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#2). Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_id() and db_subscr_get_by_imei(). The new functions are used in db_test. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. A follow-up commit will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 212 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/2 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 15:01:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 15:01:45 +0000 Subject: Change in osmo-msc[master]: Fix trans_has_conn() doxygen description In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12555 ) Change subject: Fix trans_has_conn() doxygen description ...................................................................... Fix trans_has_conn() doxygen description Change-Id: Ica5e498e03d0a157a661e428dfd68739f572d073 --- M src/libmsc/transaction.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index f62d6b4..df770ed 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -216,7 +216,7 @@ /*! Check if we have any transaction for given connection * \param[in] conn Connection to check - * \returns 1 in case there is a transaction, 0 otherwise + * \returns transaction pointer if found, NULL otherwise */ struct gsm_trans *trans_has_conn(const struct ran_conn *conn) { -- To view, visit https://gerrit.osmocom.org/12555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ica5e498e03d0a157a661e428dfd68739f572d073 Gerrit-Change-Number: 12555 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 15:08:25 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 15:08:25 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#10). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 922 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/10 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 15:11:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 15:11:10 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 14 15:15:57 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 Jan 2019 15:15:57 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#370?= In-Reply-To: <689089736.552.1547392207316.JavaMail.jenkins@jenkins.osmocom.org> References: <689089736.552.1547392207316.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2043471340.571.1547478957314.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Jan 14 15:55:01 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 15:55:01 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#3). Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty M tests/test_subscriber.vty 5 files changed, 52 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/3 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 15:57:58 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 15:57:58 +0000 Subject: Change in osmo-msc[master]: Fix optional libmsc linking with libsmpp Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12557 Change subject: Fix optional libmsc linking with libsmpp ...................................................................... Fix optional libmsc linking with libsmpp Link internal libmsc against libsmpp as determined at ./configure time. This removes the need for unrelated binaries to be linked against libsmpp. Change-Id: Ia660964e91f65255465b8620dc9e43dbd47a4e70 --- M src/libmsc/Makefile.am M tests/msc_vlr/Makefile.am M tests/sms_queue/Makefile.am 3 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/12557/1 diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 72da747..3c06f10 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -75,4 +75,6 @@ smpp_vty.c \ smpp_utils.c \ $(NULL) + +libmsc_a_LIBADD = $(LIBSMPP34_LIBS) endif diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 8a5e719..83145e3 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -8,7 +8,6 @@ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBSMPP34_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ @@ -41,7 +40,6 @@ LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ - $(LIBSMPP34_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am index 1ffbe1c..5ea0dc6 100644 --- a/tests/sms_queue/Makefile.am +++ b/tests/sms_queue/Makefile.am @@ -33,7 +33,6 @@ sms_queue_test_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ - $(LIBSMPP34_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ -- To view, visit https://gerrit.osmocom.org/12557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia660964e91f65255465b8620dc9e43dbd47a4e70 Gerrit-Change-Number: 12557 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 16:14:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 16:14:48 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#3). Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_id() and db_subscr_get_by_imei(). The new functions are used in db_test. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. A follow-up commit will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 212 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/3 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 16:14:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 16:14:48 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#4). Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/4 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 16:14:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 14 Jan 2019 16:14:48 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#4). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "show subscriber", and allow showing subscribers by their IMEI with: "show subscriber imei ..." Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 19 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/4 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 16:58:10 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 16:58:10 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 3: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 15 PS3, Line 15: to operate with databases which are not upgraded. (would suffice to just say "upgrade the db schema to version N", no need to explain the general upgrade semantics) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 21 PS3, Line 21: order of the columns in the tables. hm, slightly ugly, but ok, shouldn't make a difference https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 28 PS3, Line 28: specification. also mention that the subscr_get_by_imei() is used by commit "VTY: Integrate IMEI" with change-id. (Because when I reviewed this, I first thought that function was dead code.) https://gerrit.osmocom.org/#/c/12525/3/src/db.h File src/db.h: https://gerrit.osmocom.org/#/c/12525/3/src/db.h at 76 PS3, Line 76: char imei[32]; GSM23003_IMEI_NUM_DIGITS + 1 https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c at 392 PS3, Line 392: * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. test passing NULL as arg to remove IMEI; then also the remainder of the expected test output would be unchanged (with the IMEI removed again) -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 16:58:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:00:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:00:33 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 4: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c at 442 PS4, Line 442: LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s (consider setting 'store-imei 1')\n", gsup->imsi, imei); if the subscriber doesn't exist, we should respond with an error. I'm not saying to implement an IMEI black/whitelist, but at least to error if the IMSI isn't known at all. i.e. always first db_subscr_get_by_imsi(). I'm not sure if we need to optimize for db performance, but if we do, then this would be an obvious improvement: To have less DB hits instead implement db_update_imei_by_imsi(), so that we check IMSI presence and update the IMEI in one DB hit. A returned value of zero modified rows would then mean "IMSI not known". https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c at 75 PS4, Line 75: vty_out(vty, " store-imei 1%s", VTY_NEWLINE); looks like too much indent. Add a vty test for this to one or other .vty transcript test, please (check output of 'show running-config') https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c at 313 PS4, Line 313: " to set 'check-imei-rqd 1' in osmo-msc.cfg.\n" wording: maybe rather "Note that an MSC does not necessarily send Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1')." consistency: AFAICT osmo-hlr so far uses only the 'foo' / 'no foo' syntax, so better also make this 'store-imei' 'no store-imei' ( If you decide to keep (0|1), then the first doc should be general for switching it off or on: store-imei Configure whether to store a received IMEI in the database. 0 Do not store... 1 Store received IMEIs. Note that an MSC does not necessarily send Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1'). ) -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 17:00:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:01:28 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:01:28 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 17:01:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:16:12 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 17:16:12 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 17:16:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:24:47 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:24:47 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 10: Code-Review+1 (2 comments) just cosmetics... https://gerrit.osmocom.org/#/c/12478/10/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/10/src/libvlr/vlr.c at 664 PS10, Line 664: * IMEI to the HLR DB as side effect (OS#2541). */ In general, it's a good thing to spread context info, but not so good if that info is volatile: if at some point we would add an EIR or a IMEI white/blacklist, then we'd have to revisit all these places and correct the context info, in a completely separate code tree. So I guess it would be better to leave the info close to its home, like, rather avoid explaining OsmoHLR in OsmoMSC code, and avoid explaining OsmoMSC in OsmoHLR code; if you have to, use as non-specific references to other programs as possible. Further complication here is that even if using the Osmocom stack, some users may choose a GSUP<->MAP translation and/or use a completely different HLR than OsmoHLR. So I'd just shut up about it here and explain everything in OsmoHLR, preferably in only one place, to avoid diverse info. https://gerrit.osmocom.org/#/c/12478/10/src/libvlr/vlr.c at 668 PS10, Line 668: uint8_t imei_enc[GSM23003_IMEI_NUM_DIGITS+2] = {0}; (maybe mention +2 for the IE header?) -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 17:24:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:37:56 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:37:56 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity in ran_conn ...................................................................... Patch Set 6: (1 comment) Meta: AFAIK we already store the entire CGI in the vlr_subscr? maybe we should instead drop the LAC info from struct ran_conn completely? (code looks like we are never storing the CI part of vls_subscr->cgi, that would be nice to fix) Meta meta: in the course of inter-MSC HO I am refactoring what the ran_conn represents, so I'd prefer to park this patch and revisit after the inter-MSC changes, to avoid merge conflicts and back-and-forths. https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 320 PS2, Line 320: case CELL_IDENT_CI: a CELL_IDENT_CI is *only* a CI without a LAC; since any CI number can be re-used within each LAC, the CELL_IDENT_CI is intrinsically ambiguous. I'm not sure who thought of specifying this Cell Identifier type, maybe it makes sense if your network has only one LAC?? Haven't seen it used anywhere. I think it's okay to require a LAC, so I'd rather drop the FIXME comment. -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 17:37:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:40:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:40:41 +0000 Subject: Change in libosmocore[master]: ipa_ccm_idtag_parse*: Fix reported length value In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10216 ) Change subject: ipa_ccm_idtag_parse*: Fix reported length value ...................................................................... Patch Set 3: Code-Review+1 first time I come across this patch! curious, did you see any adverse effects, like an IDTAG name being one character too long? -- To view, visit https://gerrit.osmocom.org/10216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435aaa33605bd48635715a2c81aa2d231c1abf51 Gerrit-Change-Number: 10216 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 17:40:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:42:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:42:03 +0000 Subject: Change in libosmocore[master]: change GSM48_CMSERV_* to enum type, add names In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12521 ) Change subject: change GSM48_CMSERV_* to enum type, add names ...................................................................... change GSM48_CMSERV_* to enum type, add names Prepare handling multiple CM Service Requests in osmo-msc: an enum is more clear than an int and #defines for passing around and count CM Service types. Change-Id: I9c2a7adc45ab7a1a7519168e965e7d805e1481ff --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 26 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 791fbd4..86b5f6f 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1631,13 +1631,20 @@ /* FIXME: Table 10.4 / 10.4a (GPRS) */ /* Section 10.5.3.3 CM service type */ -#define GSM48_CMSERV_MO_CALL_PACKET 1 -#define GSM48_CMSERV_EMERGENCY 2 -#define GSM48_CMSERV_SMS 4 -#define GSM48_CMSERV_SUP_SERV 8 -#define GSM48_CMSERV_VGCS 9 -#define GSM48_CMSERV_VBS 10 -#define GSM48_CMSERV_LOC_SERV 11 +enum osmo_cm_service_type { + GSM48_CMSERV_MO_CALL_PACKET = 1, + GSM48_CMSERV_EMERGENCY = 2, + GSM48_CMSERV_SMS = 4, + GSM48_CMSERV_SUP_SERV = 8, + GSM48_CMSERV_VGCS = 9, + GSM48_CMSERV_VBS = 10, + GSM48_CMSERV_LOC_SERV = 11, + GSM48_CMSERV_MAX_VAL = GSM48_CMSERV_LOC_SERV +}; + +extern const struct value_string osmo_cm_service_type_names[]; +static inline const char *osmo_cm_service_type_name(enum osmo_cm_service_type val) +{ return get_value_string(osmo_cm_service_type_names, val); } /* Section 10.5.2.26, Table 10.5.64 */ #define GSM48_PM_MASK 0x03 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 099b85d..795e98b 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1145,4 +1145,15 @@ {} }; +const struct value_string osmo_cm_service_type_names[] = { + { GSM48_CMSERV_MO_CALL_PACKET, "MO-Call" }, + { GSM48_CMSERV_EMERGENCY, "Emergency-Call" }, + { GSM48_CMSERV_SMS, "Short-Messaging-Service" }, + { GSM48_CMSERV_SUP_SERV, "Supplementary-Service" }, + { GSM48_CMSERV_VGCS, "Voice-Group-Call" }, + { GSM48_CMSERV_VBS, "Voice-Broadcast-Call" }, + { GSM48_CMSERV_LOC_SERV, "Location-Service" }, + {} +}; + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 331c3f0..60ce5d1 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -574,6 +574,7 @@ osmo_rat_type_names; osmo_lu_type_names; +osmo_cm_service_type_names; local: *; }; -- To view, visit https://gerrit.osmocom.org/12521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9c2a7adc45ab7a1a7519168e965e7d805e1481ff Gerrit-Change-Number: 12521 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:47:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 17:47:34 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 29: (2 comments) https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 89 PS29, Line 89: memcpy(&vsub->sgs.cfg, cfg, sizeof(vsub->sgs.cfg)); rather vsub->sgs.cfg = *cfg; https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 101 PS29, Line 101: memcpy(&vsub->cgi, new_lai, sizeof(vsub->sgs.lai)); please don't use memcpy, but assign members directly. That ensures that you don't copy over mismatching formats. vsub->sgs.lai = *new_lai; vsub->cgi.lai = *new_lai; -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 29 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 17:47:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 17:58:23 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 17:58:23 +0000 Subject: Change in osmo-msc[master]: Fix optional libmsc linking with libsmpp In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12557 ) Change subject: Fix optional libmsc linking with libsmpp ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia660964e91f65255465b8620dc9e43dbd47a4e70 Gerrit-Change-Number: 12557 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 18:08:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 18:08:33 +0000 Subject: Change in osmo-bsc[master]: LCLS: use Status for HO-COMPLETE message In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12379 to look at the new patch set (#2). Change subject: LCLS: use Status for HO-COMPLETE message ...................................................................... LCLS: use Status for HO-COMPLETE message Don't use .lcls_bss_status_present field because the validity/presense of .lcls_bss_status can be determined from the value of .lcls_bss_status itself. Depends: Ib2958a8613627c4e54c004ffa3578c300ed0360b (libosmocore). Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/12379/2 -- To view, visit https://gerrit.osmocom.org/12379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab Gerrit-Change-Number: 12379 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 18:32:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 18:32:10 +0000 Subject: Change in libosmocore[master]: LCLS: expand enc/dec tests Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12558 Change subject: LCLS: expand enc/dec tests ...................................................................... LCLS: expand enc/dec tests Change-Id: I8ed87f26216104d34c7bd11c1527b203843760a2 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/12558/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 40e2b87..b3cab50 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -720,6 +720,18 @@ abort(); } + if (lcls_out.config != lcls_in.config) { + printf("LCLS Config parsed wrong: %s != %s\n", + gsm0808_lcls_config_name(lcls_out.config), gsm0808_lcls_config_name(lcls_in.config)); + abort(); + } + + if (lcls_out.control != lcls_in.control) { + printf("LCLS Control parsed wrong: %s != %s\n", + gsm0808_lcls_control_name(lcls_out.control), gsm0808_lcls_control_name(lcls_in.control)); + abort(); + } + if (lcls_out.gcr->net_len != g.net_len) { printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); abort(); -- To view, visit https://gerrit.osmocom.org/12558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ed87f26216104d34c7bd11c1527b203843760a2 Gerrit-Change-Number: 12558 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 18:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 18:35:04 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 18:35:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 18:43:37 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 18:43:37 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 2: > it might avoid confusion if we don't call it CTRL in Osmocom... if not in the code, then maybe at least in logging? TRXCTRL? TRXCTL? It's called TRXCTRL in OsmoTRX (see 1595ddaa5fc1dcc4e04168e43fc82e3c71fdb3fd) so I think it's better to do the same in here. -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 18:43:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 18:44:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 18:44:33 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12547/2/src/target/trx_toolkit/ctrl_if.py File src/target/trx_toolkit/ctrl_if.py: https://gerrit.osmocom.org/#/c/12547/2/src/target/trx_toolkit/ctrl_if.py at 32 PS2, Line 32: log.debug("Init CTRL interface (%s)" % self.desc_link()) Same in here. -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 18:44:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 19:00:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 19:00:00 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12441 ) Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... Patch Set 8: (4 comments) https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 12 PS8, Line 12: a Bluetooth link. Do you have a link to that part of BT spec by any chance? If so, would be cool to add it here or in the header file. https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 61 PS8, Line 61: only imitation is Server-initiated Release, that allows the typo https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 64 PS8, Line 64: implemented (yet), and leds to immediate release. here too. https://gerrit.osmocom.org/#/c/12441/8/src/host/layer23/src/common/sap_fsm.c File src/host/layer23/src/common/sap_fsm.c: https://gerrit.osmocom.org/#/c/12441/8/src/host/layer23/src/common/sap_fsm.c at 186 PS8, Line 186: /* Sent ATR request (required by the specs) */ Do you recall particular section? -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 19:00:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 19:29:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 19:29:31 +0000 Subject: Change in libosmocore[master]: comments: update/fix three 3GPP spec references Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12559 Change subject: comments: update/fix three 3GPP spec references ...................................................................... comments: update/fix three 3GPP spec references Change-Id: I3ab94f362866d752099000afe62922288b3dd118 --- M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_08_08.h 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/12559/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 791fbd4..d6574e9 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1814,7 +1814,7 @@ GSM48_CAUSE_LOC_NET_BEYOND = 0x0a, }; -/* Section 10.5.2.31 RR Cause / Table 10.5.70 */ +/* 3GPP TS 44.018 10.5.2.31 RR Cause / Table 10.5.70 */ enum gsm48_rr_cause { GSM48_RR_CAUSE_NORMAL = 0x00, GSM48_RR_CAUSE_ABNORMAL_UNSPEC = 0x01, diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 2ec0aa7..86c5b01 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -238,7 +238,7 @@ extern const struct value_string *gsm48_gmm_cause_names; -/* Chapter 10.4.6.6 / Table 10.5.157 */ +/* 3GPP TS 24.008 10.5.6.6 / Table 10.5.157 */ enum gsm48_gsm_cause { GSM_CAUSE_OPER_DET_BARR = 0x08, GSM_CAUSE_MBMS_CAP_INSUF = 0x18, diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 5e93abe..33f3a6f 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -322,7 +322,7 @@ GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION_EXTENDED_E_ARFCNS = 0x11, /*< 3.2.3.18 */ }; -/* GSM 08.08 3.2.2.5 Cause */ +/* 3GPP TS 48.008 3.2.2.5 Cause */ enum gsm0808_cause { GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE = 0, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE = 1, -- To view, visit https://gerrit.osmocom.org/12559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3ab94f362866d752099000afe62922288b3dd118 Gerrit-Change-Number: 12559 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:13:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12545 to look at the new patch set (#3). Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... trx_toolkit/fake_trx.py: move init code to __init__() There should be no code in run() that does initialization, __init__() is the best place for this. This change allows to import the Application class from fake_trx.py, and run it from script (e.g. for testing). Change-Id: I84969630348a189d237cc98354e568421839a37b --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/12545/3 -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:13:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12546 to look at the new patch set (#3). Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages ...................................................................... trx_toolkit/fake_trx.py: enrich TRX logging messages Since fake_trx.py can handle multiple transceivers, it makes sense to print some info in logging messages about transceivers they belong to. This acvieved by defining __str__() for Transceiver. Some examples: [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver... [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 3 files changed, 41 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/12546/3 -- To view, visit https://gerrit.osmocom.org/12546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 Gerrit-Change-Number: 12546 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:13:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12547 to look at the new patch set (#3). Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... trx_toolkit/{ctrl,data}_if.py: add init log message Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_if.py 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/12547/3 -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:13:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add init logging message In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12548 to look at the new patch set (#3). Change subject: trx_toolkit/transceiver.py: add init logging message ...................................................................... trx_toolkit/transceiver.py: add init logging message Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd --- M src/target/trx_toolkit/transceiver.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/12548/3 -- To view, visit https://gerrit.osmocom.org/12548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd Gerrit-Change-Number: 12548 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:13:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add optional transceiver name In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12549 to look at the new patch set (#2). Change subject: trx_toolkit/transceiver.py: add optional transceiver name ...................................................................... trx_toolkit/transceiver.py: add optional transceiver name Since fake_trx.py can handle multiple transceivers, it may be useful to name transceivers. If transceiver has some name, it will appear in logging messages, for example: [INFO] transceiver.py:104 Init transceiver 'BTS at 127.0.0.1:5700' [INFO] transceiver.py:104 Init transceiver 'MS at 127.0.0.1:6700' [INFO] transceiver.py:104 Init transceiver '127.0.0.1:5700/1' This change additionally assigns names to the both default transceivers, and extends the '--trx' option with ability to specify some name, for example: --trx foo at 127.0.0.1:5700 or --trx bar at 127.0.0.1:5700/1 --trx ipv6@[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6700 Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/12549/2 -- To view, visit https://gerrit.osmocom.org/12549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec Gerrit-Change-Number: 12549 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:24:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 20:24:33 +0000 Subject: Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO ...................................................................... Patch Set 2: Code-Review-1 (13 comments) meta: Thanks for preparing so far! I can also take this patch over from you, if you like. There are a lot of copy-paste errors in the vty code, needs a vty transcript test to uncover all. https://gerrit.osmocom.org/#/c/12446/2/include/osmocom/msc/neighbor_ident.h File include/osmocom/msc/neighbor_ident.h: https://gerrit.osmocom.org/#/c/12446/2/include/osmocom/msc/neighbor_ident.h at 26 PS2, Line 26: } a; a as in "A-interface"?? I learned recently that one can actually have unnamed unions... https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c File src/libmsc/neighbor_ident.c: https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c at 35 PS2, Line 35: #define NEIGHBOR_IDENT_ADDR_STRING_MAX 64 hmm, if we have a maximum length for this, then rather use a fixed-size char[] array in neighbor_ident_addr. It also clarifies ownership and memory management. I was going to approve talloc strings there to provide arbitrary length names, but if we limit it then let's array. https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c at 39 PS2, Line 39: static char buf[NEIGHBOR_IDENT_ADDR_STRING_MAX + 4]; +4 for "BSC ". +1 for '\0'? https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c at 106 PS2, Line 106: * replace an existing entry, first call neighbor_ident_del(nil, cell_id). neighbor_ident_del(nil, addr) https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c at 109 PS2, Line 109: * return -ENOMEM when the list is not initialized, -ERANGE when the BSIC value is too large. */ BSIC?? https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident.c at 159 PS2, Line 159: struct gsm0808_cell_id *cell_id) It should be possible to detect multiple matches. Suggest arg match_idx as in gsm_bts_by_cell_id() in osmo-bsc/src/osmo-bsc/gsm_data.c. (I now think we should also add an exact_match argument as well; that would also have to be added to gsm0808_cell_id_matches_list()) https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c File src/libmsc/neighbor_ident_vty.c: https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 39 PS2, Line 39: #define NEIGHBOR_DOC "Manage neighbor BSS cells\n" "Manage local- and remote-MSC BSS cells for inter-BSC and inter-MSC handover\n" https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 134 PS2, Line 134: " " no " " in DOC part, the docs are separated by '\n'; same N times below https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 140 PS2, Line 140: vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); wrong argv[idx] for point code arg. preferably use a local const char *pc_str = &argv[1]; same N times below https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 146 PS2, Line 146: return add_neighbor(vty, &addr, neighbor_ident_vty_parse_lac(vty, argv + 1)); + 1 seems wrong; same N times below https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 147 PS2, Line 147: } Please add a .vty transcript test to verify that all of these commands work as expected. See for example osmo-bsc/tests/neighbor_ident.vty https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 261 PS2, Line 261: SHOW_STR "Delete a neighbor MSC\n" "MSC ipa-nam\n" SHOW_STR??? https://gerrit.osmocom.org/#/c/12446/2/src/libmsc/neighbor_ident_vty.c at 373 PS2, Line 373: SHOW_STR "Display information about a neighbor MSC\n" "MSC ipa-name\n" No, you can't overload the same command token with two differing doc strings (above, the same one said "BSC"). Only one of them will be visible on the VTY interface. Instead you need to "Display information about a neighbor MSC or BSS\n" and make the distinction only with the actually differing cmd token ('msc-*' or 'bsc-*'). Define one single NEIGHBOR_SHOW_DOC and use in both instances. -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 14 Jan 2019 20:24:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:27:43 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:27:43 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 3: > it might avoid confusion if we don't call it CTRL in Osmocom... if > not in the code, then maybe at least in logging? TRXCTRL? TRXCTL? TBH, I don't see any confusion with libosmoctrl's CTRL interface (which could be also named in more concrete way, e.g. OCTRL) as TRX toolkit is not using this library and will never do. But I understand that some users, who are just starting to use this framework, may confuse this control interface with libosmoctrl's one. So, ok, let's stick to TRXC / TRXD at least in logging. I'll do this in a separate change. -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 20:27:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:59:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:59:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12560 Change subject: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages ...................................................................... trx_toolkit: use 'TRXC' and 'TRXD' in logging messages One can confuse TRX control interface with libosmoctrl's one. TRX toolkit is not using libosmoctrl, and will never do. But, in order to avoid this confusion, and potential confusion of DATA interface, let's call them 'TRXC' and 'TRXD' in logging. Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 --- M src/target/trx_toolkit/README M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/transceiver.py 5 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/12560/1 diff --git a/src/target/trx_toolkit/README b/src/target/trx_toolkit/README index 91b6099..09800b0 100644 --- a/src/target/trx_toolkit/README +++ b/src/target/trx_toolkit/README @@ -32,3 +32,8 @@ versa. Also provides some capabilities for filtering bursts by direction, frame and timeslot numbers, and for recording captured messages to a binary file. + +Please note that TRX toolkit is not using libosmocore's CTRL +interface, so 'CTRL' in scope of this code base actually means +control interface of TRX or control protocol. In order to avoid +possible confusion, we use 'TRXC' and 'TRXD' in logging. diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 28815c2..bdacb64 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -51,7 +51,7 @@ self.argv.bind_addr, self.argv.bind_port) # Debug print - log.info("Init CTRL interface (%s)" \ + log.info("Init TRXC interface (%s)" \ % self.ctrl_link.desc_link()) def parse_argv(self): @@ -109,7 +109,7 @@ self.ctrl_link.send("CMD %s\0" % cmd) def print_prompt(self): - sys.stdout.write("CTRL# ") + sys.stdout.write("TRXC# ") sys.stdout.flush() def sig_handler(self, signum, frame): diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index a1c19f0..902af18 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -29,7 +29,7 @@ class CTRLInterface(UDPLink): def __init__(self, *udp_link_args): UDPLink.__init__(self, *udp_link_args) - log.debug("Init CTRL interface (%s)" % self.desc_link()) + log.debug("Init TRXC interface (%s)" % self.desc_link()) def handle_rx(self): # Read data from socket @@ -37,7 +37,7 @@ data = data.decode() if not self.verify_req(data): - log.error("Wrong data on CTRL interface") + log.error("Wrong data on TRXC interface") return # Attempt to parse a command diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index b1ba1e5..027fd85 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -30,7 +30,7 @@ class DATAInterface(UDPLink): def __init__(self, *udp_link_args): UDPLink.__init__(self, *udp_link_args) - log.debug("Init DATA interface (%s)" % self.desc_link()) + log.debug("Init TRXD interface (%s)" % self.desc_link()) def recv_raw_data(self): data, _ = self.sock.recvfrom(512) diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 4eb210b..b15c10f 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -180,13 +180,13 @@ # Make sure that transceiver is configured and running if not self.running: - log.warning("(%s) RX DATA message (%s), but transceiver " + log.warning("(%s) RX TRXD message (%s), but transceiver " "is not running => dropping..." % (self, msg.desc_hdr())) return None # Make sure that indicated timeslot is configured if msg.tn not in self.ts_list: - log.warning("(%s) RX DATA message (%s), but timeslot is not " + log.warning("(%s) RX TRXD message (%s), but timeslot is not " "configured => dropping..." % (self, msg.desc_hdr())) return None -- To view, visit https://gerrit.osmocom.org/12560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 Gerrit-Change-Number: 12560 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 20:59:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 20:59:35 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/README: update fake_trx.py description Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12561 Change subject: trx_toolkit/README: update fake_trx.py description ...................................................................... trx_toolkit/README: update fake_trx.py description Since Ibff31fb3a958a714c828d0dea7e87d47f778fd80, fake_trx.py does support multiple transceivers. Let's update its description. Change-Id: I6e4351693da3a1f7e3eadd8e11971c34044dde20 --- M src/target/trx_toolkit/README 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/12561/1 diff --git a/src/target/trx_toolkit/README b/src/target/trx_toolkit/README index 09800b0..769c9c2 100644 --- a/src/target/trx_toolkit/README +++ b/src/target/trx_toolkit/README @@ -5,8 +5,9 @@ Brief description of available applications: - fake_trx.py - main application, that allows to connect both - OsmocomBB and OsmoBTS without actual RF hardware. Currently - only a single MS may work with a single BTS. + OsmocomBB and OsmoBTS without actual RF hardware. It's also + possible to emulate more than two transceivers, so multiple + MS and/or BTS instances can be connected. - clck_gen.py - a peripheral tool aimed to emulate TDMA frame clock generator. Could be used for testing and clock -- To view, visit https://gerrit.osmocom.org/12561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e4351693da3a1f7e3eadd8e11971c34044dde20 Gerrit-Change-Number: 12561 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:00:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:00:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 3: > Patch Set 2: Code-Review-1 Please see I67b1e850094cf8e279777c45c7544886be42a009. -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 21:00:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:06:36 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:06:36 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12551 ) Change subject: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd Gerrit-Change-Number: 12551 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 21:06:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:06:48 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:06:48 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12551 ) Change subject: ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py ...................................................................... ttcn3-bts-test/jenkins.sh: use logging options of fake_trx.py Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd --- M ttcn3-bts-test/jenkins.sh 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index e527cd7..3632ae6 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -51,7 +51,11 @@ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ - bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1" + /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \ + --log-file-name /data/fake_trx.log \ + --log-file-level DEBUG \ + --log-level INFO \ + -R 172.18.9.20 -r 172.18.9.22 echo Starting container with trxcon docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32bf66b1320b752450a8cb064348b3c86b1c03cd Gerrit-Change-Number: 12551 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:07:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:07:34 +0000 Subject: Change in docker-playground[master]: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12552 ) Change subject: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 Gerrit-Change-Number: 12552 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 21:07:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:07:36 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:07:36 +0000 Subject: Change in docker-playground[master]: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12552 ) Change subject: .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f ...................................................................... .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f Since Ib2335d02ea545aff837aadd49f15b2fdb418c46e, this VTY option is deprecated in osmo-bsc, so let's actualize the config files. Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg 5 files changed, 0 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 4a69b3a..2550c1b 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -64,7 +64,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index f381ace..cb0059d 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -64,7 +64,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 26d062e..742c2b6 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -70,7 +70,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 25844b4..49855d2 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -74,7 +74,6 @@ handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 timer t3113 10 bts 0 diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 13ecd40..b06cf06 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -74,7 +74,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 1 periodic location update 30 bts 0 type sysmobts -- To view, visit https://gerrit.osmocom.org/12552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299 Gerrit-Change-Number: 12552 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:28:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:28:34 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Hello K?vin Redon, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12441 to look at the new patch set (#9). Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... layer23/sap_interface.c: reimplement (BT)SAP interface The (BT)SAP (Bluetooth SIM Access Profile) is a part of Bluetooth specifications, that defines the protocol and procedures that shall be used to access a smart card (usually GSM SIM) via a Bluetooth link. The profile defines two roles: - Server - the side that has direct access to a smart card. It acts as a SIM card reader, which assists the Client in accessing and controlling the smart card. - Client - the side that accesses and controls the smart card inside the Server through the connection with Server. Typical examples of a Server are a simple SIM card holder or a portable phone in the car environment. A typical example of a Client is a car phone, which uses a subscription module in the Server for a connection to the cellular network. OsmocomBB implements the Client role providing abstract SAP interface API to the higher layers. Instead of Bluetooth, a UNIX socket is used to communicate with a Server. The previous implementation of (BT)SAP interface was incomplete and hard to maintain. This change (re)implements it almost from scratch on top of the Osmocom FSM framework. Besides that, the most significant changes are: - The implementation is separated into three parts: - sap_interface.{c|h} - public SAP interface API, - sap_proto.{c|h} - SAP protocol definition, - sap_fsm.{c|h} - SAP FSM implementation. - Both 'sap_message' and 'sap_param' structures follow the SAP message format definition according to 5.1 and 5.2. - The message parsing is done more carefully in order to prevent buffer overflow and NULL-pointer dereference. - Introduced public API for getting / adding message parameters, and checking the ResultCode. - Introduced public API for opening / closing a connection with the server, powering on / off and resetting the SIM card, sending ATR and APDU. - Introduced a call-back for handling the response message. - Card reader state is also a part of the public API. The new implementation was tested against softsim [1]. The only limitation is Server-initiated Release, that allows the Server to 'ask' a Client to release connection as soon as communication with the smart card is finished. This is not implemented (yet), and leads to immediate release. [1] https://git.osmocom.org/softsim/ Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/osmocom_data.h A src/host/layer23/include/osmocom/bb/common/sap_fsm.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/sap_fsm.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/common/sap_proto.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/subscriber.c 12 files changed, 1,312 insertions(+), 439 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/12441/9 -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:29:54 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 21:29:54 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12441 ) Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... Patch Set 8: (4 comments) https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 12 PS8, Line 12: a Bluetooth link. > Do you have a link to that part of BT spec by any chance? If so, would be cool to add it here or in [?] The specifications of core profiles can be found at https://www.bluetooth.com/specifications/profiles-overview. The problem is that link to SAP is probably the only one that redirects to registration form :/ I only managed to find *.pdf using Google. https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 61 PS8, Line 61: only imitation is Server-initiated Release, that allows the > typo Done https://gerrit.osmocom.org/#/c/12441/8//COMMIT_MSG at 64 PS8, Line 64: implemented (yet), and leds to immediate release. > here too. Done https://gerrit.osmocom.org/#/c/12441/8/src/host/layer23/src/common/sap_fsm.c File src/host/layer23/src/common/sap_fsm.c: https://gerrit.osmocom.org/#/c/12441/8/src/host/layer23/src/common/sap_fsm.c at 186 PS8, Line 186: /* Sent ATR request (required by the specs) */ > Do you recall particular section? Thanks, this note helped me to fix a bug ;) ATR shall be sent only if card state is "Card reset". -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 21:29:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:51:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:51:19 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12441 ) Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 21:51:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:51:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:51:30 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/README: update fake_trx.py description In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12561 ) Change subject: trx_toolkit/README: update fake_trx.py description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e4351693da3a1f7e3eadd8e11971c34044dde20 Gerrit-Change-Number: 12561 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 21:51:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:51:51 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:51:51 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12560 ) Change subject: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 Gerrit-Change-Number: 12560 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 21:51:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:52:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:52:08 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12545 ) Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 21:52:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:52:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:52:34 +0000 Subject: Change in libosmocore[master]: comments: update/fix three 3GPP spec references In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12559 ) Change subject: comments: update/fix three 3GPP spec references ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ab94f362866d752099000afe62922288b3dd118 Gerrit-Change-Number: 12559 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 14 Jan 2019 21:52:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:52:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:52:58 +0000 Subject: Change in libosmocore[master]: LCLS: expand enc/dec tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12558 ) Change subject: LCLS: expand enc/dec tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ed87f26216104d34c7bd11c1527b203843760a2 Gerrit-Change-Number: 12558 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 21:52:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:53:39 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:53:39 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 21:53:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 21:54:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 Jan 2019 21:54:07 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 14 Jan 2019 21:54:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 22:17:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 22:17:34 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement (BT)SAP interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12441 ) Change subject: layer23/sap_interface.c: reimplement (BT)SAP interface ...................................................................... layer23/sap_interface.c: reimplement (BT)SAP interface The (BT)SAP (Bluetooth SIM Access Profile) is a part of Bluetooth specifications, that defines the protocol and procedures that shall be used to access a smart card (usually GSM SIM) via a Bluetooth link. The profile defines two roles: - Server - the side that has direct access to a smart card. It acts as a SIM card reader, which assists the Client in accessing and controlling the smart card. - Client - the side that accesses and controls the smart card inside the Server through the connection with Server. Typical examples of a Server are a simple SIM card holder or a portable phone in the car environment. A typical example of a Client is a car phone, which uses a subscription module in the Server for a connection to the cellular network. OsmocomBB implements the Client role providing abstract SAP interface API to the higher layers. Instead of Bluetooth, a UNIX socket is used to communicate with a Server. The previous implementation of (BT)SAP interface was incomplete and hard to maintain. This change (re)implements it almost from scratch on top of the Osmocom FSM framework. Besides that, the most significant changes are: - The implementation is separated into three parts: - sap_interface.{c|h} - public SAP interface API, - sap_proto.{c|h} - SAP protocol definition, - sap_fsm.{c|h} - SAP FSM implementation. - Both 'sap_message' and 'sap_param' structures follow the SAP message format definition according to 5.1 and 5.2. - The message parsing is done more carefully in order to prevent buffer overflow and NULL-pointer dereference. - Introduced public API for getting / adding message parameters, and checking the ResultCode. - Introduced public API for opening / closing a connection with the server, powering on / off and resetting the SIM card, sending ATR and APDU. - Introduced a call-back for handling the response message. - Card reader state is also a part of the public API. The new implementation was tested against softsim [1]. The only limitation is Server-initiated Release, that allows the Server to 'ask' a Client to release connection as soon as communication with the smart card is finished. This is not implemented (yet), and leads to immediate release. [1] https://git.osmocom.org/softsim/ Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/osmocom_data.h A src/host/layer23/include/osmocom/bb/common/sap_fsm.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/sap_fsm.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/common/sap_proto.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/subscriber.c 12 files changed, 1,312 insertions(+), 439 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index eb1dfb7..d66be98 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ networks.h gps.h sysinfo.h osmocom_data.h utils.h \ - sap_proto.h sap_interface.h + sap_proto.h sap_fsm.h sap_interface.h diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index a3ecc92..ee48d6d 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,9 +23,14 @@ #include struct osmosap_entity { - sap_cb_t msg_handler; - uint8_t sap_state; + struct osmo_fsm_inst *fi; uint16_t max_msg_size; + uint8_t card_status; + + /* Optional SAP message call-back */ + sap_msg_cb_t sap_msg_cb; + /* Optional response call-back */ + sap_rsp_cb_t sap_rsp_cb; }; struct osmol1_entity { diff --git a/src/host/layer23/include/osmocom/bb/common/sap_fsm.h b/src/host/layer23/include/osmocom/bb/common/sap_fsm.h new file mode 100644 index 0000000..d79bc1c --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/sap_fsm.h @@ -0,0 +1,35 @@ +#pragma once + +#include + +/* How long should we wait for connection establishment */ +#define SAP_FSM_CONN_EST_TIMEOUT 5 +#define SAP_FSM_CONN_EST_T 0 + +/* How long should we wait for connection release */ +#define SAP_FSM_CONN_REL_TIMEOUT 3 +#define SAP_FSM_CONN_REL_T 1 + +/* How long should we wait for request to complete */ +#define SAP_FSM_PROC_REQ_TIMEOUT 5 +#define SAP_FSM_PROC_REQ_T 2 + +#define SAP_STATE_IS_ACTIVE(state) \ + (state >= SAP_STATE_WAIT_FOR_CARD) + +enum sap_fsm_state { + SAP_STATE_NOT_CONNECTED = 0, + SAP_STATE_CONNECTING, + SAP_STATE_DISCONNECTING, /* Auxiliary state (not from specs) */ + SAP_STATE_WAIT_FOR_CARD, /* Auxiliary state (not from specs) */ + SAP_STATE_IDLE, + SAP_STATE_PROC_ATR_REQ, + SAP_STATE_PROC_APDU_REQ, + SAP_STATE_PROC_RESET_REQ, + SAP_STATE_PROC_STATUS_REQ, + SAP_STATE_PROC_SET_TP_REQ, + SAP_STATE_PROC_POWERON_REQ, + SAP_STATE_PROC_POWEROFF_REQ, +}; + +int sap_fsm_alloc(struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 96d056b..87a0f85 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,18 +1,23 @@ #pragma once -typedef int (*sap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); +#include +#include + +struct osmocom_ms; + +typedef int (*sap_msg_cb_t)(struct osmocom_ms *ms, struct msgb *msg); +typedef int (*sap_rsp_cb_t)(struct osmocom_ms *ms, int res_code, + uint8_t res_type, uint16_t param_len, const uint8_t *param_val); + +void sap_init(struct osmocom_ms *ms); int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); -int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb); -int sap_init(struct osmocom_ms *ms); +int _sap_close_sock(struct osmocom_ms *ms); -enum sap_state { - SAP_SOCKET_ERROR, - SAP_NOT_CONNECTED, - SAP_IDLE, - SAP_CONNECTION_UNDER_NEGOTIATION, - SAP_PROCESSING_ATR_REQUEST, - SAP_PROCESSING_APDU_REQUEST -}; +int sap_send_reset_req(struct osmocom_ms *ms); +int sap_send_poweron_req(struct osmocom_ms *ms); +int sap_send_poweroff_req(struct osmocom_ms *ms); + +int sap_send_atr_req(struct osmocom_ms *ms); +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *apdu, uint16_t apdu_len); diff --git a/src/host/layer23/include/osmocom/bb/common/sap_proto.h b/src/host/layer23/include/osmocom/bb/common/sap_proto.h index 49b30fc..e149f00 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_proto.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_proto.h @@ -3,8 +3,10 @@ #include #include +#include -/* Table 5.1: Message Overview */ +/* Table 5.1: Message Overview + * NOTE: messages are used as events for SAP FSM */ enum sap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, @@ -81,14 +83,39 @@ extern const struct value_string sap_card_status_names[]; extern const struct value_string sap_conn_status_names[]; +/* Figure 5.2: Payload Coding */ struct sap_param { - uint8_t id; - uint16_t len; - uint8_t *value; -}; + /* Parameter ID, see sap_param_type enum */ + uint8_t param_id; + /* Reserved for further use (shall be set to 0x00) */ + uint8_t reserved[1]; + /* Parameter length */ + uint16_t length; + /* Parameter value (and optional padding) */ + uint8_t value[0]; +} __attribute__((packed)); -struct sap_msg { - uint8_t id; +/* Figure 5.1 Message Format */ +struct sap_message { + /* Message ID, see sap_msg_type enum */ + uint8_t msg_id; + /* Number of parameters */ uint8_t num_params; - struct sap_param *params; -}; + /* Reserved for further use (shall be set to 0x00) */ + uint8_t reserved[2]; + /* Payload, see sap_param struct */ + uint8_t payload[0]; +} __attribute__((packed)); + +#define GSM_SAP_LENGTH 300 +#define GSM_SAP_HEADROOM 32 + +struct msgb *sap_msgb_alloc(uint8_t msg_id); +struct msgb *sap_msg_parse(const uint8_t *buf, size_t buf_len, int max_msg_size); +int sap_check_result_code(const struct sap_message *sap_msg); + +void sap_msgb_add_param(struct msgb *msg, + enum sap_param_type param_type, + uint16_t param_len, const uint8_t *param_value); +struct sap_param *sap_get_param(const struct sap_message *sap_msg, + enum sap_param_type param_type, uint16_t *param_len); diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index c747af9..698b0fd 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -90,6 +90,8 @@ int gsm_subscr_exit(struct osmocom_ms *ms); int gsm_subscr_testcard(struct osmocom_ms *ms, uint16_t mcc, uint16_t mnc, uint16_t lac, uint32_t tmsi, uint8_t imsi_attached); +int gsm_subscr_sap_rsp_cb(struct osmocom_ms *ms, int res_code, + uint8_t res_type, uint16_t param_len, const uint8_t *param_val); int gsm_subscr_sapcard(struct osmocom_ms *ms); int gsm_subscr_remove_sapcard(struct osmocom_ms *ms); int gsm_subscr_simcard(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 9eed961..a8d9f7e 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -2,5 +2,5 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) noinst_LIBRARIES = liblayer23.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_proto.c sap_interface.c \ +liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_fsm.c sap_proto.c sap_interface.c \ logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c diff --git a/src/host/layer23/src/common/sap_fsm.c b/src/host/layer23/src/common/sap_fsm.c new file mode 100644 index 0000000..9591dab --- /dev/null +++ b/src/host/layer23/src/common/sap_fsm.c @@ -0,0 +1,690 @@ +/* + * SAP (SIM Access Profile) FSM definition + * based on Bluetooth SAP specification + * + * (C) 2018-2019 by Vadim Yanitskiy + * + * 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, 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 + +/*! Send encoded SAP message to the Server. + * \param[in] ms MS instance with active SAP connection + * \param[in] msg encoded SAP message buffer + * \returns 0 in case of success, negative in case of error + */ +static int sap_send_msgb(struct osmocom_ms *ms, struct msgb *msg) +{ + int rc; + + rc = osmo_wqueue_enqueue(&ms->sap_wq, msg); + if (rc) { + LOGP(DSAP, LOGL_ERROR, "Failed to enqueue SAP message\n"); + msgb_free(msg); + return rc; + } + + return 0; +} + +static void sap_fsm_disconnect(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); +} + +static void sap_fsm_connect(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct msgb *msg; + uint16_t size; + + /* Section 5.1.1, CONNECT_REQ */ + msg = sap_msgb_alloc(SAP_CONNECT_REQ); + if (!msg) + return; + + /* Section 4.1.1, start MaxMsgSize negotiation */ + size = htons(ms->sap_entity.max_msg_size); + sap_msgb_add_param(msg, SAP_MAX_MSG_SIZE, + sizeof(size), (uint8_t *) &size); + + sap_send_msgb(ms, msg); +} + +static void sap_negotiate_msg_size(struct osmosap_entity *sap, + const struct sap_message *sap_msg) +{ + uint16_t size, param_len; + const char *cause = NULL; + struct sap_param *param; + + param = sap_get_param(sap_msg, SAP_MAX_MSG_SIZE, ¶m_len); + if (!param) { + cause = "missing expected MaxMsgSize parameter"; + goto error; + } + if (param_len != sizeof(size)) { + cause = "MaxMsgSize parameter has wrong length"; + goto error; + } + + /* Parse MaxMsgSize suggested by server */ + size = ntohs((uint16_t *) param->value); + if (size > SAP_MAX_MSG_SIZE) { + cause = "suggested MaxMsgSize is too big for us"; + goto error; + } + + /* Attempt to initiate connection again */ + sap->max_msg_size = size; + sap_fsm_connect(sap->fi, sap->fi->state); + return; + +error: + LOGP(DSAP, LOGL_ERROR, "MaxMsgSize negotiation failed: %s\n", cause); + osmo_fsm_inst_state_chg(sap->fi, SAP_STATE_NOT_CONNECTED, 0, 0); +} + +static void sap_fsm_conn_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct sap_message *sap_msg = (struct sap_message *) data; + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + uint8_t status; + + /* Section 5.1.2, CONNECT_RESP */ + param = sap_get_param(sap_msg, SAP_CONNECTION_STATUS, ¶m_len); + if (!param || param_len != sizeof(status)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory connection status\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + return; + } + + /* Parse connection status */ + status = param->value[0]; + + LOGP(DSAP, LOGL_INFO, "SAP connection status (0x%02x): %s\n", + status, get_value_string(sap_conn_status_names, status)); + + switch ((enum sap_conn_status_type) status) { + case SAP_CONN_STATUS_OK_CALL: + ms->sap_entity.card_status = SAP_CARD_STATUS_NOT_ACC; + /* fall-through */ + case SAP_CONN_STATUS_OK_READY: + osmo_fsm_inst_state_chg(fi, SAP_STATE_WAIT_FOR_CARD, 0, 0); + break; + + case SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE: + case SAP_CONN_STATUS_ERROR_CONN: + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + break; + + /* Section 4.1.1, MaxMsgSize negotiation */ + case SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE: + sap_negotiate_msg_size(&ms->sap_entity, sap_msg); + break; + } +} + +static void sap_fsm_conn_release(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct msgb *msg; + + LOGP(DSAP, LOGL_DEBUG, "Initiating connection release\n"); + + /* We don't care about possible allocating / sending errors */ + msg = sap_msgb_alloc(SAP_DISCONNECT_REQ); + if (msg != NULL) + sap_send_msgb((struct osmocom_ms *) fi->priv, msg); +} + +static void sap_fsm_release_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + LOGP(DSAP, LOGL_DEBUG, "Connection release complete\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); +} + +static void sap_fsm_idle_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + + switch ((enum sap_fsm_state) prev_state) { + case SAP_STATE_CONNECTING: + case SAP_STATE_WAIT_FOR_CARD: + /* According to 4.1, if a subscription module is inserted + * in the Server and powered on (i.e. STATUS_IND message + * indicates "Card reset" state), the Client shall request + * the ATR of the subscription module. */ + if (ms->sap_entity.card_status == SAP_CARD_STATUS_RESET) + sap_send_atr_req(ms); + break; + default: + /* Do nothing, suppress compiler warning */ + break; + } +} + +static void sap_fsm_idle_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct msgb *msg = (struct msgb *) data; + enum sap_fsm_state state; + int rc; + + /* Map event to the corresponding state */ + switch ((enum sap_msg_type) event) { + case SAP_TRANSFER_ATR_REQ: + state = SAP_STATE_PROC_ATR_REQ; + break; + case SAP_TRANSFER_APDU_REQ: + state = SAP_STATE_PROC_APDU_REQ; + break; + case SAP_RESET_SIM_REQ: + state = SAP_STATE_PROC_RESET_REQ; + break; + case SAP_TRANSFER_CARD_READER_STATUS_REQ: + state = SAP_STATE_PROC_STATUS_REQ; + break; + case SAP_SET_TRANSPORT_PROTOCOL_REQ: + state = SAP_STATE_PROC_SET_TP_REQ; + break; + case SAP_POWER_SIM_ON_REQ: + state = SAP_STATE_PROC_POWERON_REQ; + break; + case SAP_POWER_SIM_OFF_REQ: + state = SAP_STATE_PROC_POWEROFF_REQ; + break; + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + rc = sap_send_msgb(ms, msg); + if (rc) + return; + + osmo_fsm_inst_state_chg(fi, state, + SAP_FSM_PROC_REQ_TIMEOUT, SAP_FSM_PROC_REQ_T); +} + +static void sap_fsm_response_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct sap_message *sap_msg = (struct sap_message *) data; + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param = NULL; + uint16_t param_len = 0; + int param_id, rc; + + switch ((enum sap_msg_type) event) { + /* Both POWER_SIM_OFF_REQ and RESET_SIM_REQ can be sent in nearly + * any state, in order to allow the Client to reactivate + * a not accessible subscription module card. */ + case SAP_POWER_SIM_OFF_REQ: + case SAP_RESET_SIM_REQ: + OSMO_ASSERT(data != NULL); + goto request; + + /* Messages without parameters */ + case SAP_SET_TRANSPORT_PROTOCOL_RESP: + case SAP_POWER_SIM_OFF_RESP: + case SAP_POWER_SIM_ON_RESP: + case SAP_RESET_SIM_RESP: + param_id = -1; + break; + + case SAP_TRANSFER_CARD_READER_STATUS_RESP: + param_id = SAP_CARD_READER_STATUS; + break; + case SAP_TRANSFER_APDU_RESP: + param_id = SAP_RESPONSE_APDU; + break; + case SAP_TRANSFER_ATR_RESP: + param_id = SAP_ATR; + break; + + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + /* We're done with request now */ + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + + /* Check the ResultCode */ + rc = sap_check_result_code(sap_msg); + if (rc != SAP_RESULT_OK_REQ_PROC_CORR) { + LOGP(DSAP, LOGL_NOTICE, "Bad ResultCode: '%s'\n", + get_value_string(sap_result_names, rc)); + goto response; + } + + if (param_id < 0) + goto response; + + param = sap_get_param(sap_msg, param_id, ¶m_len); + if (!param) { + LOGP(DSAP, LOGL_ERROR, "Message '%s' missing " + "mandatory parameter '%s'\n", + get_value_string(sap_msg_names, sap_msg->msg_id), + get_value_string(sap_param_names, param_id)); + rc = -EINVAL; + goto response; + } + +response: + /* Poke optional response handler */ + if (ms->sap_entity.sap_rsp_cb != NULL) { + if (param != NULL) { + ms->sap_entity.sap_rsp_cb(ms, rc, + sap_msg->msg_id, param_len, param->value); + } else { + ms->sap_entity.sap_rsp_cb(ms, rc, + sap_msg->msg_id, 0, NULL); + } + } + + return; + +request: + rc = sap_send_msgb(ms, (struct msgb *) data); + if (rc) + return; + + osmo_fsm_inst_state_chg(fi, event == SAP_RESET_SIM_REQ ? + SAP_STATE_PROC_RESET_REQ : SAP_STATE_PROC_POWEROFF_REQ, + SAP_FSM_PROC_REQ_TIMEOUT, SAP_FSM_PROC_REQ_T); +} + +/* Generates mask for a single state or event */ +#define S(x) (1 << x) + +/* Figure 4.13: Simplified State Machine */ +static const struct osmo_fsm_state sap_fsm_states[] = { + [SAP_STATE_NOT_CONNECTED] = { + .name = "NOT_CONNECTED", + .out_state_mask = S(SAP_STATE_CONNECTING), + .onenter = &sap_fsm_disconnect, + }, + [SAP_STATE_CONNECTING] = { + .name = "CONNECTING", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_WAIT_FOR_CARD), + .in_event_mask = S(SAP_CONNECT_RESP), + .onenter = &sap_fsm_connect, + .action = &sap_fsm_conn_handler, + }, + /* NOTE: this is a custom state (i.e. not defined by the specs). + * We need it in order to do release procedure correctly. */ + [SAP_STATE_DISCONNECTING] = { + .name = "DISCONNECTING", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED), + .in_event_mask = S(SAP_DISCONNECT_RESP), + .onenter = &sap_fsm_conn_release, + .action = &sap_fsm_release_handler, + }, + /* NOTE: this is a custom state (i.e. not defined by the specs). + * We need it in order to wait until SIM card becomes available. + * SAP_STATUS_IND event is handled by sap_fsm_allstate_action(). */ + [SAP_STATE_WAIT_FOR_CARD] = { + .name = "WAIT_FOR_CARD", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_IDLE), + }, + [SAP_STATE_IDLE] = { + .name = "IDLE", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_PROC_APDU_REQ) + | S(SAP_STATE_PROC_ATR_REQ) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_STATUS_REQ) + | S(SAP_STATE_PROC_SET_TP_REQ) + | S(SAP_STATE_PROC_POWERON_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_ATR_REQ) + | S(SAP_TRANSFER_APDU_REQ) + | S(SAP_RESET_SIM_REQ) + | S(SAP_TRANSFER_CARD_READER_STATUS_REQ) + | S(SAP_SET_TRANSPORT_PROTOCOL_REQ) + | S(SAP_POWER_SIM_ON_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .onenter = &sap_fsm_idle_enter, + .action = &sap_fsm_idle_handler, + }, + [SAP_STATE_PROC_ATR_REQ] = { + .name = "PROC_ATR_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_ATR_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_APDU_REQ] = { + .name = "PROC_APDU_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_APDU_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_RESET_REQ] = { + .name = "PROC_RESET_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_RESET_SIM_RESP) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_STATUS_REQ] = { + .name = "PROC_STATUS_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_CARD_READER_STATUS_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_SET_TP_REQ] = { + .name = "PROC_SET_TP_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE), + .in_event_mask = S(SAP_SET_TRANSPORT_PROTOCOL_RESP), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_POWERON_REQ] = { + .name = "PROC_POWERON_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_POWER_SIM_ON_RESP) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_response_handler, + }, + [SAP_STATE_PROC_POWEROFF_REQ] = { + .name = "PROC_POWEROFF_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE), + .in_event_mask = S(SAP_POWER_SIM_OFF_RESP), + .action = &sap_fsm_response_handler, + }, +}; + +static void sap_fsm_tear_down(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + + /* Flush buffers, close socket */ + _sap_close_sock(ms); + + /* Reset SAP state */ + ms->sap_entity.card_status = SAP_CARD_STATUS_NOT_ACC; + ms->sap_entity.max_msg_size = GSM_SAP_LENGTH; + ms->sap_entity.fi = NULL; +} + +static void sap_fsm_handle_card_status_ind(struct osmo_fsm_inst *fi, + const struct sap_message *sap_msg) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + uint8_t status; + + param = sap_get_param(sap_msg, SAP_STATUS_CHANGE, ¶m_len); + if (!param || param_len != sizeof(status)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_STATUS_CHANGE)); + return; + } + + status = param->value[0]; + + if (ms->sap_entity.card_status != status) { + LOGP(DSAP, LOGL_NOTICE, "(SIM) card status change '%s' -> '%s'\n", + get_value_string(sap_card_status_names, ms->sap_entity.card_status), + get_value_string(sap_card_status_names, status)); + ms->sap_entity.card_status = status; + } + + switch ((enum sap_card_status_type) status) { + /* SIM card is ready */ + case SAP_CARD_STATUS_RESET: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + /* SIM card has recovered after unaccessful state */ + case SAP_CARD_STATUS_RECOVERED: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + /* SIM card inserted, we need to power it on */ + case SAP_CARD_STATUS_INSERTED: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + sap_send_poweron_req(ms); + break; + + case SAP_CARD_STATUS_UNKNOWN_ERROR: + case SAP_CARD_STATUS_NOT_ACC: + case SAP_CARD_STATUS_REMOVED: + default: /* Unknown card status */ + if (fi->state != SAP_STATE_WAIT_FOR_CARD) + osmo_fsm_inst_state_chg(fi, SAP_STATE_WAIT_FOR_CARD, 0, 0); + break; + } +} + +static void sap_fsm_allstate_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct sap_message *sap_msg = (struct sap_message *) data; + + switch ((enum sap_msg_type) event) { + /* Disconnect indication initiated by the Server. + * FIXME: at the moment, immediate release is always assumed, + * but ideally we should check type of release (using *data) */ + case SAP_DISCONNECT_IND: + /* This message may arrive in any of the sub-states of + * the "Connected" state (i.e. connection shall exist) */ + if (!SAP_STATE_IS_ACTIVE(fi->state)) + goto not_peritted; + + sap_msg = NULL; + /* fall-through */ + + /* Disconnect initiated by the Client */ + case SAP_DISCONNECT_REQ: + /* DISCONNECT_REQ has no parameters, so the caller + * shall not allocate the message manually. */ + OSMO_ASSERT(sap_msg == NULL); + + /* If we have no active connection, tear-down immediately */ + if (!SAP_STATE_IS_ACTIVE(fi->state)) { + osmo_fsm_inst_state_chg(fi, + SAP_STATE_NOT_CONNECTED, 0, 0); + break; + } + + /* Trigger Client-initiated connection release */ + osmo_fsm_inst_state_chg(fi, SAP_STATE_DISCONNECTING, + SAP_FSM_CONN_REL_TIMEOUT, SAP_FSM_CONN_REL_T); + break; + + /* SIM status indication (inserted or ejected) */ + case SAP_STATUS_IND: + /* This message may arrive in any of the sub-states of + * the "Connected" state (i.e. connection shall exist) */ + if (!SAP_STATE_IS_ACTIVE(fi->state)) + goto not_peritted; + + sap_fsm_handle_card_status_ind(fi, sap_msg); + break; + + case SAP_ERROR_RESP: + LOGP(DSAP, LOGL_NOTICE, "RX Error Response from Server\n"); + + if (fi->state == SAP_STATE_CONNECTING) { + /* Connection establishment error */ + osmo_fsm_inst_state_chg(fi, + SAP_STATE_NOT_CONNECTED, 0, 0); + } else if (fi->state > SAP_STATE_IDLE) { + /* Error replaces any Request message */ + osmo_fsm_inst_state_chg(fi, + SAP_STATE_IDLE, 0, 0); + } else { + /* Should not happen in general */ + goto not_peritted; + } + break; + + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + return; + +not_peritted: + LOGPFSML(fi, LOGL_NOTICE, "Event '%s' is not " + "permitted in state '%s', please fix!\n", + osmo_fsm_event_name(fi->fsm, event), + osmo_fsm_state_name(fi->fsm, fi->state)); +} + +static int sap_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch ((enum sap_fsm_state) fi->state) { + /* Connection establishment / release timeout */ + case SAP_STATE_DISCONNECTING: + case SAP_STATE_CONNECTING: + LOGP(DSAP, LOGL_NOTICE, "Connection timeout\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + break; + + /* Request processing timeout */ + case SAP_STATE_PROC_ATR_REQ: + case SAP_STATE_PROC_APDU_REQ: + case SAP_STATE_PROC_RESET_REQ: + case SAP_STATE_PROC_STATUS_REQ: + case SAP_STATE_PROC_SET_TP_REQ: + case SAP_STATE_PROC_POWERON_REQ: + case SAP_STATE_PROC_POWEROFF_REQ: + LOGP(DSAP, LOGL_NOTICE, "Timeout waiting for '%s' to complete, " + "going back to IDLE\n", osmo_fsm_inst_state_name(fi)); + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + default: + LOGP(DSAP, LOGL_ERROR, "Timeout for unhandled state '%s'\n", + osmo_fsm_inst_state_name(fi)); + } + + /* Do not tear-down FSM */ + return 0; +} + +static struct osmo_fsm sap_fsm_def = { + .name = "sap_fsm", + .log_subsys = DSAP, + .states = sap_fsm_states, + .num_states = ARRAY_SIZE(sap_fsm_states), + .event_names = sap_msg_names, + .cleanup = &sap_fsm_tear_down, + .timer_cb = &sap_fsm_timer_cb, + .allstate_action = &sap_fsm_allstate_action, + .allstate_event_mask = 0 + | S(SAP_DISCONNECT_REQ) + | S(SAP_DISCONNECT_IND) + | S(SAP_STATUS_IND) + | S(SAP_ERROR_RESP), +}; + +/*! Allocate a new SAP state machine for a given ms. + * \param[in] ms MS instance associated with SAP FSM + * \returns 0 in case of success, negative in case of error + */ +int sap_fsm_alloc(struct osmocom_ms *ms) +{ + struct osmosap_entity *sap; + + sap = &ms->sap_entity; + OSMO_ASSERT(sap->fi == NULL); + + /* Register our FSM (if required) */ + if (!osmo_fsm_find_by_name(sap_fsm_def.name)) + OSMO_ASSERT(osmo_fsm_register(&sap_fsm_def) == 0); + + /* Allocate an instance using ms as talloc context */ + sap->fi = osmo_fsm_inst_alloc(&sap_fsm_def, ms, + ms, LOGL_DEBUG, ms->name); + if (!sap->fi) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate SAP FSM\n"); + return -ENOMEM; + } + + return 0; +} diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 7b8717d..0eac896 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -4,6 +4,7 @@ * (C) 2010,2018 by Harald Welte * (C) 2010 by Andreas Eversberg * (C) 2011 by Nico Golde + * (C) 2018 by Vadim Yanitskiy * * All Rights Reserved * @@ -23,487 +24,325 @@ * */ -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#define _GNU_SOURCE #include #include -#include -#include -#define GSM_SAP_LENGTH 300 -#define GSM_SAP_HEADROOM 32 +#include -static void sap_connect(struct osmocom_ms *ms); +#include +#include +#include +#include +#include +#include -static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) +#include +#include + +#include +#include +#include + +/*! Send ATR request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_atr_req(struct osmocom_ms *ms) { struct msgb *msg; - uint8_t *msgp; - uint8_t i, plen, padding = 0; + int rc; - msg = msgb_alloc(GSM_SAP_LENGTH, "osmosap"); - if (!msg) { - LOGP(DSAP, LOGL_ERROR, "Failed to allocate msg.\n"); - return NULL; + if (!ms->sap_entity.fi) { + LOGP(DSAP, LOGL_ERROR, "SAP interface is not connected\n"); + return -EAGAIN; } - /* BTSAP 5.1 */ - msgb_put_u8(msg, id); - msgb_put_u8(msg, num_params); - msgb_put_u16(msg, 0); - - for(i=0; isap_entity.sap_state == SAP_NOT_CONNECTED) - sap_connect(ms); - - if (ms->sap_wq.bfd.fd <= 0) - return -EINVAL; - - if (osmo_wqueue_enqueue(&ms->sap_wq, msg) != 0) { - LOGP(DSAP, LOGL_ERROR, "Failed to enqueue msg.\n"); - msgb_free(msg); - return -1; - } - - return 0; -} - -static int sap_parse_result(struct sap_param *param) -{ - if(param->id != SAP_RESULT_CODE){ - LOGP(DSAP, LOGL_INFO, "> Parameter id: %u no valid result type\n", param->id); - return -1; - } else { - LOGP(DSAP, LOGL_INFO, "> RESULT CODE: %s\n", - get_value_string(sap_result_names, param->value[0])); - } - -#if 0 - /* FIXME: ARRAY_SIZE() is not applicable to - * extern const struct value_string[] */ - if(param->value[0] > ARRAY_SIZE(sap_result_names)){ - return -1; - } -#endif - - return 0; -} - -static uint8_t *sap_get_param(uint8_t *data, struct sap_param *param) -{ - uint8_t *dptr = data; - uint8_t padlen; - - param->id = *dptr++; - /* skip reserved byte */ - dptr++; - param->len = *dptr << 8; - dptr++; - param->len |= *dptr++; - param->value = talloc_zero_size(NULL, param->len); - memcpy(param->value, dptr, param->len); - - /* skip parameter and padding and return pointer to next parameter */ - dptr += param->len; - if(param->len % 4){ - padlen = (4 - param->len % 4); - } else { - padlen = 0; - } - dptr += padlen; - - return dptr; -} - -static void sap_msg_free(struct sap_msg *msg) -{ - uint8_t i; - for(i=0; inum_params; i++){ - talloc_free(msg->params[i].value); - talloc_free(msg->params); - } - talloc_free(msg); -} - -static struct sap_msg *sap_parse_msg(uint8_t *data) -{ - struct sap_msg *msg = talloc_zero(NULL, struct sap_msg); - uint8_t *ptr = data; - uint8_t i; - - if(!msg){ - return NULL; - } - - msg->id = *ptr++; - LOGP(DSAP, LOGL_INFO, "> %s \n", get_value_string(sap_msg_names, msg->id)); - - msg->num_params = *ptr++; - /* skip two reserved null bytes, BTSAP 5.1 */ - ptr += 2; - - msg->params = talloc_zero_size(NULL, sizeof(struct sap_param) * msg->num_params); - - for(i=0; inum_params; i++){ - ptr = sap_get_param(ptr, &msg->params[i]); - LOGP(DSAP, LOGL_INFO, "> %s %s\n", - get_value_string(sap_param_names, msg->params[i].id), - osmo_hexdump(msg->params[i].value, msg->params[i].len)); - } - - return msg; -} - -static void sap_apdu_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct msgb *msg; - uint8_t *apdu; - msg = msgb_alloc(GSM_SAP_LENGTH, "osmosap"); - if(!msg){ - LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory.\n"); - return; - } - - apdu = msgb_put(msg, len); - memcpy(apdu, data, len); - - LOGP(DSAP, LOGL_DEBUG, "Forwarding APDU to SIM handler.\n"); - sim_apdu_resp(ms, msg); -} - -static int sap_adapt_msg_size(struct osmocom_ms *ms, struct sap_param *param) -{ - uint16_t size; - size = (param->value[0] << 8) | param->value[1]; - if(size != ms->sap_entity.max_msg_size && size > 0){ - LOGP(DSAP, LOGL_NOTICE, "Server can not handle max_msg_size, adapting.\n"); - ms->sap_entity.max_msg_size = size; - return -1; - } - return 0; -} - -static void sap_atr(struct osmocom_ms *ms) -{ - struct msgb *msg; - if(ms->sap_entity.sap_state != SAP_IDLE){ - LOGP(DSAP, LOGL_ERROR, "Attempting to send ATR request while not being idle.\n"); - return; - } - - msg = sap_create_msg(SAP_TRANSFER_ATR_REQ, 0, NULL); - if(!msg) - return; - - sap_send(ms, msg); - ms->sap_entity.sap_state = SAP_PROCESSING_ATR_REQUEST; -} - -static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct sap_msg *msg; - if(len > ms->sap_entity.max_msg_size){ - LOGP(DSAP, LOGL_ERROR, "Read more data than allowed by max_msg_size, ignoring.\n"); - return; - } - - msg = sap_parse_msg(data); - if (!msg) { - LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); - return; - } - - switch(msg->id){ - case SAP_CONNECT_RESP: - LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_conn_status_names, msg->params[0].value[0])); - if(msg->params[0].value[0] == 0){ - ms->sap_entity.sap_state = SAP_IDLE; - } - if(msg->num_params == 2 && msg->params[1].len == 2){ - if(sap_adapt_msg_size(ms, &msg->params[1]) < 0) { - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - } else { - sap_atr(ms); - } - } - break; - case SAP_DISCONNECT_RESP: - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - break; - case SAP_STATUS_IND: - LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_card_status_names, - msg->params[0].value[0])); - if(msg->params[0].value[0] != SAP_CARD_STATUS_RESET){ - /* TODO: handle case in which the card is not ready yet */ - } - break; - case SAP_TRANSFER_ATR_RESP: - if(ms->sap_entity.sap_state != SAP_PROCESSING_ATR_REQUEST){ - LOGP(DSAP, LOGL_ERROR, "got ATR resp in state: %u\n", ms->sap_entity.sap_state); - break; - } - if(msg->num_params >= 2){ - LOGP(DSAP, LOGL_INFO, "ATR: %s\n", osmo_hexdump(msg->params[1].value, msg->params[1].len)); - } - ms->sap_entity.sap_state = SAP_IDLE; - break; - case SAP_TRANSFER_APDU_RESP: - if(ms->sap_entity.sap_state != SAP_PROCESSING_APDU_REQUEST){ - LOGP(DSAP, LOGL_ERROR, "got APDU resp in state: %u\n", ms->sap_entity.sap_state); - break; - } - if(msg->num_params != 2){ - LOGP(DSAP, LOGL_ERROR, "wrong number of parameters %u in APDU response\n", msg->num_params); - break; - } - ms->sap_entity.sap_state = SAP_IDLE; - if(sap_parse_result(&msg->params[0]) == 0){ - /* back apdu resp to layer23 */ - sap_apdu_resp(ms, msg->params[1].value, msg->params[1].len); - LOGP(DSAP, LOGL_INFO, "sap_apdu_resp called, sending data back to layer23\n"); - } - break; - case SAP_ERROR_RESP: - if(ms->sap_entity.sap_state == SAP_CONNECTION_UNDER_NEGOTIATION){ - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - } else { - ms->sap_entity.sap_state = SAP_IDLE; - } - break; - default: - LOGP(DSAP, LOGL_ERROR, "got unknown or not implemented SAP msgid: %u\n", msg->id); - break; - } - - sap_msg_free(msg); -} - -static int sap_read(struct osmo_fd *fd) -{ - struct msgb *msg = NULL; - struct osmocom_ms *ms = (struct osmocom_ms *) fd->data; - uint8_t *sap_buffer; - ssize_t rc; - - sap_buffer = talloc_zero_size(NULL, ms->sap_entity.max_msg_size); - if(!sap_buffer){ - LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory\n"); + msg = sap_msgb_alloc(SAP_TRANSFER_ATR_REQ); + if (!msg) return -ENOMEM; - } - rc = read(fd->fd, sap_buffer, ms->sap_entity.max_msg_size - 1); - if (rc < 0) { - LOGP(DSAP, LOGL_ERROR,"SAP socket failed\n"); + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_TRANSFER_ATR_REQ, msg); + if (rc) { msgb_free(msg); - sap_close(ms); return rc; } - if(rc == 0) { - LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); - msgb_free(msg); - sap_close(ms); - return -ECONNREFUSED; - } - sap_buffer[rc] = 0; - LOGP(DSAP, LOGL_INFO, "Received %zd bytes: %s\n", rc, osmo_hexdump(sap_buffer, rc)); - - sap_parse_resp(ms, sap_buffer, rc); - - talloc_free(sap_buffer); - - if (ms->sap_entity.msg_handler){ - ms->sap_entity.msg_handler(msg, ms); - } return 0; } -static int sap_write(struct osmo_fd *fd, struct msgb *msg) +/*! Send APDU request to the Server. + * \param[in] ms MS instance with active SAP connection + * \param[in] apdu APDU to be send + * \param[in] apdu_len length of APDU + * \returns 0 in case of success, negative in case of error + */ +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *apdu, uint16_t apdu_len) +{ + struct msgb *msg; + int rc; + + if (!ms->sap_entity.fi) { + LOGP(DSAP, LOGL_ERROR, "SAP interface is not connected\n"); + return -EAGAIN; + } + + msg = sap_msgb_alloc(SAP_TRANSFER_APDU_REQ); + if (!msg) + return -ENOMEM; + + sap_msgb_add_param(msg, SAP_COMMAND_APDU, apdu_len, apdu); + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_TRANSFER_APDU_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +/*! Send (SIM) reset request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_reset_req(struct osmocom_ms *ms) +{ + struct msgb *msg; + int rc; + + if (!ms->sap_entity.fi) { + LOGP(DSAP, LOGL_ERROR, "SAP interface is not connected\n"); + return -EAGAIN; + } + + msg = sap_msgb_alloc(SAP_RESET_SIM_REQ); + if (!msg) + return -ENOMEM; + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_RESET_SIM_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +/*! Send (SIM) power on request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_poweron_req(struct osmocom_ms *ms) +{ + struct msgb *msg; + int rc; + + if (!ms->sap_entity.fi) { + LOGP(DSAP, LOGL_ERROR, "SAP interface is not connected\n"); + return -EAGAIN; + } + + msg = sap_msgb_alloc(SAP_POWER_SIM_ON_REQ); + if (!msg) + return -ENOMEM; + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_POWER_SIM_ON_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +/*! Send (SIM) power off request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_poweroff_req(struct osmocom_ms *ms) +{ + struct msgb *msg; + int rc; + + if (!ms->sap_entity.fi) { + LOGP(DSAP, LOGL_ERROR, "SAP interface is not connected\n"); + return -EAGAIN; + } + + msg = sap_msgb_alloc(SAP_POWER_SIM_OFF_REQ); + if (!msg) + return -ENOMEM; + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_POWER_SIM_OFF_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +static int sap_read_cb(struct osmo_fd *fd) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fd->data; + struct osmosap_entity *sap = &ms->sap_entity; + uint8_t buf[GSM_SAP_LENGTH]; + struct msgb *msg; + ssize_t rc; + + /* Prevent buffer overflow */ + OSMO_ASSERT(sap->max_msg_size <= GSM_SAP_LENGTH); + + rc = read(fd->fd, buf, sap->max_msg_size); + if (rc < 0) { + LOGP(DSAP, LOGL_ERROR, "SAP socket failed\n"); + rc = -EIO; + goto conn_error; + } + if (rc == 0) { + LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); + rc = -ECONNREFUSED; + goto conn_error; + } + + LOGP(DSAP, LOGL_DEBUG, "RX SAP message '%s' (len=%zd): %s\n", + get_value_string(sap_msg_names, buf[0]), + rc, osmo_hexdump(buf, rc)); + + /* Parse received SAP message and allocate a new msgb */ + msg = sap_msg_parse(buf, rc, sap->max_msg_size); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); + return -EINVAL; + } + + /* Pass parsed message to our FSM using message ID as event */ + rc = osmo_fsm_inst_dispatch(sap->fi, msg->data[0], msg->data); + if (rc) { + msgb_free(msg); + return rc; + } + + /* Pass to (optional) SAP message handler */ + if (sap->sap_msg_cb) + sap->sap_msg_cb(ms, msg); + else + msgb_free(msg); + + return 0; + +conn_error: + /* Immediately tear-down FSM */ + osmo_fsm_inst_state_chg(sap->fi, SAP_STATE_NOT_CONNECTED, 0, 0); + return rc; +} + +static int sap_write_cb(struct osmo_fd *fd, struct msgb *msg) { ssize_t rc; if (fd->fd <= 0) return -EINVAL; - LOGP(DSAP, LOGL_INFO, "< %s\n", osmo_hexdump(msg->data, msg->len)); rc = write(fd->fd, msg->data, msg->len); if (rc != msg->len) { - LOGP(DSAP, LOGL_ERROR, "Failed to write data: rc: %zd\n", rc); + LOGP(DSAP, LOGL_ERROR, "Failed to write data\n"); return rc; } + LOGP(DSAP, LOGL_DEBUG, "TX SAP message '%s' (len=%u): %s\n", + get_value_string(sap_msg_names, msg->data[0]), + msg->len, osmo_hexdump(msg->data, msg->len)); + return 0; } -static void sap_connect(struct osmocom_ms *ms) -{ - uint8_t buffer[3]; - struct msgb *msg; - uint16_t size = ms->sap_entity.max_msg_size; - struct sap_param params[1]; - - params[0].id = SAP_MAX_MSG_SIZE; - params[0].len = 2; - - if(ms->sap_entity.sap_state != SAP_NOT_CONNECTED) { - LOGP(DSAP, LOGL_ERROR, "Attempting to connect while there is an active connection.\n"); - return; - } - - buffer[0] = (size >> 8) & 0xFF; - buffer[1] = size & 0xFF; - buffer[2] = 0; - params[0].value = buffer; - - msg = sap_create_msg(SAP_CONNECT_REQ, 1, params); - if(!msg) - return; - - sap_send(ms, msg); - - ms->sap_entity.sap_state = SAP_CONNECTION_UNDER_NEGOTIATION; -} - -static void sap_disconnect(struct osmocom_ms *ms) -{ - struct msgb *msg; - if(ms->sap_entity.sap_state != SAP_NOT_CONNECTED && ms->sap_entity.sap_state != SAP_CONNECTION_UNDER_NEGOTIATION){ - LOGP(DSAP, LOGL_ERROR, "Attempting to disconnect while no active connection.\n"); - return; - } - - msg = sap_create_msg(SAP_DISCONNECT_REQ, 0, NULL); - if(!msg) - return; - - sap_send(ms, msg); - - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; -} - -static int sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct msgb *msg; - struct sap_param params[1]; - int rc; - - params[0].id = SAP_COMMAND_APDU; - params[0].len = len; - params[0].value = data; - - if(ms->sap_entity.sap_state != SAP_IDLE){ - LOGP(DSAP, LOGL_ERROR, "Attempting to send APDU request while not being idle.\n"); - return -EIO; - } - - msg = sap_create_msg(SAP_TRANSFER_APDU_REQ, 1, params); - if(!msg) - return -ENOMEM; - - rc = sap_send(ms, msg); - if (rc) - return rc; - - ms->sap_entity.sap_state = SAP_PROCESSING_APDU_REQUEST; - - return 0; -} - +/*! Establishes SAP connection to the Server, + * allocates SAP FSM, and triggers connection procedure. + * \param[in] ms MS instance with configured SAP socket path + * \returns 0 in case of success, negative in case of error + */ int sap_open(struct osmocom_ms *ms) { int rc; + LOGP(DSAP, LOGL_INFO, "Establishing SAP connection " + "(using socket '%s')\n", ms->settings.sap_socket_path); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", ms->settings.sap_socket_path, strerror(-rc)); - ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } osmo_wqueue_init(&ms->sap_wq, 100); ms->sap_wq.bfd.data = ms; - ms->sap_wq.read_cb = sap_read; - ms->sap_wq.write_cb = sap_write; + ms->sap_wq.read_cb = &sap_read_cb; + ms->sap_wq.write_cb = &sap_write_cb; - sap_connect(ms); + /* Allocate a SAP FSM for a given ms */ + rc = sap_fsm_alloc(ms); + if (rc) { + _sap_close_sock(ms); + return rc; + } - return 0; + /* Initiate SAP connection with Server */ + LOGP(DSAP, LOGL_DEBUG, "Connecting to the Server...\n"); + return osmo_fsm_inst_state_chg(ms->sap_entity.fi, SAP_STATE_CONNECTING, + SAP_FSM_CONN_EST_TIMEOUT, SAP_FSM_CONN_EST_T); } +/*! Closes SAP connection with the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ int sap_close(struct osmocom_ms *ms) { + if (ms->sap_entity.fi == NULL) { + LOGP(DSAP, LOGL_NOTICE, "No active SAP connection (no FSM)\n"); + return -EINVAL; + } + + LOGP(DSAP, LOGL_INFO, "Closing SAP connection\n"); + return osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_DISCONNECT_REQ, NULL); +} + +/*! Low-level function for closing SAP (socket) connection. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int _sap_close_sock(struct osmocom_ms *ms) +{ if (ms->sap_wq.bfd.fd <= 0) return -EINVAL; - sap_disconnect(ms); close(ms->sap_wq.bfd.fd); ms->sap_wq.bfd.fd = -1; + osmo_fd_unregister(&ms->sap_wq.bfd); osmo_wqueue_clear(&ms->sap_wq); return 0; } -/* same signature as in L1CTL, so it can be called from sim.c */ -int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) -{ - //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , - // osmo_hexdump(data, length)); - return sap_apdu(ms, data, length); -} - -/* register message handler for messages that are sent from L2->L3 */ -int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb) -{ - ms->sap_entity.msg_handler = cb; - - return 0; -} - -/* init */ -int sap_init(struct osmocom_ms *ms) +/*! Init SAP client state for a given MS. */ +void sap_init(struct osmocom_ms *ms) { struct osmosap_entity *sap = &ms->sap_entity; LOGP(DSAP, LOGL_INFO, "init SAP client\n"); - sap->sap_state = SAP_NOT_CONNECTED; + + /* Default MaxMsgSize (to be negotiated) */ sap->max_msg_size = GSM_SAP_LENGTH; - - return 0; + /* SIM card status is not known yet */ + sap->card_status = SAP_CARD_STATUS_NOT_ACC; } - diff --git a/src/host/layer23/src/common/sap_proto.c b/src/host/layer23/src/common/sap_proto.c index ef4cb35..c3d202f 100644 --- a/src/host/layer23/src/common/sap_proto.c +++ b/src/host/layer23/src/common/sap_proto.c @@ -23,9 +23,19 @@ * */ +#include +#include +#include +#include + +#include + +#include #include +#include #include +#include /* Table 5.1: Message Overview */ const struct value_string sap_msg_names[] = { @@ -102,3 +112,211 @@ { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, { 0, NULL } }; + +/*! Allocate a new message buffer with SAP message header. + * \param[in] msg_id SAP message identifier + * \returns message buffer in case of success, NULL otherwise + */ +struct msgb *sap_msgb_alloc(uint8_t msg_id) +{ + struct sap_message *sap_msg; + struct msgb *msg; + + msg = msgb_alloc(GSM_SAP_LENGTH, "sap_msg"); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate SAP message\n"); + return NULL; + } + + sap_msg = (struct sap_message *) msgb_put(msg, sizeof(*sap_msg)); + sap_msg->msg_id = msg_id; + + return msg; +} + +/*! Add a new parameter to a given SAP message buffer. + * Padding is added automatically, SAP message header + * (number of parameters) is also updated automatically. + * \param[in] msg SAP message buffer + * \param[in] param_type parameter type (see sap_param_type enum) + * \param[in] param_len parameter length + * \param[in] param_value pointer to parameter value + */ +void sap_msgb_add_param(struct msgb *msg, + enum sap_param_type param_type, + uint16_t param_len, const uint8_t *param_value) +{ + struct sap_message *sap_msg; + struct sap_param *param; + uint8_t padding; + uint8_t *buf; + + /* Update number of parameters */ + sap_msg = (struct sap_message *) msg->data; + sap_msg->num_params++; + + /* Allocate a new parameter */ + param = (struct sap_param *) msgb_put(msg, sizeof(*param)); + param->param_id = param_type; + param->reserved[0] = 0x00; + + /* Encode parameter value and length */ + param->length = htons(param_len); + buf = msgb_put(msg, param_len); + memcpy(buf, param_value, param_len); + + /* Optional padding */ + padding = 4 - (param_len % 4); + if (padding) { + buf = msgb_put(msg, padding); + memset(buf, 0x00, padding); + } +} + +/*! Attempt to find a given parameter in a given SAP message. + * \param[in] sap_msg pointer to SAP message header + * \param[in] param_type parameter type (see sap_param_type enum) + * \param[out] param_len parameter length (if found) + * \returns pointer to a given parameter withing the message, NULL otherwise + */ +struct sap_param *sap_get_param(const struct sap_message *sap_msg, + enum sap_param_type param_type, uint16_t *param_len) +{ + const uint8_t *ptr = sap_msg->payload; + struct sap_param *param = NULL; + uint16_t plen; + int i; + + /* We assume that message is parsed already, + * so we don't check for buffer overflows */ + for (i = 0; i < sap_msg->num_params; i++) { + /* Parse one parameter */ + param = (struct sap_param *) ptr; + plen = ntohs(param->length); + + /* Match against a given ID */ + if (param->param_id == param_type) { + if (param_len != NULL) + *param_len = plen; + return param; + } + + /* Shift pointer to the next parameter */ + ptr += sizeof(*param) + plen; + /* Optional padding */ + ptr += 4 - (plen % 4); + } + + return NULL; +} + +/*! Parse SAP message from a given buffer into a new message buffer. + * \param[in] buf pointer to a buffer with to be parsed message + * \param[in] buf_len length of the buffer + * \param[in] max_msg_size max (negotiated) message size + * \returns new message buffer with parsed message, NULL otherwise + */ +struct msgb *sap_msg_parse(const uint8_t *buf, size_t buf_len, int max_msg_size) +{ + const struct sap_message *sap_msg; + const uint8_t *ptr; + struct msgb *msg; + size_t len; + int i; + + /* Message header is mandatory */ + if (buf_len < sizeof(*sap_msg)) { + LOGP(DSAP, LOGL_ERROR, "Missing SAP message header\n"); + return NULL; + } + + /* MaxMsgSize limitation (optional) */ + if (max_msg_size > 0 && buf_len > max_msg_size) { + LOGP(DSAP, LOGL_ERROR, "Buffer (len=%zu) is bigger than " + "given MaxMsgSize=%d\n", buf_len, max_msg_size); + return NULL; + } + + sap_msg = (const struct sap_message *) buf; + len = buf_len - sizeof(*sap_msg); + ptr = sap_msg->payload; + + LOGP(DSAP, LOGL_DEBUG, "SAP message '%s' has %u parameter(s)\n", + get_value_string(sap_msg_names, sap_msg->msg_id), + sap_msg->num_params); + + for (i = 0; i < sap_msg->num_params; i++) { + struct sap_param *param; + uint16_t param_len; + uint16_t offset; + + /* Prevent buffer overflow */ + if (len < sizeof(*param)) + goto malformed; + + /* Parse one parameter */ + param = (struct sap_param *) ptr; + param_len = ntohs(param->length); + + LOGP(DSAP, LOGL_DEBUG, "SAP parameter '%s' (len=%u): %s\n", + get_value_string(sap_param_names, param->param_id), + param_len, osmo_hexdump(param->value, param_len)); + + /* Calculate relative offset */ + offset = sizeof(*param) + param_len; + offset += 4 - (param_len % 4); /* Optional padding */ + + /* Prevent buffer overflow */ + if (offset > len) + goto malformed; + + len -= offset; + ptr += offset; + } + + /* Allocate a new message buffer */ + msg = msgb_alloc(GSM_SAP_LENGTH, "sap_msg"); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate SAP message\n"); + return NULL; + } + + msg->data = msgb_put(msg, buf_len); + memcpy(msg->data, buf, buf_len); + + return msg; + +malformed: + LOGP(DSAP, LOGL_ERROR, "Malformed SAP message " + "(parameter %i/%u)\n", i + 1, sap_msg->num_params); + return NULL; +} + +/*! Parse ResultCode from a given SAP message. + * \param[in] sap_msg pointer to SAP message header + * \returns parsed ResultCode (if found), negative otherwise + */ +int sap_check_result_code(const struct sap_message *sap_msg) +{ + struct sap_param *param; + uint16_t param_len; + uint8_t res_code; + + param = sap_get_param(sap_msg, SAP_RESULT_CODE, ¶m_len); + if (!param || param_len != sizeof(res_code)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_RESULT_CODE)); + return -EINVAL; + } + + res_code = param->value[0]; + if (res_code >= ARRAY_SIZE(sap_result_names)) { + LOGP(DSAP, LOGL_ERROR, "Unknown SAP ResultCode=0x%02x\n", res_code); + return -EINVAL; + } + + LOGP(DSAP, LOGL_DEBUG, "SAP ResultCode is '%s'\n", + get_value_string(sap_result_names, res_code)); + + return res_code; +} diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 27e1d9b..d7c65f0 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -202,6 +202,9 @@ /* init SAP client before SIM card starts up */ sap_init(ms); + /* SAP response call-back */ + ms->sap_entity.sap_rsp_cb = &gsm_subscr_sap_rsp_cb; + gsm_sim_init(ms); gsm48_cc_init(ms); gsm480_ss_init(ms); diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index b2be554..e1e6331 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -1306,3 +1307,51 @@ { return sap_close(ms); } + +int gsm_subscr_sap_rsp_cb(struct osmocom_ms *ms, int res_code, + uint8_t res_type, uint16_t param_len, const uint8_t *param_val) +{ + struct msgb *msg; + int rc = 0; + + /* Response parameter is not encoded in case of error */ + if (res_code != SAP_RESULT_OK_REQ_PROC_CORR) + goto ignore_rsp; + + switch (res_type) { + case SAP_TRANSFER_APDU_RESP: + /* Prevent NULL-pointer dereference */ + if (!param_len || !param_val) { + rc = -EINVAL; + goto ignore_rsp; + } + + /* FIXME: why do we use this length? */ + msg = msgb_alloc(GSM_SAP_LENGTH, "sap_apdu"); + if (!msg) { + rc = -ENOMEM; + goto ignore_rsp; + } + + msg->data = msgb_put(msg, param_len); + memcpy(msg->data, param_val, param_len); + + return sim_apdu_resp(ms, msg); + + case SAP_TRANSFER_ATR_RESP: + /* TODO: don't read SIM again (if already) */ + LOGP(DSAP, LOGL_INFO, "SAP card is ready, start reading...\n"); + return subscr_sim_request(ms); + + default: + rc = -ENOTSUP; + goto ignore_rsp; + } + + return 0; + +ignore_rsp: + LOGP(DSAP, LOGL_NOTICE, "Ignored SAP response '%s' (code=%d)\n", + get_value_string(sap_msg_names, res_type), res_code); + return rc; +} -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 22:46:55 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 22:46:55 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#5). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 649 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/5 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 22:51:42 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 22:51:42 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 Jan 2019 22:51:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 22:55:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 22:55:50 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#6). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 649 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/6 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:00:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 23:00:22 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#7). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 649 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/7 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:01:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 23:01:14 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 7: pfsh, jenkins' gcc complains that a const struct isn't constant, then it'll have to be stupid #defines I guess. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 14 Jan 2019 23:01:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:03:44 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 Jan 2019 23:03:44 +0000 Subject: Change in libosmocore[master]: comments: update/fix three 3GPP spec references In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12559 ) Change subject: comments: update/fix three 3GPP spec references ...................................................................... comments: update/fix three 3GPP spec references Change-Id: I3ab94f362866d752099000afe62922288b3dd118 --- M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_08_08.h 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 86b5f6f..234fa79 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1821,7 +1821,7 @@ GSM48_CAUSE_LOC_NET_BEYOND = 0x0a, }; -/* Section 10.5.2.31 RR Cause / Table 10.5.70 */ +/* 3GPP TS 44.018 10.5.2.31 RR Cause / Table 10.5.70 */ enum gsm48_rr_cause { GSM48_RR_CAUSE_NORMAL = 0x00, GSM48_RR_CAUSE_ABNORMAL_UNSPEC = 0x01, diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 2ec0aa7..86c5b01 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -238,7 +238,7 @@ extern const struct value_string *gsm48_gmm_cause_names; -/* Chapter 10.4.6.6 / Table 10.5.157 */ +/* 3GPP TS 24.008 10.5.6.6 / Table 10.5.157 */ enum gsm48_gsm_cause { GSM_CAUSE_OPER_DET_BARR = 0x08, GSM_CAUSE_MBMS_CAP_INSUF = 0x18, diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 5e93abe..33f3a6f 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -322,7 +322,7 @@ GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION_EXTENDED_E_ARFCNS = 0x11, /*< 3.2.3.18 */ }; -/* GSM 08.08 3.2.2.5 Cause */ +/* 3GPP TS 48.008 3.2.2.5 Cause */ enum gsm0808_cause { GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE = 0, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE = 1, -- To view, visit https://gerrit.osmocom.org/12559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3ab94f362866d752099000afe62922288b3dd118 Gerrit-Change-Number: 12559 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:42:41 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:42:41 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: Code-Review-1 (13 comments) https://gerrit.osmocom.org/#/c/12556/9/tests/trans/Makefile.am File tests/trans/Makefile.am: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/Makefile.am at 4 PS9, Line 4: -I$(top_srcdir)/src/libmsc Looks useless to me. The only header in there is smpp_smsc.h (which should be also moved to 'include' in some separate patch). https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 34 PS9, Line 34: ref_id This name looks a bit confusing. What is the meaning of 'ref_id'? Reference ID? What is the reference then? As far as I can see, you're always passing transaction ID, so let's name it 'trans_id' then? https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 51 PS9, Line 51: trans_assign_trans_id You're always calling it with ti_flag = 0. I would really like this test case to cover both '0'B and '1'B cases. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 68 PS9, Line 68: base_callref What is the point of passing callref? Why not to use a static counter? https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 79 PS9, Line 79: return I would rather use OSMO_ASSERT here. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 83 PS9, Line 83: return ... and here. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 88 PS9, Line 88: return Let's just imagine that trans_has_conn() returns X != 0. This test would just fail, and one would have to investigate *why*, most likely by adding debug printf()s or asserts. This is why I also recommend to use OSMO_ASSERT here too. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 92 PS9, Line 92: return ... and here. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 94 PS9, Line 94: vlr_subscr_name You say 'connection', but print subscriber name? o_O https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref Hmm, allocating multiple transactions with same callref? It's a known issue (at least to me), that trans_alloc() would happily allocate a transaction with duplicate callref. And I expected that this test case would disclose this problem... https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 151 PS9, Line 151: \n\tCleared %u transactions. Let's split up this message into 2 printf() calls. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.err File tests/trans/trans_test.err: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.err at 1 PS9, Line 1: Unknown RAN type Cosmetic: you could use any 'known' RAN type to avoid this. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.err at 2 PS9, Line 2: Also, I expected to see debug messages here, like: (ti %02x sub %s callref %x) New transaction transaction.c (for some reason) is using DCC, so you could set its level to DEBUG. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 23:42:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:46:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 23:46:34 +0000 Subject: Change in libosmocore[master]: LCLS: expand enc/dec tests In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12558 ) Change subject: LCLS: expand enc/dec tests ...................................................................... LCLS: expand enc/dec tests Change-Id: I8ed87f26216104d34c7bd11c1527b203843760a2 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 40e2b87..b3cab50 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -720,6 +720,18 @@ abort(); } + if (lcls_out.config != lcls_in.config) { + printf("LCLS Config parsed wrong: %s != %s\n", + gsm0808_lcls_config_name(lcls_out.config), gsm0808_lcls_config_name(lcls_in.config)); + abort(); + } + + if (lcls_out.control != lcls_in.control) { + printf("LCLS Control parsed wrong: %s != %s\n", + gsm0808_lcls_control_name(lcls_out.control), gsm0808_lcls_control_name(lcls_in.control)); + abort(); + } + if (lcls_out.gcr->net_len != g.net_len) { printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); abort(); -- To view, visit https://gerrit.osmocom.org/12558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8ed87f26216104d34c7bd11c1527b203843760a2 Gerrit-Change-Number: 12558 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:46:35 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 23:46:35 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... LCLS: add GCR comparison helper Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 --- M include/osmocom/gsm/gsm29205.h M src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 4 files changed, 27 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index 0c3c153..f93e34a 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -39,3 +39,4 @@ uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); +bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); diff --git a/src/gsm/gsm29205.c b/src/gsm/gsm29205.c index 0ef29b7..0d34468 100644 --- a/src/gsm/gsm29205.c +++ b/src/gsm/gsm29205.c @@ -91,3 +91,24 @@ return parsed + 5; } + +/*! Compare two GCR structs. + * \param[in] gcr1 pointer to the GCR struct + * \param[in] gcr2 pointer to the GCR struct + * \returns true if GCRs are equal, false otherwise */ +bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2) +{ + if (gcr1->net_len != gcr2->net_len) + return false; + + if (gcr1->node != gcr2->node) + return false; + + if (memcmp(gcr1->cr, gcr2->cr, 5) != 0) + return false; + + if (memcmp(gcr1->net, gcr2->net, gcr2->net_len) != 0) + return false; + + return true; +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 60ce5d1..f9e9b8b 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -240,6 +240,7 @@ osmo_enc_gcr; osmo_dec_gcr; +osmo_gcr_eq; gsm0858_rsl_ul_meas_enc; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index b3cab50..546a487 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -732,25 +732,10 @@ abort(); } - if (lcls_out.gcr->net_len != g.net_len) { - printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); - abort(); - } - - if (lcls_out.gcr->node != g.node) { - printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out.gcr->node, g.node); - abort(); - } - - if (memcmp(lcls_out.gcr->net, g.net, g.net_len) != 0) { - printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->net, lcls_out.gcr->net_len)); - abort(); - } - - if (memcmp(lcls_out.gcr->cr, g.cr, 5) != 0) { - printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->cr, 5)); - abort(); - } + if (!osmo_gcr_eq(lcls_out.gcr, lcls_in.gcr)) { + printf("GCR parsed wrong.\n"); + abort(); + } printf("\tdecoded %d bytes: %s\n", rc, rc == len ? "OK" : "FAIL"); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:47:20 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:47:20 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG at 7 PS2, Line 7: add GCR comparison helper Where this helper is going to be used? Please add a few lines of commit description. -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 23:47:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:51:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 14 Jan 2019 23:51:20 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 3: (1 comment) In fact, it's already used in this patch in the test. https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG at 7 PS2, Line 7: add GCR comparison helper > Where this helper is going to be used? [?] Wow, your reply came just 1 minute after I merged it - excellent timing :) The GCR comparison helper will be used to compare GCRs. -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 23:51:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:51:39 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:51:39 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... Patch Set 3: Code-Review+2 As (I hope) all warnings were addressed in I67b1e850094cf8e279777c45c7544886be42a009, I am merging this patch. -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 23:51:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:31 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:31 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move init code to __init__() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12545 ) Change subject: trx_toolkit/fake_trx.py: move init code to __init__() ...................................................................... trx_toolkit/fake_trx.py: move init code to __init__() There should be no code in run() that does initialization, __init__() is the best place for this. This change allows to import the Application class from fake_trx.py, and run it from script (e.g. for testing). Change-Id: I84969630348a189d237cc98354e568421839a37b --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 30 insertions(+), 30 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 0bf9266..0bed29d 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -275,6 +275,32 @@ # List of all transceivers self.trx_list = TRXList() + # Init shared clock generator + self.clck_gen = CLCKGen([]) + + # Power measurement emulation + # Noise: -120 .. -105 + # BTS: -75 .. -50 + self.fake_pm = FakePM(-120, -105, -75, -50) + self.fake_pm.trx_list = self.trx_list + + # Init TRX instance for BTS + self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) + + # Init TRX instance for BB + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + + # Additional transceivers (optional) + if self.argv.trx_list is not None: + for trx_def in self.argv.trx_list: + (addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx) + + # Burst forwarding between transceivers + self.burst_fwd = BurstForwarder(self.trx_list) + + log.info("Init complete") + def append_trx(self, remote_addr, base_port): trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, clck_gen = self.clck_gen, pwr_meas = self.fake_pm) @@ -301,42 +327,16 @@ trx_parent.child_trx_list.add_trx(trx_child) def run(self): - # Init shared clock generator - self.clck_gen = CLCKGen([]) - - # Power measurement emulation - # Noise: -120 .. -105 - # BTS: -75 .. -50 - self.fake_pm = FakePM(-120, -105, -75, -50) - self.fake_pm.trx_list = self.trx_list - - # Init TRX instance for BTS - self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) - - # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) - - # Additional transceivers (optional) - if self.argv.trx_list is not None: - for trx_def in self.argv.trx_list: - (addr, port, idx) = trx_def - self.append_child_trx(addr, port, idx) - - # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder(self.trx_list) - # Compose list of to be monitored sockets - self.sock_list = [] + sock_list = [] for trx in self.trx_list: - self.sock_list.append(trx.ctrl_if.sock) - self.sock_list.append(trx.data_if.sock) - - log.info("Init complete") + sock_list.append(trx.ctrl_if.sock) + sock_list.append(trx.data_if.sock) # Enter main loop while True: # Wait until we get any data on any socket - r_event, _, _ = select.select(self.sock_list, [], []) + r_event, _, _ = select.select(sock_list, [], []) # Iterate over all transceivers for trx in self.trx_list: -- To view, visit https://gerrit.osmocom.org/12545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b Gerrit-Change-Number: 12545 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12546 ) Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages ...................................................................... trx_toolkit/fake_trx.py: enrich TRX logging messages Since fake_trx.py can handle multiple transceivers, it makes sense to print some info in logging messages about transceivers they belong to. This acvieved by defining __str__() for Transceiver. Some examples: [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver... [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 3 files changed, 41 insertions(+), 30 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 83d55db..0d4935d 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -59,19 +59,19 @@ # Power control if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") + log.debug("(%s) Recv POWERON CMD" % self.trx) # Ensure transceiver isn't working if self.trx.running: - log.error("Transceiver already started") + log.error("(%s) Transceiver already started" % self.trx) return -1 # Ensure RX / TX freq. are set if (self.trx.rx_freq is None) or (self.trx.tx_freq is None): - log.error("RX / TX freq. are not set") + log.error("(%s) RX / TX freq. are not set" % self.trx) return -1 - log.info("Starting transceiver...") + log.info("(%s) Starting transceiver..." % self.trx) self.trx.running = True # Notify transceiver about that @@ -80,9 +80,9 @@ return 0 elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") + log.debug("(%s) Recv POWEROFF cmd" % self.trx) - log.info("Stopping transceiver...") + log.info("(%s) Stopping transceiver..." % self.trx) self.trx.running = False # Notify transceiver about that @@ -92,26 +92,27 @@ # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") + log.debug("(%s) Recv RXTUNE cmd" % self.trx) # TODO: check freq range self.trx.rx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") + log.debug("(%s) Recv TXTUNE cmd" % self.trx) # TODO: check freq range self.trx.tx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "SETSLOT", 2): - log.debug("Recv SETSLOT cmd") + log.debug("(%s) Recv SETSLOT cmd" % self.trx) # Obtain TS index ts = int(request[1]) if ts not in range(0, 8): - log.error("TS index should be in range: 0..7") + log.error("(%s) TS index should be in " + "range: 0..7" % self.trx) return -1 # Parse TS type @@ -132,13 +133,13 @@ # Power measurement if self.verify_cmd(request, "MEASURE", 1): - log.debug("Recv MEASURE cmd") + log.debug("(%s) Recv MEASURE cmd" % self.trx) # Power Measurement interface is optional # for Transceiver, thus may be uninitialized if self.trx.pwr_meas is None: - log.error("Power Measurement interface " - "is not initialized => rejecting command") + log.error("(%s) Power Measurement interface is not " + "initialized => rejecting command" % self.trx) return -1 # TODO: check freq range @@ -151,5 +152,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) + log.debug("(%s) Ignore CMD %s" % (self.trx, request[0])) return 0 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 0bed29d..294a819 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -145,8 +145,8 @@ return False if msg.fn % self.burst_drop_period == 0: - log.info("Simulation: dropping burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_drop_period)) + log.info("(%s) Simulation: dropping burst (fn=%u %% %u == 0)" + % (self, msg.fn, self.burst_drop_period)) self.burst_drop_amount -= 1 return True @@ -176,7 +176,7 @@ # Timing Advance # Syntax: CMD SETTA if self.ctrl_if.verify_cmd(request, "SETTA", 1): - log.debug("Recv SETTA cmd") + log.debug("(%s) Recv SETTA cmd" % self) # Store indicated value self.ta = int(request[1]) @@ -185,7 +185,7 @@ # Timing of Arrival simulation # Absolute form: CMD FAKE_TOA elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") + log.debug("(%s) Recv FAKE_TOA cmd" % self) # Parse and apply both base and threshold self.toa256_base = int(request[1]) @@ -195,7 +195,7 @@ # Timing of Arrival simulation # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") + log.debug("(%s) Recv FAKE_TOA cmd" % self) # Parse and apply delta self.toa256_base += int(request[1]) @@ -204,7 +204,7 @@ # RSSI simulation # Absolute form: CMD FAKE_RSSI elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") + log.debug("(%s) Recv FAKE_RSSI cmd" % self) # Parse and apply both base and threshold self.rssi_base = int(request[1]) @@ -214,7 +214,7 @@ # RSSI simulation # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") + log.debug("(%s) Recv FAKE_RSSI cmd" % self) # Parse and apply delta self.rssi_base += int(request[1]) @@ -224,12 +224,13 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") + log.debug("(%s) Recv FAKE_DROP cmd" % self) # Parse / validate amount of bursts num = int(request[1]) if num < 0: - log.error("FAKE_DROP amount shall not be negative") + log.error("(%s) FAKE_DROP amount shall not " + "be negative" % self) return -1 self.burst_drop_amount = num @@ -240,18 +241,20 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") + log.debug("(%s) Recv FAKE_DROP cmd" % self) # Parse / validate amount of bursts num = int(request[1]) if num < 0: - log.error("FAKE_DROP amount shall not be negative") + log.error("(%s) FAKE_DROP amount shall not " + "be negative" % self) return -1 # Parse / validate period period = int(request[2]) if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") + log.error("(%s) FAKE_DROP period shall " + "be greater than zero" % self) return -1 self.burst_drop_amount = num diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 57ca531..4eb210b 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -135,6 +135,13 @@ # List of child transceivers self.child_trx_list = TRXList() + def __str__(self): + desc = "%s:%d" % (self.remote_addr, self.base_port) + if self.child_idx > 0: + desc += "/%d" % self.child_idx + + return desc + # To be overwritten if required, # no custom command handlers by default def ctrl_cmd_handler(self, request): @@ -173,14 +180,14 @@ # Make sure that transceiver is configured and running if not self.running: - log.warning("RX DATA message (%s), but transceiver " - "is not running => dropping..." % msg.desc_hdr()) + log.warning("(%s) RX DATA message (%s), but transceiver " + "is not running => dropping..." % (self, msg.desc_hdr())) return None # Make sure that indicated timeslot is configured if msg.tn not in self.ts_list: - log.warning("RX DATA message (%s), but timeslot " - "is not configured => dropping..." % msg.desc_hdr()) + log.warning("(%s) RX DATA message (%s), but timeslot is not " + "configured => dropping..." % (self, msg.desc_hdr())) return None return msg -- To view, visit https://gerrit.osmocom.org/12546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624 Gerrit-Change-Number: 12546 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/{ctrl, data}_if.py: add init log message In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12547 ) Change subject: trx_toolkit/{ctrl,data}_if.py: add init log message ...................................................................... trx_toolkit/{ctrl,data}_if.py: add init log message Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_if.py 3 files changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified Objections: Max: I would prefer this is not merged as is diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 45bfa2b..a1c19f0 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -27,6 +27,10 @@ from udp_link import UDPLink class CTRLInterface(UDPLink): + def __init__(self, *udp_link_args): + UDPLink.__init__(self, *udp_link_args) + log.debug("Init CTRL interface (%s)" % self.desc_link()) + def handle_rx(self): # Read data from socket data, remote = self.sock.recvfrom(128) diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 0d4935d..26a844f 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -46,7 +46,6 @@ def __init__(self, trx, *udp_link_args): CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface (%s)" % self.desc_link()) # Link with Transceiver instance we belong to self.trx = trx diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index a773c04..b1ba1e5 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -28,6 +28,10 @@ from data_msg import * class DATAInterface(UDPLink): + def __init__(self, *udp_link_args): + UDPLink.__init__(self, *udp_link_args) + log.debug("Init DATA interface (%s)" % self.desc_link()) + def recv_raw_data(self): data, _ = self.sock.recvfrom(512) return data -- To view, visit https://gerrit.osmocom.org/12547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a2caf6999ed4f33df76328e48ff5076d166d9fe Gerrit-Change-Number: 12547 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:33 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:33 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12560 ) Change subject: trx_toolkit: use 'TRXC' and 'TRXD' in logging messages ...................................................................... trx_toolkit: use 'TRXC' and 'TRXD' in logging messages One can confuse TRX control interface with libosmoctrl's one. TRX toolkit is not using libosmoctrl, and will never do. But, in order to avoid this confusion, and potential confusion of DATA interface, let's call them 'TRXC' and 'TRXD' in logging. Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 --- M src/target/trx_toolkit/README M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/transceiver.py 5 files changed, 12 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/README b/src/target/trx_toolkit/README index 91b6099..09800b0 100644 --- a/src/target/trx_toolkit/README +++ b/src/target/trx_toolkit/README @@ -32,3 +32,8 @@ versa. Also provides some capabilities for filtering bursts by direction, frame and timeslot numbers, and for recording captured messages to a binary file. + +Please note that TRX toolkit is not using libosmocore's CTRL +interface, so 'CTRL' in scope of this code base actually means +control interface of TRX or control protocol. In order to avoid +possible confusion, we use 'TRXC' and 'TRXD' in logging. diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 28815c2..bdacb64 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -51,7 +51,7 @@ self.argv.bind_addr, self.argv.bind_port) # Debug print - log.info("Init CTRL interface (%s)" \ + log.info("Init TRXC interface (%s)" \ % self.ctrl_link.desc_link()) def parse_argv(self): @@ -109,7 +109,7 @@ self.ctrl_link.send("CMD %s\0" % cmd) def print_prompt(self): - sys.stdout.write("CTRL# ") + sys.stdout.write("TRXC# ") sys.stdout.flush() def sig_handler(self, signum, frame): diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index a1c19f0..902af18 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -29,7 +29,7 @@ class CTRLInterface(UDPLink): def __init__(self, *udp_link_args): UDPLink.__init__(self, *udp_link_args) - log.debug("Init CTRL interface (%s)" % self.desc_link()) + log.debug("Init TRXC interface (%s)" % self.desc_link()) def handle_rx(self): # Read data from socket @@ -37,7 +37,7 @@ data = data.decode() if not self.verify_req(data): - log.error("Wrong data on CTRL interface") + log.error("Wrong data on TRXC interface") return # Attempt to parse a command diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index b1ba1e5..027fd85 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -30,7 +30,7 @@ class DATAInterface(UDPLink): def __init__(self, *udp_link_args): UDPLink.__init__(self, *udp_link_args) - log.debug("Init DATA interface (%s)" % self.desc_link()) + log.debug("Init TRXD interface (%s)" % self.desc_link()) def recv_raw_data(self): data, _ = self.sock.recvfrom(512) diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 4eb210b..b15c10f 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -180,13 +180,13 @@ # Make sure that transceiver is configured and running if not self.running: - log.warning("(%s) RX DATA message (%s), but transceiver " + log.warning("(%s) RX TRXD message (%s), but transceiver " "is not running => dropping..." % (self, msg.desc_hdr())) return None # Make sure that indicated timeslot is configured if msg.tn not in self.ts_list: - log.warning("(%s) RX DATA message (%s), but timeslot is not " + log.warning("(%s) RX TRXD message (%s), but timeslot is not " "configured => dropping..." % (self, msg.desc_hdr())) return None -- To view, visit https://gerrit.osmocom.org/12560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 Gerrit-Change-Number: 12560 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:33 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:33 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add init logging message In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12548 ) Change subject: trx_toolkit/transceiver.py: add init logging message ...................................................................... trx_toolkit/transceiver.py: add init logging message Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd --- M src/target/trx_toolkit/transceiver.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index b15c10f..6c72a26 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -98,6 +98,8 @@ self.base_port = base_port self.child_idx = child_idx + log.info("Init transceiver '%s'" % self) + # Child transceiver cannot have its own clock if clck_gen is not None and child_idx > 0: raise TypeError("Child transceiver cannot have its own clock") -- To view, visit https://gerrit.osmocom.org/12548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9a8b327748fbfcbae438cb531cd0b2767b6ca4dd Gerrit-Change-Number: 12548 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: add optional transceiver name In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12549 ) Change subject: trx_toolkit/transceiver.py: add optional transceiver name ...................................................................... trx_toolkit/transceiver.py: add optional transceiver name Since fake_trx.py can handle multiple transceivers, it may be useful to name transceivers. If transceiver has some name, it will appear in logging messages, for example: [INFO] transceiver.py:104 Init transceiver 'BTS at 127.0.0.1:5700' [INFO] transceiver.py:104 Init transceiver 'MS at 127.0.0.1:6700' [INFO] transceiver.py:104 Init transceiver '127.0.0.1:5700/1' This change additionally assigns names to the both default transceivers, and extends the '--trx' option with ability to specify some name, for example: --trx foo at 127.0.0.1:5700 or --trx bar at 127.0.0.1:5700/1 --trx ipv6@[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6700 Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 26 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 294a819..928333f 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -288,31 +288,34 @@ self.fake_pm.trx_list = self.trx_list # Init TRX instance for BTS - self.append_trx(self.argv.bts_addr, self.argv.bts_base_port) + self.append_trx(self.argv.bts_addr, + self.argv.bts_base_port, name = "BTS") # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, self.argv.bb_base_port) + self.append_trx(self.argv.bb_addr, + self.argv.bb_base_port, name = "MS") # Additional transceivers (optional) if self.argv.trx_list is not None: for trx_def in self.argv.trx_list: - (addr, port, idx) = trx_def - self.append_child_trx(addr, port, idx) + (name, addr, port, idx) = trx_def + self.append_child_trx(addr, port, idx, name) # Burst forwarding between transceivers self.burst_fwd = BurstForwarder(self.trx_list) log.info("Init complete") - def append_trx(self, remote_addr, base_port): + def append_trx(self, remote_addr, base_port, name = None): trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - clck_gen = self.clck_gen, pwr_meas = self.fake_pm) + clck_gen = self.clck_gen, pwr_meas = self.fake_pm, + name = name) self.trx_list.add_trx(trx) - def append_child_trx(self, remote_addr, base_port, child_idx): + def append_child_trx(self, remote_addr, base_port, child_idx, name = None): # Index 0 corresponds to the first transceiver if child_idx is 0: - self.append_trx(remote_addr, base_port) + self.append_trx(remote_addr, base_port, name) return # Find 'parent' transceiver for a new child @@ -323,7 +326,7 @@ # Allocate a new child trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - child_idx = child_idx, pwr_meas = self.fake_pm) + child_idx = child_idx, pwr_meas = self.fake_pm, name = name) self.trx_list.add_trx(trx_child) # Link a new 'child' with its 'parent' @@ -363,11 +366,12 @@ # format: REMOTE_ADDR:BIND_PORT[/TRX_NUM] # e.g. [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5700/5 # e.g. 127.0.0.1:5700 or 127.0.0.1:5700/1 + # e.g. foo at 127.0.0.1:5700 or bar at 127.0.0.1:5700/1 @staticmethod def trx_def(val): try: - result = re.match("(.+):([0-9]+)(\/[0-9]+)?", val) - (addr, port, idx) = result.groups() + result = re.match("(.+@)?(.+):([0-9]+)(\/[0-9]+)?", val) + (name, addr, port, idx) = result.groups() except: raise argparse.ArgumentTypeError("Invalid TRX definition: %s" % val) @@ -376,7 +380,11 @@ else: idx = 0 - return (addr, int(port), idx) + # Cut '@' from TRX name + if name is not None: + name = name[:-1] + + return (name, addr, int(port), idx) def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 6c72a26..9c234fd 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -90,7 +90,7 @@ """ - def __init__(self, bind_addr, remote_addr, base_port, + def __init__(self, bind_addr, remote_addr, base_port, name = None, child_idx = 0, clck_gen = None, pwr_meas = None): # Connection info self.remote_addr = remote_addr @@ -98,6 +98,9 @@ self.base_port = base_port self.child_idx = child_idx + # Meta info + self.name = name + log.info("Init transceiver '%s'" % self) # Child transceiver cannot have its own clock @@ -141,6 +144,8 @@ desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: desc += "/%d" % self.child_idx + if self.name is not None: + desc = "%s@%s" % (self.name, desc) return desc -- To view, visit https://gerrit.osmocom.org/12549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2f58f02e7819bb008b8aab1a8bf9e0adeb2e44ec Gerrit-Change-Number: 12549 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:52:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:52:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/README: update fake_trx.py description In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12561 ) Change subject: trx_toolkit/README: update fake_trx.py description ...................................................................... trx_toolkit/README: update fake_trx.py description Since Ibff31fb3a958a714c828d0dea7e87d47f778fd80, fake_trx.py does support multiple transceivers. Let's update its description. Change-Id: I6e4351693da3a1f7e3eadd8e11971c34044dde20 --- M src/target/trx_toolkit/README 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/README b/src/target/trx_toolkit/README index 09800b0..769c9c2 100644 --- a/src/target/trx_toolkit/README +++ b/src/target/trx_toolkit/README @@ -5,8 +5,9 @@ Brief description of available applications: - fake_trx.py - main application, that allows to connect both - OsmocomBB and OsmoBTS without actual RF hardware. Currently - only a single MS may work with a single BTS. + OsmocomBB and OsmoBTS without actual RF hardware. It's also + possible to emulate more than two transceivers, so multiple + MS and/or BTS instances can be connected. - clck_gen.py - a peripheral tool aimed to emulate TDMA frame clock generator. Could be used for testing and clock -- To view, visit https://gerrit.osmocom.org/12561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e4351693da3a1f7e3eadd8e11971c34044dde20 Gerrit-Change-Number: 12561 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 14 23:59:16 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 14 Jan 2019 23:59:16 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG at 7 PS2, Line 7: add GCR comparison helper > The GCR comparison helper will be used to compare GCRs. Yes, it can be seen from the commit name, but my question was different. In other words, which projects would benefit from this helper? > In fact, it's already used in this patch in the test. I see. At the same time, it isn't covered by test(s) itself ;) -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 14 Jan 2019 23:59:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 00:03:25 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 00:03:25 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR comparison helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12493 ) Change subject: LCLS: add GCR comparison helper ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12493/2//COMMIT_MSG at 7 PS2, Line 7: add GCR comparison helper > which projects would benefit from this helper? Pretty much any which use GCR. For now it's BSC and MSC. Not sure how it's relevant though. > it isn't covered by test(s) itself ;) Feel free to add more. -- To view, visit https://gerrit.osmocom.org/12493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3b5560a058b976638d03cb819415d237ae9984 Gerrit-Change-Number: 12493 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 00:03:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 09:36:23 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 09:36:23 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#11). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 918 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/11 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 09:45:02 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 09:45:02 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: (8 comments) > you could set its level to DEBUG Good point. I'll update it in next revision. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/Makefile.am File tests/trans/Makefile.am: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/Makefile.am at 4 PS9, Line 4: -I$(top_srcdir)/src/libmsc > Looks useless to me. The only header in there is smpp_smsc. [?] Agreed. Feel free to add me as reviewer if you make such a patch. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 51 PS9, Line 51: trans_assign_trans_id > You're always calling it with ti_flag = 0. [?] I'm not sure how to test this because we're always using 0. Anyway, the tests could (and will) be expanded in follow-up patches. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 68 PS9, Line 68: base_callref > What is the point of passing callref? [?] What's the point of using static counter? What would be the advantage compared to explicitly passing the argument? https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 79 PS9, Line 79: return > I would rather use OSMO_ASSERT here. I don't. I'd rather see as many errors as possible in a single run. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 88 PS9, Line 88: return > Let's just imagine that trans_has_conn() returns X != 0. [?] trans_has_conn() returns pointer to a struct. I don't see how using assert on it would be better than returning from the test. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 94 PS9, Line 94: vlr_subscr_name > You say 'connection', but print subscriber name? o_O I don't think we have function to print ran-conn itself and there's 1:1 mapping between VLR subscribers and connections. Having said that, I'm open for improvements. What do you suggest? https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref > Hmm, allocating multiple transactions with same callref? [?] It does: we print amount of transactions allocated explicitly. Changing allocation logic would be immediately reflected in the test output. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.err File tests/trans/trans_test.err: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.err at 1 PS9, Line 1: Unknown RAN type > Cosmetic: you could use any 'known' RAN type to avoid this. What for? We're testing transaction.h functions in here so I'd rather avoid the need to deal with TX/RX. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 09:45:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:00:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 10:00:20 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12556 to look at the new patch set (#10). Change subject: Add tests for transaction routines ...................................................................... Add tests for transaction routines Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 --- M configure.ac M tests/Makefile.am M tests/testsuite.at A tests/trans/Makefile.am A tests/trans/trans_test.c A tests/trans/trans_test.err A tests/trans/trans_test.ok 7 files changed, 272 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/12556/10 -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:01:40 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 10:01:40 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref > It's a known issue (at least to me) Btw, do we have a ticket for this? -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:01:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:02:14 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 10:02:14 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: (4 comments) https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 79 PS9, Line 79: return > I don't. I'd rather see as many errors as possible in a single run. It doesn't make sense to continue execution of the test case if at least one step fails IMHO. Moreover, ran_conn_alloc() may return NULL without any debug messages. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 83 PS9, Line 83: return > ... and here. trans_alloc() also may return NULL without any debug output. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 88 PS9, Line 88: return > trans_has_conn() returns pointer to a struct. [?] It would explicitly indicate why *and where* the test case has failed. The current code would silently skip the pending code and start testing test_tran_overflow(). https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref Sorry, but I am not getting this. The key idea is that allocating multiple transactions with same callref is wrong, and we shouldn't do this at least in tests. Vice versa, this test should ensure that trans_alloc() prevents this. > Changing allocation logic You don't need to change the logic, just do: callref = base_callref + i -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:02:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:03:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 10:03:08 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: > (1 comment) Yup, please see: https://osmocom.org/issues/3294 -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:03:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:28:30 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 Jan 2019 10:28:30 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#30). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 49 files changed, 2,806 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/30 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:36:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 10:36:10 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref > The key idea is that allocating multiple transactions with same callref is wrong, and we shouldn't do this at least in tests. I strongly disagree. We should never try to "fix" issues by making tests behave differently from the code. The right way is to add test which illustrate current code behavior (even if it's wrong), than fix the code and update the test accordingly. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:36:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:37:51 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 Jan 2019 10:37:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: change default for mp_vlr_name Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12562 Change subject: MSC_Tests: change default for mp_vlr_name ...................................................................... MSC_Tests: change default for mp_vlr_name osmo-msc now uses *_SGS_SERVER_* instead of vlr.example.net, so lets update the default module parameters accordingly. Change-Id: I2bcfff8e2413437b92b744b2645e8e0024684bb1 Related: OS#3614 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/12562/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index b72c580..a3ba7de 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -117,7 +117,7 @@ charstring mp_smpp_system_id := "msc_tester"; charstring mp_smpp_password := "osmocom1"; charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; - charstring mp_vlr_name := "vlr.example.net"; + charstring mp_vlr_name := "*_SGS_SERVER_*"; boolean mp_sgsap_enable := false; -- To view, visit https://gerrit.osmocom.org/12562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2bcfff8e2413437b92b744b2645e8e0024684bb1 Gerrit-Change-Number: 12562 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:37:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 10:37:59 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:37:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:40:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 10:40:21 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12556 to look at the new patch set (#11). Change subject: Add tests for transaction routines ...................................................................... Add tests for transaction routines Related: OS#3294 Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 --- M configure.ac M tests/Makefile.am M tests/testsuite.at A tests/trans/Makefile.am A tests/trans/trans_test.c A tests/trans/trans_test.err A tests/trans/trans_test.ok 7 files changed, 272 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/12556/11 -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:45:52 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 Jan 2019 10:45:52 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12554 to look at the new patch set (#2). Change subject: socket: add define for socket name length ...................................................................... socket: add define for socket name length The function osmo_sock_get_name_buf() can be used to write a string representation to a user provided memory. Unfortunately the proper length for the user provided memory is not obvious. To make using osmo_sock_get_name_buf() more practical, add a define constant that defines the length of the required memory. Also use this define in socket.c. Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12554/2 -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 10:51:54 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 Jan 2019 10:51:54 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 30: (96 comments) I am now through with the review, I hope nothing slipped through, the scrolling in gerrit is very broken at the moment... Your comments from 01.11 match up with my understanding but I am asking myself now what happens if the subscriber attaches first to 2G/3G (periodic LU timer is running) and then goes to LTE, the SGs LU does not stop such timers but I have the feeling that we need to do exactly that. Also I think we don't have any TTCN3 test that verifies the periodic LU for 2G. If we do not have that yet we should implement it. https://gerrit.osmocom.org/#/c/11642/3/include/osmocom/msc/gsm29118.h File include/osmocom/msc/gsm29118.h: https://gerrit.osmocom.org/#/c/11642/3/include/osmocom/msc/gsm29118.h at 9 PS3, Line 9: : : : : > do we really want to have all of those members dynamically allocated on the heap? I think our gener [?] Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h at 216 PS29, Line 216: RAN_CONN_USE_UNTRACKED = > (yes, it is nicer to keep the last comma, so later additions are single-line patches) Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/ran_conn.h at 216 PS29, Line 216: RAN_CONN_USE_UNTRACKED = > Missing comma. Done https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/ran_conn.h at 118 PS8, Line 118: > ws Done https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/ran_conn.h at 213 PS8, Line 213: ran_conn_sgs_re > It looks like this symbols should have been updated after [?] Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_iface.h File include/osmocom/msc/sgs_iface.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_iface.h at 29 PS29, Line 29: /* Socket name from osmo_sock_get_name() */ > Here, I guess talloc ownership is clear and straightforward, so it would be ok to keep this as-is, [?] Done https://gerrit.osmocom.org/#/c/11642/3/include/osmocom/msc/sgs_iface.h File include/osmocom/msc/sgs_iface.h: https://gerrit.osmocom.org/#/c/11642/3/include/osmocom/msc/sgs_iface.h at 2 PS3, Line 2: > we should add coypyright headers to all new files, sorry for not having one in my original patch. Do we really place copyright notices into header files? I thought the policy here was not to do this? However I checked some header files, some of them have copyright notices some of them do not. I have now added the copyright headers and I would vote to adding copyright notices to all files, regardless of what it is. https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h File include/osmocom/msc/sgs_server.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h at 1 PS29, Line 1: #pragma once > closing brace (C), and I guess it should contain 2019 Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_server.h at 23 PS29, Line 23: unsigned int timer[_NUM_SGS_STATE_TIMERS]; > Maybe this name could be "*_SGS_SERVER_*"? Done https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/sgs_server.h File include/osmocom/msc/sgs_server.h: https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/sgs_server.h at 34 PS8, Line 34: > const? this is (should be) set by the VTY. Unfortunately it was not set before. I have fixed this now It is populated with a default value at first and can be changed using the VTY now. Same is true for the port. https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_vty.h File include/osmocom/msc/sgs_vty.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/sgs_vty.h at 1 PS29, Line 1: #pragma once > I think normally we don't have (C) in . [?] Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h at 114 PS29, Line 114: > Why do we need this? I don't see any references to this struct. Done https://gerrit.osmocom.org/#/c/11642/29/include/osmocom/msc/vlr.h at 114 PS29, Line 114: > the struct is defined 7 lines further down; indeed drop this Done https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/11642/8/include/osmocom/msc/vlr.h at 196 PS8, Line 196: > Please mark it with a FIXME label. I have removed this. The spec says that the association shall be marked with the cause code on certain events but I could not find any suggestion on how the cause code can be useful later on. Presumably this is intended for logging or diagnosing etc... Should we ever need to keep the cause code we can add it again at any time. https://gerrit.osmocom.org/#/c/11642/3/src/libmsc/gsm29118.c File src/libmsc/gsm29118.c: https://gerrit.osmocom.org/#/c/11642/3/src/libmsc/gsm29118.c at 65 PS3, Line 65: > could be simplified by msgb_push_u8(msg, msg_type) Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/gsm29118.c File src/libmsc/gsm29118.c: https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/gsm29118.c at 39 PS5, Line 39: > Could you add a comment to explain why len is overridden in this specific case? Is this safe? I have checked this back, its required by the spec. See note in the code. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c at 453 PS29, Line 453: conn->vsub->classmark.classmark1 = lu->classmark1; > In principle, we put the bare msg composition stuff in libosmocore. [?] I think it makes sense to pull this apart, we already have that for BSSMAP and for SGs as well but I think this is in scope for another patch and we should indeed not block this patch with that. Apart from not much is messed up here. There are a lot of other gsm48_create... function in this file. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c at 455 PS29, Line 455: > ws Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_04_08_annotated.c File src/libmsc/gsm_04_08_annotated.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_04_08_annotated.c at 89 PS8, Line 89: > There is no such symbol anymore. Why do we need this file BTW? [?] I am sorry, this file shouln't be here. It was just there to keep some notes in the source code without having to mess around in the original file. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_09_11.c at 347 PS8, Line 347: RV_IND_SMS); > It seems your editor is doing this alignment automatically. [?] I am not sure, I have now made it look like other function calls in the file. So it should be consistent now. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_09_11.c at 350 PS8, Line 350: ee(trans); > USSD != SMS See 3GPP TS 29.118 version 15.2.0, 9.4.17 Service indicator. There is only either "CS call indicator" or "SMS indicator" possible. I wonder if USSD is entirely handled by the MME if the mobile is on 4G? and therefore this code path is never executed on SGs Associated? https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 58 PS8, Line 58: int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, > Unrelated change. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 71 PS8, Line 71: LOGP(DPAG, LOGL_DEBUG, "Paging %s for %s (event=%d)\n", > Unrelated change. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 74 PS8, Line 74: > Unrelated change. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 80 PS8, Line 80: } > Looks better, but anyway unrelated. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 88 PS8, Line 88: /* Inform parts of the system we don't know */ > Same. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 106 PS8, Line 106: > Good idea for a separate change. I have put this in a separate patch. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 144 PS8, Line 144: > why? Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 153 PS8, Line 153: gsm_cbfn *cbfn, void *param, > Unrelated. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 156 PS8, Line 156: int rc; > Unrelated. Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_subscriber.c at 165 PS8, Line 165: if (rc <= 0) { > Unrelated. Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 119 PS29, Line 119: SCCP > Agree, return val info should go to the "API doc" string. [?] This is a static function, so its not part of the API and there shouldn't be a doc-string. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 119 PS29, Line 119: SCCP > I think this note should precede the function definition. Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 130 PS29, Line 130: return sgs_iface_tx_paging(vsub, serv_ind); > meta question: [?] When the MME performs an LU on the SGs the VLR knows that the subscriber exists and in case of paging it will page through the SGs interface, the MME then does the real paging on the EUTRAN. Paging is indeed managed on the LTE side, but if an SMS arrives, it will arrive at the MSC, then the MSC needs to know where to deliver the paging. The SGs-Association tells the MSC/VLR that the subscriber is attached on LTE and then sends the paging through the SGs interface to the MME. Those pagings are more or less a command to the MME to trigger the actual paging on LTE. When the LU happens through the SGs interface, vlr_sgs_fsm.c instead of vlr_lu_fsm.c does the work. I do not start a timer, so I think periodic LU should be disabled. If I am wrong here and the timer is started anyway, then we have a bug. I set the attached flag to be sure that the MSC is acting as if the subscriber were attached normally, so that paging, sms and csfb calls can be done as if the subscriber were on a 2G/3G network. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 151 PS29, Line 151: */ > end with dot Done https://gerrit.osmocom.org/#/c/11642/3/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/3/src/libmsc/msc_vty.c at 615 PS3, Line 615: > unrelated notice: Might be worth introducing a function like omso_fsm_inst_state_name(vsup->sgs_fsm) [?] There is already a function with that name. I am using it now. https://gerrit.osmocom.org/#/c/11642/3/src/libmsc/msc_vty.c at 619 PS3, Line 619: trans->vsub ? vlr_subscr_name(trans->vsub) : "-", > no need to break the line here for VTY_NEWLINE Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/msc_vty.c at 1429 PS8, Line 1429: vty_out(vty, " default-codec tch-h %s%s", > I think it was already declared in 'sgs_vty.c'. Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/msc_vty.c at 705 PS29, Line 705: VTY_NEWLINE); > maybe [?] SGS_UE_ST_NULL is a condition that is interesting to see. SGS_UE_ST_NULL does not imply that the SGs interface is disabled. A subscriber may go to SGS_UE_ST_NULL and leave it several times throughout its lifetime. Not showing the info when SGS_UE_ST_NULL would be very confusing when debugging things. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/ran_conn.c File src/libmsc/ran_conn.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/ran_conn.c at 394 PS8, Line 394: functions (see above), > Clarify please, *what* was already done? Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 95 PS5, Line 95: LOGSGC(sgc, LOGL_ERROR, "(sub %s) Connection allocation failed\n", vlr_subscr_msisdn_or_name(vsub)); > spelling: "Cannot" Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 219 PS5, Line 219: } > Could check for sgc->mme->fqdn[0] == '\0' to avoid string traversal in case the string is not empty. Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 307 PS5, Line 307: } > spelling: context-dependent Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 308 PS5, Line 308: > This function never fails. [?] That is intended, when the function has a return code it becomes much easier to use. No {} + separate return statement needed. The returned 0 will propagate downwards and tell the main handler that the error has been handled. https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 449 PS5, Line 449: /* FIXME: If we are in SGS_UE_ST_NULL while sub->conf_by_radio_contact_ind == false, > Check return value? This function works like snprintf(): [?] the IMSI is parsed in a central location since it is used so often. I have changed this now. See also sgs_iface_rx() https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 540 PS5, Line 540: enum vlr_lu_type type; > This function never fails. [?] All rx handler functions must have a return code (see sgs_tx_status() above) https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 567 PS5, Line 567: if (lu_type_ie[0] == 0x01) > This function never fails either. [?] (see above) https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 611 PS5, Line 611: break; > Return an error code? The error is logged, we could return a status to the MME indicating that something is wrong, but technically I think that it is ok just to leave the UDUP out and do nothing since UDUP is, as far as I understood it so far, just the beeping you hear when someone rejects the call. https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_iface.c at 782 PS5, Line 782: /* SGsAP-UPLINK-UNITDATA 3GPP TS 29.118, chapter 8.22 */ > Could check for imsi[0] == '\0' to avoid string traversal in case string is not empty. I don't think that we are that performance critical here, but I added the check. It would help a lot to know the minimum allowed length for an IMSI. The 6 is just a guess. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_iface.c at 1023 PS8, Line 1023: > I have never seen such odd alignment o_O. Looks like an alt statement [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 3 PS29, Line 3: /* (C) 2018-2019 by sysmocom s.f.m.c. GmbH > ) 19 Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 98 PS29, Line 98: > This is a bad thing to do in general. [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 110 PS29, Line 110: conn->complete_layer3_type = COMPLETE_LAYER3_CM_SERVICE_REQ; > this is not the HLR ... the vlr_subscr_find_by_imsi() does not contact the HLR. [?] I think in this case its just a typo. It should be VLR instead of HLR. When the subscriber is not in the VLR, we can not allocate a connection. An SGs LU has to be done before. Also the callers already checked that the subscriber is indeed there. Its probably missleading that there is an imsi parameter here. Using vsub directly makes more sense. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 121 PS29, Line 121: /* Check if there are connections associated with a given subscriber. If yes, > instead of another get() here, keep the get() use count from vlr_subscr_find_by_imsi(). [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 277 PS29, Line 277: sgsap_msg_type_name(msg_type), imsi); > In another VTY related patch I did argue that what you're doing here is safe. [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 329 PS29, Line 329: sgsap_sgs_cause_name(cause)); > this is not so nice, since you're obtaining log context info, even though you don't know whether som [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 348 PS29, Line 348: resp = gsm29118_create_status(imsi, cause, msg); > you are *always* logging an error now. I guess the initial 'if (sgsap_iei < 0)' should have a { .. [?] The errors are handeled, maybe ERROR is to strong and we should log those messages as NOTICE? The return code is fine. 0 just means that the error is handled. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 354 PS29, Line 354: * reject, depending on the outcome of the location update. */ > [after reading other code] ... [?] Thats correct. "Status" means "Error" in SGs https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 414 PS29, Line 414: > (when we're sending MM Info data, is that really a "Request"?) Yes, at least SGs calls it a "Request", see 3GPP TS 29.118 8.12. Maybe because the VLR is requesting the MME to send the MM information to the UE... https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 454 PS29, Line 454: > Of course our VLR does not even have a VLR subscriber stored if it is not attached. [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 597 PS29, Line 597: > (a switch() would be nicer here) Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 624 PS29, Line 624: /* SGsAP-EPS-DETACH-INDICATION 3GPP TS 29.118, chapter 8.6 */ > (a switch() would be nicer here) Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 650 PS29, Line 650: vlr_sgs_eps_detach(gsm_network->vlr, imsi, type); > VLR != HLR Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 655 PS29, Line 655: } > AFAICT this is not sending anything to the HLR Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 708 PS29, Line 708: > so an SGsAP Service Request is a reply to an earlier message from the 2G CN? Yes, its the response to the paging https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 772 PS29, Line 772: /* Allocate subscriber connection */ > is it possible that we obtain a conn that was established on GSM and not via SGs? [?] You mean when a subscriber has just created a conn on 2G/3G, then looses reception and the UE does an LU on LTE, resulting in an LU on SGs and then an MO SMS is sent we would get the old conn instead of creating a new one. Maybe you are right and we are better off if we check if there are lingering conns when either a location update on the SGs happens or when there is an CSFB indication (subsciber just came back to LTE aufer a fallback call). In both cases we shouldn't have connections associated with the VSUB. I have integrated such a check to make won't run into this. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 851 PS29, Line 851: > LOGL_ERROR? Also below? Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 865 PS29, Line 865: > you are often repeating the pattern "create_status, tx, free". [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 871 PS29, Line 871: > GSM23003_IMSI_MIN_DIGITS Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 872 PS29, Line 872: #define TX_STATUS_AND_LOG(sgc, msg_type, cause, fmt) \ > (strlen() is enough, it implies a "[0] == '\0' check") Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 984 PS29, Line 984: break; > others free() after sgs_tx(). One or the other is wrong. The checks above abort the function early. The msg that comes in needs to be freed before this function exists. The checks here do not free because they have no return statement and the free is done at the bottom. I have restructured it a bit to reduce the amount of msgb_free() here. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 987 PS29, Line 987: break; > ... Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1083 PS29, Line 1083: reset_params.vlr_name_present = true; > (would be nice to also log the Ns11 value) Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1140 PS29, Line 1140: }, > inline comment rather without doxygen marker Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1212 PS29, Line 1212: * the VLR subscriber usage to be balanced. */ > register sgs_ue_fsm? This is the only FSM we need to register here. sgs_ue_fsm is inside the VLR and everything related to that is done there. https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_server.c at 50 PS5, Line 50: goto out; > Set rc to -EBADF to allow an outer event loop to detect a closed socket? I assign -EBADF to rc after each osmo_stream_srv_destroy() now. I hope this is correct now. https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_server.c at 160 PS8, Line 160: > Shouldn't this be configurable from the VTY? Those are default values which are changed by sgs_server_open() afterwards. It should be configurable of course. I have fixed it now and there are default values. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_server.c at 1 PS29, Line 1: /* (C) 2018-2019 by sysmocom s.f.m.c. GmbH > ) 19 Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_vty.c File src/libmsc/sgs_vty.c: https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/sgs_vty.c at 141 PS5, Line 141: > Use a #define for the port number? Done https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_vty.c File src/libmsc/sgs_vty.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/sgs_vty.c at 46 PS8, Line 46: } > Let's don't mix everything into a single line. Hard to read. I see, I have now split it up. I hope it is now better to read. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c File src/libmsc/sgs_vty.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 1 PS29, Line 1: /* (C) 2018-2019 by sysmocom s.f.m.c. GmbH > ) 19 Done https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 99 PS29, Line 99: DEFUN(cfg_sgs_timer, cfg_sgs_timer_cmd, > have you tested that the keywords are allowed to contain capital letters? [?] I did not know that before. I have tested it now and it indeed causes problems. I have now made it all into small letters. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_vty.c at 123 PS29, Line 123: DEFUN(cfg_sgs_counter, cfg_sgs_counter_cmd, > same capital chars: tested? Done https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/subscr_conn.c File src/libmsc/subscr_conn.c: https://gerrit.osmocom.org/#/c/11642/5/src/libmsc/subscr_conn.c at 725 PS5, Line 725: > What does 'flag' mean? Try to choose a more expressive name? Done https://gerrit.osmocom.org/#/c/11642/3/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/3/src/libvlr/vlr_sgs.c at 91 PS3, Line 91: vsub->sgs.paging_cb = paging_cb; > that kind of printf of course needs to be removed before an eventual merge I removed this one, but there are others. I am using them as orientation while testing things. I will remove all of them of course before merge. https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c at 143 PS5, Line 143: case SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS: > Missing 'break;' in default case. Done https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c at 174 PS5, Line 174: break; > Missing 'break;' in default case. Done https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c at 203 PS5, Line 203: } > spelling: reception Done https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c at 237 PS5, Line 237: /* Stop Ts5 and and consider the paging as successful */ > spelling: reception Done https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs.c at 291 PS5, Line 291: * an explicit failure is indicated (MME actively rejects paging). > Could be simplified to: return osmo_timer_pending(&vsub->sgs. [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 89 PS29, Line 89: vsub->sgs.cfg = *cfg; > rather [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 101 PS29, Line 101: vsub->cgi.lai = *new_lai; > please don't use memcpy, but assign members directly. [?] Done https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 205 PS29, Line 205: /*! Notify that an SGs paging has been rejected by the MME. > wrong comment Done https://gerrit.osmocom.org/#/c/11642/29/src/libvlr/vlr_sgs.c at 226 PS29, Line 226: /*! Notify that an SGs paging has been accepted by the MME. > wrong comment Done https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c File src/libvlr/vlr_sgs_fsm.c: https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 197 PS5, Line 197: /* In cases where the LU has interrupted the paging, respawn the paging now, > Missing 'break;' here? yes, its missing. Thanks. https://gerrit.osmocom.org/#/c/11642/3/tests/msc_vlr/msc_vlr_test_call.c File tests/msc_vlr/msc_vlr_test_call.c: https://gerrit.osmocom.org/#/c/11642/3/tests/msc_vlr/msc_vlr_test_call.c at 592 PS3, Line 592: > please don't copy+paste this to each test but rather introduce a shared file with those stubs which [?] Done -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 10:51:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 11:03:24 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 11:03:24 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12519 to look at the new patch set (#3). Change subject: Clarify transaction ID assignment ...................................................................... Clarify transaction ID assignment Add doc for unused ti_flag parameter with spec reference and adjust parameter type to match the spec. Add convenience wrapper to make it more obvious that we always use the same parameter value. Move magic ID value to #define Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 5 files changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/12519/3 -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 12:10:41 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 12:10:41 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 9: (3 comments) https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c File tests/trans/trans_test.c: https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 68 PS9, Line 68: base_callref > What's the point of using static counter? What would be the advantage compared to explicitly passing [?] We would avoid one meaningless parameter ;) As a bonus, you could reflect values of this static counter in the logging output, instead of counting the amount of allocated transactions manually. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 94 PS9, Line 94: vlr_subscr_name > I don't think we have function to print ran-conn itself and there's 1:1 mapping between VLR subscrib [?] Ok, I see. What about this? LOG_RAN_CONN_CAT(t->conn, DCC, LOGL_DEBUG, "Connection assigned to transaction\n"); Off-topic: Now I think that we need something like LOG_TRANS and LOG_TRANS_CAT() for transactions. https://gerrit.osmocom.org/#/c/12556/9/tests/trans/trans_test.c at 134 PS9, Line 134: base_callref >> The key idea is that allocating multiple transactions with >> same callref is wrong, and we shouldn't do this at least >> in tests. > > I strongly disagree. We should never try to "fix" issues by > making tests behave differently from the code. Actually, your test case behaves differently from the code. You won't see any existing code parts, which *intentionally use same callref* for new transactions. Despite potentially this may happen (e.g. triggered by external MNCC / EUSE). So, I don't ask you to fix trans_alloc(), I ask you not to use the same callref value for multiple transactions. > The right way is to add test which illustrate current code > behavior (even if it's wrong), than fix the code and update > the test accordingly. Yes, and this is what I would like to see in this (or in a subsequent) change. Please illustrate the current behavior (e.g. in a separate test_trans_callref function) by allocating a few transactions with same callref, and print some warning until trans_alloc() is fixed. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 12:10:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 12:13:11 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 12:13:11 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12556 ) Change subject: Add tests for transaction routines ...................................................................... Patch Set 11: Code-Review-1 Keeping my -1 because I am against using same callref for multiple transactions, and not all my comments were addressed. -- To view, visit https://gerrit.osmocom.org/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 12:13:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 12:45:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 12:45:16 +0000 Subject: Change in osmo-msc[master]: MNCC: use explicit struct type in gsm_call Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12563 Change subject: MNCC: use explicit struct type in gsm_call ...................................................................... MNCC: use explicit struct type in gsm_call There's no need to use 'void *' because we have forward declaration for 'struct gsm_network' in the very same header. Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c --- M include/osmocom/msc/mncc.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/12563/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index d2f0541..a9be004 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -38,7 +38,7 @@ struct llist_head entry; /* network handle */ - void *net; + struct gsm_network *net; /* the 'local' transaction */ uint32_t callref; -- To view, visit https://gerrit.osmocom.org/12563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c Gerrit-Change-Number: 12563 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:06:32 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 13:06:32 +0000 Subject: Change in libosmocore[master]: MNCC: move messages into public header and convert to enum Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12564 Change subject: MNCC: move messages into public header and convert to enum ...................................................................... MNCC: move messages into public header and convert to enum Change-Id: Ie808b42871d3847b6b47964d9b0504b3c51c2fd0 --- M include/osmocom/gsm/mncc.h M src/gsm/mncc.c 2 files changed, 78 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/12564/1 diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 7e7d12c..0513fb2 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -8,6 +8,83 @@ #define GSM_MAX_SSVERSION 128 #define GSM_MAX_USERUSER 128 +#define MNCC_SOCK_VERSION 5 + +enum osmo_mncc_msg { + MNCC_SETUP_REQ = 0x0101, + MNCC_SETUP_IND = 0x0102, + MNCC_SETUP_RSP = 0x0103, + MNCC_SETUP_CNF = 0x0104, + MNCC_SETUP_COMPL_REQ = 0x0105, + MNCC_SETUP_COMPL_IND = 0x0106, + MNCC_CALL_CONF_IND = 0x0107, + MNCC_CALL_PROC_REQ = 0x0108, + MNCC_PROGRESS_REQ = 0x0109, + MNCC_ALERT_REQ = 0x010a, + MNCC_ALERT_IND = 0x010b, + MNCC_NOTIFY_REQ = 0x010c, + MNCC_NOTIFY_IND = 0x010d, + MNCC_DISC_REQ = 0x010e, + MNCC_DISC_IND = 0x010f, + MNCC_REL_REQ = 0x0110, + MNCC_REL_IND = 0x0111, + MNCC_REL_CNF = 0x0112, + MNCC_FACILITY_REQ = 0x0113, + MNCC_FACILITY_IND = 0x0114, + MNCC_START_DTMF_IND = 0x0115, + MNCC_START_DTMF_RSP = 0x0116, + MNCC_START_DTMF_REJ = 0x0117, + MNCC_STOP_DTMF_IND = 0x0118, + MNCC_STOP_DTMF_RSP = 0x0119, + MNCC_MODIFY_REQ = 0x011a, + MNCC_MODIFY_IND = 0x011b, + MNCC_MODIFY_RSP = 0x011c, + MNCC_MODIFY_CNF = 0x011d, + MNCC_MODIFY_REJ = 0x011e, + MNCC_HOLD_IND = 0x011f, + MNCC_HOLD_CNF = 0x0120, + MNCC_HOLD_REJ = 0x0121, + MNCC_RETRIEVE_IND = 0x0122, + MNCC_RETRIEVE_CNF = 0x0123, + MNCC_RETRIEVE_REJ = 0x0124, + MNCC_USERINFO_REQ = 0x0125, + MNCC_USERINFO_IND = 0x0126, + + /* MNCC_REJ_* is perfomed via MNCC_REL_* */ + MNCC_REJ_REQ = 0x0127, + MNCC_REJ_IND = 0x0128, + + MNCC_BRIDGE = 0x0200, + MNCC_FRAME_RECV = 0x0201, + MNCC_FRAME_DROP = 0x0202, + MNCC_LCHAN_MODIFY = 0x0203, + MNCC_RTP_CREATE = 0x0204, + MNCC_RTP_CONNECT = 0x0205, + MNCC_RTP_FREE = 0x0206, + + MNCC_SOCKET_HELLO = 0x0400, + MNCC_F_BEARER_CAP = 0x0001, + MNCC_F_CALLED = 0x0002, + MNCC_F_CALLING = 0x0004, + MNCC_F_REDIRECTING = 0x0008, + MNCC_F_CONNECTED = 0x0010, + MNCC_F_CAUSE = 0x0020, + MNCC_F_USERUSER = 0x0040, + MNCC_F_PROGRESS = 0x0080, + MNCC_F_EMERGENCY = 0x0100, + MNCC_F_FACILITY = 0x0200, + MNCC_F_SSVERSION = 0x0400, + MNCC_F_CCCAP = 0x0800, + MNCC_F_KEYPAD = 0x1000, + MNCC_F_SIGNAL = 0x2000, + + GSM_TCHF_FRAME = 0x0300, + GSM_TCHF_FRAME_EFR = 0x0301, + GSM_TCHH_FRAME = 0x0302, + GSM_TCH_FRAME_AMR = 0x0303, + GSM_BAD_FRAME = 0x03ff, +}; + /* Expanded fields from GSM TS 04.08, Table 10.5.102 */ struct gsm_mncc_bearer_cap { int transfer; /* Information Transfer Capability */ @@ -93,6 +170,6 @@ _osmo_mncc_log(ss, level, __FILE__, __LINE__, prefix, msg, len); extern const struct value_string osmo_mncc_names[]; -static inline const char *osmo_mncc_name(uint32_t msg_type) { +static inline const char *osmo_mncc_name(enum osmo_mncc_msg msg_type) { return get_value_string(osmo_mncc_names, msg_type); } diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index 938cf9a..b8724d8 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -35,82 +35,6 @@ #include /* FIXME FIXME FIXME FIXME FIXME START */ -#define MNCC_SETUP_REQ 0x0101 -#define MNCC_SETUP_IND 0x0102 -#define MNCC_SETUP_RSP 0x0103 -#define MNCC_SETUP_CNF 0x0104 -#define MNCC_SETUP_COMPL_REQ 0x0105 -#define MNCC_SETUP_COMPL_IND 0x0106 -/* MNCC_REJ_* is perfomed via MNCC_REL_* */ -#define MNCC_CALL_CONF_IND 0x0107 -#define MNCC_CALL_PROC_REQ 0x0108 -#define MNCC_PROGRESS_REQ 0x0109 -#define MNCC_ALERT_REQ 0x010a -#define MNCC_ALERT_IND 0x010b -#define MNCC_NOTIFY_REQ 0x010c -#define MNCC_NOTIFY_IND 0x010d -#define MNCC_DISC_REQ 0x010e -#define MNCC_DISC_IND 0x010f -#define MNCC_REL_REQ 0x0110 -#define MNCC_REL_IND 0x0111 -#define MNCC_REL_CNF 0x0112 -#define MNCC_FACILITY_REQ 0x0113 -#define MNCC_FACILITY_IND 0x0114 -#define MNCC_START_DTMF_IND 0x0115 -#define MNCC_START_DTMF_RSP 0x0116 -#define MNCC_START_DTMF_REJ 0x0117 -#define MNCC_STOP_DTMF_IND 0x0118 -#define MNCC_STOP_DTMF_RSP 0x0119 -#define MNCC_MODIFY_REQ 0x011a -#define MNCC_MODIFY_IND 0x011b -#define MNCC_MODIFY_RSP 0x011c -#define MNCC_MODIFY_CNF 0x011d -#define MNCC_MODIFY_REJ 0x011e -#define MNCC_HOLD_IND 0x011f -#define MNCC_HOLD_CNF 0x0120 -#define MNCC_HOLD_REJ 0x0121 -#define MNCC_RETRIEVE_IND 0x0122 -#define MNCC_RETRIEVE_CNF 0x0123 -#define MNCC_RETRIEVE_REJ 0x0124 -#define MNCC_USERINFO_REQ 0x0125 -#define MNCC_USERINFO_IND 0x0126 -#define MNCC_REJ_REQ 0x0127 -#define MNCC_REJ_IND 0x0128 - -#define MNCC_BRIDGE 0x0200 -#define MNCC_FRAME_RECV 0x0201 -#define MNCC_FRAME_DROP 0x0202 -#define MNCC_LCHAN_MODIFY 0x0203 -#define MNCC_RTP_CREATE 0x0204 -#define MNCC_RTP_CONNECT 0x0205 -#define MNCC_RTP_FREE 0x0206 - -#define GSM_TCHF_FRAME 0x0300 -#define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHH_FRAME 0x0302 -#define GSM_TCH_FRAME_AMR 0x0303 -#define GSM_BAD_FRAME 0x03ff - -#define MNCC_SOCKET_HELLO 0x0400 - -#define GSM_MAX_FACILITY 128 -#define GSM_MAX_SSVERSION 128 -#define GSM_MAX_USERUSER 128 - -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 struct gsm_mncc { /* context based information */ @@ -155,7 +79,6 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 5 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; -- To view, visit https://gerrit.osmocom.org/12564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie808b42871d3847b6b47964d9b0504b3c51c2fd0 Gerrit-Change-Number: 12564 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:32:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:32:36 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#4). Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_imsi() and db_subscr_get_by_imei(). The new functions are used in db_test, and in follow-up commits [1], [2]. Upgrade DB schema to version 2. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. Follow-up commit [1] will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. [1] change-id I09274ecbed64224f7ae305e09ede773931da2a57 "Optionally store IMEI in subscriber table" [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 186 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/4 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:32:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:32:36 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#5). Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/5 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:32:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:32:36 +0000 Subject: Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db* Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12565 Change subject: gitignore: add tests/hlr_vty_test.db* ...................................................................... gitignore: add tests/hlr_vty_test.db* Ignore files generated from the VTY test. Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/65/12565/1 diff --git a/.gitignore b/.gitignore index c08a612..0397e35 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ tests/gsup_server/gsup_server_test tests/gsup/gsup_test tests/db/db_test +tests/hlr_vty_test.db* # manuals doc/manuals/*.html -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:32:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:32:37 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12566 Change subject: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() ...................................................................... Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() Properly note that NULL can only be passed as msisdn, not imsi in that function. Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 --- M src/db_hlr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/66/12566/1 diff --git a/src/db_hlr.c b/src/db_hlr.c index c97cd82..2569477 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -141,8 +141,8 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. - * \param[in] msisdn ASCII string of MSISDN digits. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] msisdn ASCII string of MSISDN digits, or NULL to remove the MSISDN. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. */ -- To view, visit https://gerrit.osmocom.org/12566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 Gerrit-Change-Number: 12566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:34:33 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:34:33 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 15 PS3, Line 15: to operate with databases which are not upgraded. > (would suffice to just say "upgrade the db schema to version N", no need to explain the general upgr [?] Done https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 28 PS3, Line 28: specification. > also mention that the subscr_get_by_imei() is used by commit "VTY: Integrate IMEI" with change-id. [?] Done. Just to make clear, this is also used with "ASSERT_SEL(imei,..." in db_test.c. https://gerrit.osmocom.org/#/c/12525/3/src/db.h File src/db.h: https://gerrit.osmocom.org/#/c/12525/3/src/db.h at 76 PS3, Line 76: char imei[32]; > GSM23003_IMEI_NUM_DIGITS + 1 Done https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c at 392 PS3, Line 392: * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. > test passing NULL as arg to remove IMEI; then also the remainder of the expected test output would b [?] Good idea, done. -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 13:34:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 13:38:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 13:38:48 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c at 442 PS4, Line 442: msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response"); > if the subscriber doesn't exist, we should respond with an error. [?] Agreed, all suggestions implemented. update_imei() is gone now, as it would only wrap db_update_imei_by_imsi() (no need to resolve the ID first). https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c at 75 PS4, Line 75: vty_out(vty, " store-imei%s", VTY_NEWLINE); > looks like too much indent. [?] Right, it should only be one space. Fixed, and extended one of the VTY tests to print this out. https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c at 313 PS4, Line 313: " Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1').") > wording: maybe rather "Note that an MSC does not necessarily send Check IMEI requests (for OsmoMSC, [?] I went with store-imei/no store-imei and changed the wording as suggested. -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 13:38:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 15:04:16 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 15 Jan 2019 15:04:16 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12567 Change subject: common: extend glossary.adoc ...................................................................... common: extend glossary.adoc Add EIR, IMEISV, LU, PVLR, SS, TS and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/1 diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 74973b3..dd6a76f 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -85,6 +85,8 @@ GPRS; introduces 8PSK EGPRS:: Enhanced GPRS; the part of EDGE relating to GPRS services +EIR:: + Equipment Identity Register ESME:: External SMS Entity; an external application interfacing with a SMSC over SMPP @@ -128,7 +130,9 @@ IE:: Information Element IMEI:: - International Mobile Equipment Identity; unique identifier for the mobile phone + International Mobile Equipment Identity; 14-digit unique identifier for the mobile phone plus a check digit (total digits: 15) +IMEISV:: + IMEI software version; 14-digit unique identifier for the mobile phone plus two software version digits (total digits: 16) IMSI:: International Mobile Subscriber Identity; 15-digit unique identifier for the subscriber/SIM; starts with MCC/MNC of issuing operator @@ -147,6 +151,8 @@ 44.064_ <<3gpp-ts-44-064>>) Location Area:: Location Area; a geographic area containing multiple BTS +LU:: + Location Update M2PA:: MTP2 Peer-to-Peer Adaptation; a SIGTRAN Variant (_RFC 4165_ <>) M2UA:: @@ -234,6 +240,8 @@ PUK:: PIN Unblocking Code; used to unblock a blocked PIN (after too many wrong PIN attempts) +PVLR:: + Proxy Visitor Location Register RAC:: Routing Area Code; 16bit identifier for a Routing Area within a Location Area RACH:: @@ -284,6 +292,8 @@ Short Message Service Center; store-and-forward relay for short messages SS7:: Signaling System No. 7; Classic digital telephony signaling system +SS:: + Supplementary Services SSH:: Secure Shell; _IETF RFC 4250_ <> to 4254 SSN:: @@ -306,6 +316,8 @@ Trivial File Transfer Protocol; (_IETF RFC 1350_ <>) TRX:: Transceiver; element of a BTS serving a single carrier +TS:: + Technical Specification u-Boot:: Boot loader used in various embedded systems UBI:: @@ -328,6 +340,8 @@ Voltage Controlled, Temperature Compensated Crystal Oscillator; a precision oscillator, superior to a classic crystal oscillator, but inferior to an OCXO +VLR:: + Visitor Location Register VPLMN:: Visited PLMN; the network in which the subscriber is currently registered; may differ from HPLMN when on roaming -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 15:34:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 15:34:02 +0000 Subject: Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db* In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* ...................................................................... Patch Set 1: Code-Review+1 actually the tests should also remove them right away? tests/Makefile.am says: -rm -f $(VTY_TEST_DB) Hmm, I see, if the make step fails, the removal is skipped. Maybe rather fix that. -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 15 Jan 2019 15:34:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 15:34:45 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 15:34:45 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12566 ) Change subject: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 Gerrit-Change-Number: 12566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 15 Jan 2019 15:34:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 15:47:17 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 15:47:17 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 4: Code-Review-1 (1 comment) -0.0001 https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c at 426 PS4, Line 426: LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber ID='%s': SQL modified %d rows (expected 1)\n", imsi, ID= -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 15:47:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 15:57:47 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 15:57:47 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 4: (1 comment) -1 https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c at 426 PS4, Line 426: LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber ID='%s': SQL modified %d rows (expected 1)\n", imsi, > ID= Argh hm, there's one thing I so far completely missed in this: would SQLite return 0 if the IMEI is already in the DB for this IMSI? Apologies, I might have sent us off on a tangent here. It appears to me that we can't distinguish between "no such IMSI" and "the IMEI was already exactly the given one". Can you briefly investigate whether we can get some SQL that has two different return codes for the two situations? If we can't, then we may after all still require a separate subscr_get_by_imsi followed by an IMEI update only if it differs, and my earlier preview generated some unnecessary work for you... :/ Or maybe the code path managing this already has the subscriber struct present somehow, maybe as part of the luop? Then we can check for differing IMEI there without another db hit ... and then we could also have used the ID as selector instead of the IMSI. Please add the scenario "setting the same IMEI again" to the unit test. Sorry again for missing that corner case before. -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 15:57:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:06:23 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 16:06:23 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 5: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12526/5/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12526/5/src/hlr.c at 433 PS5, Line 433: if (db_subscr_get_by_imei(g_hlr->dbc, gsup->imsi, &subscr) < 0) { _by_imsi https://gerrit.osmocom.org/#/c/12526/5/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12526/5/src/hlr_vty.c at 321 PS5, Line 321: "Do not save the IMEI in the database, when receiving Check IMEI requests.") (no comma) -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 16:06:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:10:10 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 16:10:10 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty File tests/test_subscriber.vty: https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty at 34 PS5, Line 34: % No subscriber for msisdn = '12345' actually you should also add tests for the imei selector, basically copy-pasting "all" of those present for msisdn -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 16:10:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:12:19 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 Jan 2019 16:12:19 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 16:12:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:13:09 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 16:13:09 +0000 Subject: Change in libosmocore[master]: LCLS: make GCR into static member of osmo_lcls Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12568 Change subject: LCLS: make GCR into static member of osmo_lcls ...................................................................... LCLS: make GCR into static member of osmo_lcls Most of the time we'll have GCR filled anyway so it make sense to have it as static parameter instead of a pointer to separately allocated structure. Update tests to cover both static and dynamic osmo_lcls allocation variants. Change-Id: I905c36d8455911c68c30bc429379b7313dd46aea --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 3 files changed, 28 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12568/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 4a2233e..7c6f707 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -63,7 +63,8 @@ struct osmo_lcls { enum gsm0808_lcls_config config; /**< ?3.2.2.116 Configuration */ enum gsm0808_lcls_control control; /**< ?3.2.2.117 Connection Status Control */ - struct osmo_gcr_parsed *gcr; /**< ?3.2.2.115 Global Call Reference */ + struct osmo_gcr_parsed gcr; /**< ?3.2.2.115 Global Call Reference */ + bool gcr_available; bool corr_needed; /**< ?3.2.2.118 Correlation-Not-Needed */ }; diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2a458c3..9fcccae 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -551,8 +551,8 @@ uint8_t enc = 0; /* LCLS: ?3.2.2.115 Global Call Reference */ - if (lcls->gcr) - enc = gsm0808_enc_gcr(msg, lcls->gcr); + if (lcls->gcr_available) + enc = gsm0808_enc_gcr(msg, &lcls->gcr); /* LCLS: ?3.2.2.116 Configuration */ if (lcls->config != GSM0808_LCLS_CFG_NA) { @@ -581,10 +581,9 @@ * \returns GCR size or negative on error */ int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp) { - int ret = gsm0808_dec_gcr(lcls->gcr, tp); - if (ret < 0) - return ret; + int ret = gsm0808_dec_gcr(&lcls->gcr, tp); + lcls->gcr_available = (ret < 0) ? false : true; lcls->config = tlvp_val8(tp, GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_NA); lcls->control = tlvp_val8(tp, GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_NA); lcls->corr_needed = TLVP_PRESENT(tp, GSM0808_IE_LCLS_CORR_NOT_NEEDED) ? false : true; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 546a487..76446ae 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -445,17 +445,17 @@ struct sockaddr_in sin; struct gsm0808_speech_codec_list sc_list; uint32_t call_id = 0xDEADFACE; - struct osmo_gcr_parsed gcr = { .net_len = 3, .node = 0xFEED }; uint8_t Kc[16]; struct osmo_lcls lcls = { .config = GSM0808_LCLS_CFG_BOTH_WAY, .control = GSM0808_LCLS_CSC_CONNECT, - .gcr = &gcr, + .gcr = { .net_len = 3, .node = 0xFEED }, + .gcr_available = true, .corr_needed = false }; - memset(gcr.cr, 'A', 5); - memset(gcr.net, 'D', gcr.net_len); + memset(lcls.gcr.cr, 'A', 5); + memset(lcls.gcr.net, 'D', lcls.gcr.net_len); memset(Kc, 'E', 16); memset(&ct, 0, sizeof(ct)); @@ -682,16 +682,16 @@ }; uint8_t len; struct msgb *msg; - struct osmo_gcr_parsed p = { 0 }, g = { - .net_len = 3, - .net = { 0xf1, 0xf2, 0xf3 }, - .node = 0xDEAD, - .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 }, - }; int rc; struct tlv_parsed tp; - struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = { - .gcr = &g, + struct osmo_lcls *lcls_out, lcls_in = { + .gcr = { + .net_len = 3, + .net = { 0xf1, 0xf2, 0xf3 }, + .node = 0xDEAD, + .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 }, + }, + .gcr_available = true, .config = GSM0808_LCLS_CFG_NA, .control = GSM0808_LCLS_CSC_NA, .corr_needed = true, @@ -701,6 +701,10 @@ if (!msg) return; + lcls_out = talloc_zero(msg, struct osmo_lcls); + if (!lcls_out) + return; + len = gsm0808_enc_lcls(msg, &lcls_in); printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); @@ -714,25 +718,25 @@ abort(); } - rc = gsm0808_dec_lcls(&lcls_out, &tp); + rc = gsm0808_dec_lcls(lcls_out, &tp); if (rc < 0) { printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(); } - if (lcls_out.config != lcls_in.config) { + if (lcls_out->config != lcls_in.config) { printf("LCLS Config parsed wrong: %s != %s\n", - gsm0808_lcls_config_name(lcls_out.config), gsm0808_lcls_config_name(lcls_in.config)); + gsm0808_lcls_config_name(lcls_out->config), gsm0808_lcls_config_name(lcls_in.config)); abort(); } - if (lcls_out.control != lcls_in.control) { + if (lcls_out->control != lcls_in.control) { printf("LCLS Control parsed wrong: %s != %s\n", - gsm0808_lcls_control_name(lcls_out.control), gsm0808_lcls_control_name(lcls_in.control)); + gsm0808_lcls_control_name(lcls_out->control), gsm0808_lcls_control_name(lcls_in.control)); abort(); } - if (!osmo_gcr_eq(lcls_out.gcr, lcls_in.gcr)) { + if (!osmo_gcr_eq(&lcls_out->gcr, &lcls_in.gcr)) { printf("GCR parsed wrong.\n"); abort(); } -- To view, visit https://gerrit.osmocom.org/12568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I905c36d8455911c68c30bc429379b7313dd46aea Gerrit-Change-Number: 12568 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 16:13:10 +0000 Subject: Change in libosmocore[master]: Prevent GCR encoder/decoder functions from being used directly Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12569 Change subject: Prevent GCR encoder/decoder functions from being used directly ...................................................................... Prevent GCR encoder/decoder functions from being used directly They only make sense in the context of LCLS so far - let's make sure they're not used by external projects directly instead of gsm0808_*() counterparts. Change-Id: I4ae5a3472a20492d5f76170b722e4e2274a5c433 --- M include/osmocom/gsm/gsm29205.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/12569/1 diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index f93e34a..9575456 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -37,6 +37,6 @@ uint8_t cr[5]; /** Call Reference ID */ }; -uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); -int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); -- To view, visit https://gerrit.osmocom.org/12569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ae5a3472a20492d5f76170b722e4e2274a5c433 Gerrit-Change-Number: 12569 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:13:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 16:13:38 +0000 Subject: Change in libosmocore[master]: LCLS: add allocator function In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12491 ) Change subject: LCLS: add allocator function ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If67cf93ae3dd449e96156485fe1baaf013df3f77 Gerrit-Change-Number: 12491 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:13:50 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 16:13:50 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12492 ) Change subject: LCLS: add string dump helpers ...................................................................... Patch Set 8: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 15 Jan 2019 16:13:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 16:43:09 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 16:43:09 +0000 Subject: Change in osmo-msc[master]: Log: don't print CallRef prefix Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12570 Change subject: Log: don't print CallRef prefix ...................................................................... Log: don't print CallRef prefix In a preparation for upcoming CallRef fixes, let's update test output by ignoring first byte of callref (which acts as per-protocol namespace indicator anyway) and print protocol name instead. Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9 Related: OS#3294 --- M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 9 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12570/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index df770ed..01cb2ba 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -114,8 +114,8 @@ return NULL; } - DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction\n", - trans_id, vlr_subscr_name(vsub), callref); + DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction for %s\n", + trans_id, vlr_subscr_name(vsub), (callref << 8) >> 8, gsm48_pdisc_name(protocol)); trans = talloc_zero(tall_trans_ctx, struct gsm_trans); if (!trans) diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index f190c31..b6cd460 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -271,7 +271,7 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000001) New transaction +DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 1) New transaction for CC DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false @@ -574,7 +574,7 @@ - after a while, MNCC asks us to setup a call, causing Paging DMNCC receive message MNCC_SETUP_REQ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 -DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction +DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction for CC DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 @@ -960,7 +960,7 @@ - after a while, MNCC asks us to setup a call, causing Paging DMNCC receive message MNCC_SETUP_REQ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 -DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction +DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction for CC DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 @@ -1396,7 +1396,7 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000002) New transaction +DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 2) New transaction for CC DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false @@ -1745,7 +1745,7 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000003) New transaction +DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 3) New transaction for CC DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index fddfe07..e364cd6 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -270,7 +270,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -757,7 +757,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 @@ -1854,7 +1854,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction +DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 3) New transaction for SMS DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 65e182c..ce06702 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -298,7 +298,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -838,7 +838,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 @@ -2046,7 +2046,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction +DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 3) New transaction for SMS DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 @@ -2536,7 +2536,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 4) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -3036,7 +3036,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 5) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 5372919..1bcd337 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -461,7 +461,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -479,7 +479,7 @@ vsub->cs.is_paging == 1 - another request is added to the list but does not cause another paging DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 6 -DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction +DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 7 DMM Subscriber IMSI-901700000004620:MSISDN-46071 already paged. llist_count(&vsub->cs.requests) == 2 @@ -502,7 +502,7 @@ --- - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 3) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3e28468..589ca1a 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -182,7 +182,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -541,7 +541,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index f5692b9..9038e0b 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1215,7 +1215,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -1437,7 +1437,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 @@ -1680,7 +1680,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction +DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 3) New transaction for SMS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index a801f9e..0304b8e 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -151,7 +151,7 @@ DRLL Dispatching 04.08 message GSM0480_MTYPE_REGISTER (0xb:0x3b) DMM Received SS/USSD data (trans_id=8, msg_type=GSM0480_MTYPE_REGISTER) DMM -> (new transaction) -DCC (ti 08 sub IMSI-901700000004620:MSISDN-46071 callref 20000001) New transaction +DCC (ti 08 sub IMSI-901700000004620:MSISDN-46071 callref 1) New transaction for NCSS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_nc_ss == 3 (0x4a: dtap,cm_service,trans_nc_ss) DMM IMSI-901700000004620:MSISDN-46071: rx msg GSM0480_MTYPE_REGISTER: received_cm_service_request changes to false @@ -318,7 +318,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DMSC Routed to GSM 09.11 SS/USSD handler DMM Establishing network-originated session -DCC (ti ff sub IMSI-901700000004620:MSISDN-46071 callref 20000101) New transaction +DCC (ti ff sub IMSI-901700000004620:MSISDN-46071 callref 101) New transaction for NCSS DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 DMM Triggering Paging Request DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 18addc3..e412b9a 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -287,7 +287,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000001) New transaction +DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 1) New transaction for SMS DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 @@ -777,7 +777,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000002) New transaction +DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 2) New transaction for SMS DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 -- To view, visit https://gerrit.osmocom.org/12570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9 Gerrit-Change-Number: 12570 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 17:07:58 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 17:07:58 +0000 Subject: Change in osmo-msc[master]: Log: don't print CallRef prefix In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12570 to look at the new patch set (#2). Change subject: Log: don't print CallRef prefix ...................................................................... Log: don't print CallRef prefix In a preparation for upcoming CallRef fixes, let's update test output by ignoring first byte of callref (which acts as per-protocol namespace indicator anyway) and print protocol name instead. Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9 Related: OS#3294 --- M include/osmocom/msc/debug.h M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 11 files changed, 52 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12570/2 -- To view, visit https://gerrit.osmocom.org/12570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9 Gerrit-Change-Number: 12570 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 17:41:03 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 17:41:03 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12571 Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... VLR: use msgb_eq_data_print() for comparison This simplifies tests refactoring by showing exact byte where mismatch happened. It also makes code more readable. Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/12571/1 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 44ecc50..f58acae 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -570,15 +570,20 @@ int __real_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) { - const char *is = osmo_hexdump_nospc(msg->data, msg->len); + uint8_t buf[OSMO_GSUP_MAX_MSISDN_LEN * OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; + int len; + fprintf(stderr, "GSUP --> HLR: %s: %s\n", - osmo_gsup_message_type_name(msg->data[0]), is); + osmo_gsup_message_type_name(msg->data[0]), osmo_hexdump_nospc(msg->data, msg->len)); OSMO_ASSERT(gsup_tx_expected); - if (strcmp(gsup_tx_expected, is)) { - fprintf(stderr, "Mismatch! Expected:\n%s\n", gsup_tx_expected); + + len = osmo_hexparse(gsup_tx_expected, buf, sizeof(buf)); + if (len < 1) abort(); - } + + if (!msgb_eq_data_print(msg, buf, len)) + abort(); talloc_free(msg); gsup_tx_confirmed = true; @@ -596,13 +601,8 @@ /* Mask the sequence number out before comparing */ msg->data[1] &= 0x3f; - if (msg->len != dtap_tx_expected->len - || memcmp(msg->data, dtap_tx_expected->data, msg->len)) { - fprintf(stderr, "Mismatch! Expected:\n%s\n", - osmo_hexdump_nospc(dtap_tx_expected->data, - dtap_tx_expected->len)); + if (!msgb_eq_data_print(msg, dtap_tx_expected->data, dtap_tx_expected->len)) abort(); - } btw("DTAP matches expected message"); -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 17:47:49 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 17:47:49 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 3: Hi Max, Harald, > I am not sure if we should drop it just because the callers always pass '0'B. I have been thinking a lot about this, and just come to a conclusion. I think the initial version of this patch wasn't that bad, and doesn't deserve CR-2. Here is why: According to GSM 04.07, this flag takes one bit and can be either of the following: '0'B - transaction is allocated by sender of a message, '1'B - transaction is allocated by receiver of a message. Since we store transaction ID in gsm_trans structure, we also store TI flag (as a part of transaction ID), which in this context means: '0'B - transaction is allocated by us (OsmoMSC), '1'B - transaction is allocated by some MS. In 100% cases, trans_assign_trans_id() is used to assign transaction IDs to transactions allocated by us (i.e. OsmoMSC) for MT connections. And there is no need to use it for MO transactions, because they basically already do contain a valid transaction ID. So, I think we should roll-back to the initial version of this change, and remove the 'ti_flag' parameter. The explanation above can be used as the commit description. Max, I am sorry for not being concrete at the beginning. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 17:47:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 17:51:22 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 17:51:22 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 3: > Patch Set 3: > So, I think we should roll-back to the initial version of this change, > and remove the 'ti_flag' parameter. The explanation above can be used > as the commit description. We can add another patch on top of latest revision which drops this parameter - should be trivial merge of wrapper into function. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 17:51:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 18:01:57 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 18:01:57 +0000 Subject: Change in osmo-msc[master]: Log: don't print CallRef prefix In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12570 ) Change subject: Log: don't print CallRef prefix ...................................................................... Patch Set 2: Code-Review-2 (1 comment) https://gerrit.osmocom.org/#/c/12570/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12570/2//COMMIT_MSG at 9 PS2, Line 9: let's update test output by : ignoring first byte of callref In case of transaction ID, I wasn't sure if we should remove TI flag, but here I am definitely against. I don't see any advantages of removing the first byte of callref, vice versa, I see a few potential problems: - Let's say we have a few transactions (SMS + USSD during a call): CC=0x80000001, SMS=0x40000001, NCSS=0x20000001. Without the prefix, they would all look like a single transaction in logging. - We have no any protection against possible overlaps between the callref ranges (0x20..., 0x40..., 0x80...). This patch makes impossible to detect such situations in logging. Instead, I would drop this range (or per-protocol namespace) separation itself, because I don't see any benefits of this concept. -- To view, visit https://gerrit.osmocom.org/12570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9 Gerrit-Change-Number: 12570 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 15 Jan 2019 18:01:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 18:03:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 15 Jan 2019 18:03:55 +0000 Subject: Change in osmo-msc[master]: MNCC: use explicit struct type in gsm_call In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12563 ) Change subject: MNCC: use explicit struct type in gsm_call ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c Gerrit-Change-Number: 12563 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 18:03:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 18:31:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 18:31:33 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12572 Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Change GSM48_PDISC_* to enum type Prepare for transaction handling revamp in OsmoMSC: an enum is more clear than an int and #defines for passing around. Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/12572/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 234fa79..9c7663d 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1352,30 +1352,32 @@ } __attribute__((packed)); /* Section 10.2 + GSM 04.07 12.2.3.1.1 + 3GPP TS 24.007 11.2.3.1.1 */ -#define GSM48_PDISC_GROUP_CC 0x00 -#define GSM48_PDISC_BCAST_CC 0x01 -#define GSM48_PDISC_PDSS1 0x02 /* 04.07 only */ -#define GSM48_PDISC_CC 0x03 -#define GSM48_PDISC_PDSS2 0x04 /* 04.07 only */ -#define GSM48_PDISC_GTTP 0x04 /* 24.007 only */ -#define GSM48_PDISC_MM 0x05 -#define GSM48_PDISC_RR 0x06 -#define GSM48_PDISC_MM_GPRS 0x08 -#define GSM48_PDISC_SMS 0x09 -#define GSM48_PDISC_SM_GPRS 0x0a -#define GSM48_PDISC_NC_SS 0x0b -#define GSM48_PDISC_LOC 0x0c -#define GSM48_PDISC_EXTEND 0x0e -#define GSM48_PDISC_TEST 0x0f /* as per 11.10, 04.14 */ -#define GSM48_PDISC_MASK 0x0f +enum osmo_pdisc { + GSM48_PDISC_GROUP_CC = 0x00, + GSM48_PDISC_BCAST_CC = 0x01, + GSM48_PDISC_PDSS1 = 0x02, /* 04.07 onl= y */ + GSM48_PDISC_CC = 0x03, + GSM48_PDISC_PDSS2 = 0x04, /* 04.07 onl= y */ + GSM48_PDISC_GTTP = 0x04, /* 24.007 onl= y */ + GSM48_PDISC_MM = 0x05, + GSM48_PDISC_RR = 0x06, + GSM48_PDISC_MM_GPRS = 0x08, + GSM48_PDISC_SMS = 0x09, + GSM48_PDISC_SM_GPRS = 0x0a, + GSM48_PDISC_NC_SS = 0x0b, + GSM48_PDISC_LOC = 0x0c, + GSM48_PDISC_EXTEND = 0x0e, + GSM48_PDISC_TEST = 0x0f, /* as per 11.10, 04.1= 4 */ + GSM48_PDISC_MASK = 0x0f, +}; extern const struct value_string gsm48_pdisc_names[]; -static inline const char *gsm48_pdisc_name(uint8_t val) +static inline const char *gsm48_pdisc_name(enum osmo_pdisc val) { return get_value_string(gsm48_pdisc_names, val); } bool gsm48_hdr_gmm_cipherable(const struct gsm48_hdr *hdr); -static inline uint8_t gsm48_hdr_pdisc(const struct gsm48_hdr *hdr) +static inline enum osmo_pdisc gsm48_hdr_pdisc(const struct gsm48_hdr *hdr) { /* * 3GPP TS 24.007 version 12.0.0 Release 12, -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 15 19:19:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 15 Jan 2019 19:19:33 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12573 Change subject: Add function to combine nibbles into byte ...................................................................... Add function to combine nibbles into byte It's a very common patter throughout GSM 04.08 and other protocols where single byte store 2 different values occupying 1 nibble each. Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e --- M include/osmocom/core/bits.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm48.h M include/osmocom/gsm/protocol/gsm_03_41.h M src/gsm/gsm0808.c M src/gsm/gsm23003.c M src/gsm/gsm48.c M tests/utils/utils_test.c 8 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/12573/1 diff --git a/include/osmocom/core/bits.h b/include/osmocom/core/bits.h index b1b8040..8027bdd 100644 --- a/include/osmocom/core/bits.h +++ b/include/osmocom/core/bits.h @@ -47,6 +47,16 @@ int osmo_pbit2ubit(ubit_t *out, const pbit_t *in, unsigned int num_bits); +/*! Nibble combination. + * \param[in] lo Value to be placed in LSB nibble + * \param[in] hi Value to be placed in LSB nibble + * \returns combined nibble value + */ +static inline uint8_t osmo_nibble(uint8_t lo, uint8_t hi) +{ + return lo | (hi << 4); +} + void osmo_nibble_shift_right(uint8_t *out, const uint8_t *in, unsigned int num_nibbles); void osmo_nibble_shift_left_unal(uint8_t *out, const uint8_t *in, diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 4a2233e..4cc917b 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -237,7 +237,7 @@ return 0; } - return channel_mode << 4 | channel; + return osmo_nibble(channel, channel_mode); } const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct); diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index 0f5727a..69b2eeb 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -71,4 +71,4 @@ uint8_t pdisc, uint8_t msg_type); #define gsm48_push_l3hdr_tid(msg, pdisc, tid, msg_type) \ - gsm48_push_l3hdr(msg, (pdisc & 0x0f) | (tid << 4), msg_type) + gsm48_push_l3hdr(msg, osmo_nibble(pdisc & 0x0f, tid), msg_type) diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h index 1b399ae..cd84fd4 100644 --- a/include/osmocom/gsm/protocol/gsm_03_41.h +++ b/include/osmocom/gsm/protocol/gsm_03_41.h @@ -5,6 +5,7 @@ #include +#include #include #include @@ -73,7 +74,7 @@ uint8_t data[0]; } __attribute__((packed)); -#define GSM341_MSG_CODE(ms) ((ms)->serial.code_lo | ((ms)->serial.code_hi << 4)) +#define GSM341_MSG_CODE(ms) osmo_nibble((ms)->serial.code_lo, (ms)->serial.code_hi) /* Section 9.3.2.1 - Geographical Scope */ #define GSM341_GS_CELL_WIDE_IMMED 0 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 59b1657..2254630 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -293,7 +293,7 @@ return NULL; /* Set cause code class in the upper byte */ - cause = 0x80 | (class << 4); + cause = osmo_nibble(0x80, class); cause = cause << 8; /* Set cause code extension in the lower byte */ diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 1d9cefe..eaf0fb4 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -32,6 +32,7 @@ #include #include #include +#include static bool is_n_digits(const char *str, int min_digits, int max_digits) { @@ -218,10 +219,10 @@ to_bcd(bcd, plmn->mnc); if (plmn->mnc > 99 || plmn->mnc_3_digits) { bcd_dst[1] |= bcd[2] << 4; - bcd_dst[2] = bcd[0] | (bcd[1] << 4); + bcd_dst[2] = osmo_nibble(bcd[0], bcd[1]); } else { bcd_dst[1] |= 0xf << 4; - bcd_dst[2] = bcd[1] | (bcd[2] << 4); + bcd_dst[2] = osmo_nibble(bcd[1], bcd[2]); } } diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 795e98b..e5d1592 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -659,7 +659,7 @@ else upper = osmo_char2bcd(id[++off]) & 0x0f; - buf[2 + i] = (upper << 4) | lower; + buf[2 + i] = osmo_nibble(lower, upper); } return 2 + buf[1]; diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index a773b3f..b677a5f 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -510,7 +510,7 @@ in_buf[16] = '\0'; for (j = 0; j < 16; j++) { for (i = 0; i < 16; i++) - in_buf[i] = (j << 4) | i; + in_buf[i] = osmo_nibble(i, j); printf("\"%s\"\n", osmo_escape_str((const char*)in_buf, 16)); } @@ -558,7 +558,7 @@ in_buf[16] = '\0'; for (j = 0; j < 16; j++) { for (i = 0; i < 16; i++) - in_buf[i] = (j << 4) | i; + in_buf[i] = osmo_nibble(i, j); printf("'%s'\n", osmo_quote_str((const char*)in_buf, 16)); } -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jan 15 19:55:19 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 Jan 2019 19:55:19 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c3e3abf2d5f1_7d20a3c67c5711e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 208s] dpkg: mountall: dependency problems, but configuring anyway as you requested: [ 208s] mountall depends on plymouth; however: [ 208s] Package plymouth is not installed. [ 208s] Processing triggers for man-db (2.7.5-1) ... [ 208s] [313/315] installing initramfs-tools-0.122ubuntu8 [ 208s] update-initramfs: deferring update (trigger activated) [ 208s] Processing triggers for man-db (2.7.5-1) ... [ 208s] Processing triggers for initramfs-tools (0.122ubuntu8) ... [ 208s] [314/315] installing upstart-1.13.2-0ubuntu21 [ 209s] [ 176.847644] EXT4-fs error (device sda): ext4_iget:4874: inode #753809: block 1: comm dpkg: invalid block [ 209s] [ 176.850134] EXT4-fs error (device sda): ext4_iget:4874: inode #753809: block 1: comm dpkg: invalid block [ 209s] dpkg: warning: upstart: unable to stat config file '/etc/init/tty1.conf' [ 209s] (= '/etc/init/tty1.conf'): Structure needs cleaning [ 209s] dpkg: error processing archive .init_b_cache/upstart.deb (--install): [ 209s] unable to stat './etc/init/tty1.conf' (which I was about to install): Structure needs cleaning [ 209s] dpkg-deb: error: subprocess paste was killed by signal (Broken pipe) [ 209s] Errors were encountered while processing: [ 209s] .init_b_cache/upstart.deb [ 209s] exit ... [ 209s] [ 209s] lamb59 failed "build libusrp_3.4.2.20190115.dsc" at Tue Jan 15 19:55:05 UTC 2019. [ 209s] [ 209s] ### VM INTERACTION START ### [ 212s] [ 180.132693] sysrq: SysRq : Power Off [ 212s] [ 180.138153] reboot: Power down [ 212s] ### VM INTERACTION END ### [ 212s] [ 212s] lamb59 failed "build libusrp_3.4.2.20190115.dsc" at Tue Jan 15 19:55:09 UTC 2019. [ 212s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 15 20:51:20 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 Jan 2019 20:51:20 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c3e47e45ef5e_7d20a3c67c6689d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 13s] [68/71] preinstalling sysvinit-utils... [ 13s] [69/71] preinstalling e2fsprogs... [ 13s] [70/71] preinstalling sysv-rc... [ 13s] [71/71] preinstalling initscripts... [ 13s] [ 13s] [1/1] preinstalling libdevmapper1.02.1... [ 14s] copying packages... [ 16s] reordering...cycle: libc6 -> libgcc1 [ 16s] breaking dependency libgcc1 -> libc6 [ 16s] cycle: debhelper -> dh-autoreconf [ 16s] breaking dependency debhelper -> dh-autoreconf [ 16s] cycle: dh-strip-nondeterminism -> debhelper [ 16s] breaking dependency debhelper -> dh-strip-nondeterminism [ 16s] done [ 16s] objdump: /boot/Image.guest32: file format not recognized [ 16s] Warning: cross compile not possible due to missing static binaries. please install build-initvm package for that purpose. [ 16s] check that the right architecture is available for your build host, you need initvm.armv8l for this one. [ 18s] booting kvm... [ 18s] ### VM INTERACTION START ### [ 18s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -cpu host,aarch64=off -enable-kvm -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyAMA0 init=/.build/build -m 9216 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-device,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-device,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 324s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_8/root: 18011 [ 324s] qemu-system-aarch64: terminating on signal 15 from pid 49185 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/8/build/build-vm: line 462: kill: (18004) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jan 16 01:11:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 01:11:21 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12572 ) Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12572/1/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12572/1/include/osmocom/gsm/protocol/gsm_04_08.h at 1355 PS1, Line 1355: osmo_pdisc Maybe 'osmo_gsm48_pdisc'? -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 01:11:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 01:19:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 01:19:44 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 11: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c at 664 PS11, Line 664: {0} Do we really need to zero-init this array? -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 01:19:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 03:48:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 03:48:34 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12573 ) Change subject: Add function to combine nibbles into byte ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12573/1/include/osmocom/core/bits.h File include/osmocom/core/bits.h: https://gerrit.osmocom.org/#/c/12573/1/include/osmocom/core/bits.h at 52 PS1, Line 52: hi Value to be placed in LSB nibble Copy pasted ;) Did you mean MSB? -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 03:48:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 09:59:48 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 09:59:48 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12573 to look at the new patch set (#2). Change subject: Add function to combine nibbles into byte ...................................................................... Add function to combine nibbles into byte It's a very common patter throughout GSM 04.08 and other protocols where single byte store 2 different values occupying 1 nibble each. Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e --- M include/osmocom/core/bits.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm48.h M include/osmocom/gsm/protocol/gsm_03_41.h M src/gsm/gsm0808.c M src/gsm/gsm23003.c M src/gsm/gsm48.c M tests/utils/utils_test.c 8 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/12573/2 -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:00:22 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 10:00:22 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12573 ) Change subject: Add function to combine nibbles into byte ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12573/1/include/osmocom/core/bits.h File include/osmocom/core/bits.h: https://gerrit.osmocom.org/#/c/12573/1/include/osmocom/core/bits.h at 52 PS1, Line 52: hi Value to be placed in MSB nibble > Copy pasted ;) Did you mean MSB? Sure thing :) -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 10:00:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:02:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 10:02:16 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12572 to look at the new patch set (#2). Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Change GSM48_PDISC_* to enum type Prepare for transaction handling revamp in OsmoMSC: an enum is more clear than an int and #defines for passing around. Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/12572/2 -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:03:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 10:03:16 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12572 ) Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12572/1/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12572/1/include/osmocom/gsm/protocol/gsm_04_08.h at 1355 PS1, Line 1355: osmo_pdisc > Maybe 'osmo_gsm48_pdisc'? Not sure, according to comments some of those come from other specs as well. -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 10:03:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:13:43 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 10:13:43 +0000 Subject: Change in gr-gsm[master]: python/trx/__init__.py: cosmetic: add missing new line Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12574 Change subject: python/trx/__init__.py: cosmetic: add missing new line ...................................................................... python/trx/__init__.py: cosmetic: add missing new line Change-Id: I379b321866bd892a52b0c272ed50c670da380a17 --- M python/trx/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/74/12574/1 diff --git a/python/trx/__init__.py b/python/trx/__init__.py index 13b5a52..372f46b 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -26,4 +26,4 @@ from fake_pm import fake_pm from radio_if_grc import radio_if_grc from radio_if import radio_if -from change_sign_of_dict_elements import change_sign_of_dict_elements \ No newline at end of file +from change_sign_of_dict_elements import change_sign_of_dict_elements -- To view, visit https://gerrit.osmocom.org/12574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I379b321866bd892a52b0c272ed50c670da380a17 Gerrit-Change-Number: 12574 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:13:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 10:13:44 +0000 Subject: Change in gr-gsm[master]: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12575 Change subject: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' ...................................................................... python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' The old name was quite long, resulting into cumbersome imports: from change_sign_of_dict_elements import change_sign_of_dict_elements let's use a shorter variant: from dict_toggle_sign import dict_toggle_sign Change-Id: Ie75e1d6e5e74c7c1cf34154633c1472e4b85dbb6 --- M python/trx/CMakeLists.txt M python/trx/__init__.py R python/trx/dict_toggle_sign.py M python/trx/radio_if_grc.py 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/75/12575/1 diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index c6e3010..ffe5234 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -26,6 +26,6 @@ fake_pm.py radio_if.py radio_if_grc.py - change_sign_of_dict_elements.py + dict_toggle_sign.py DESTINATION ${GR_PYTHON_DIR}/grgsm/trx ) diff --git a/python/trx/__init__.py b/python/trx/__init__.py index 372f46b..fda783e 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -26,4 +26,4 @@ from fake_pm import fake_pm from radio_if_grc import radio_if_grc from radio_if import radio_if -from change_sign_of_dict_elements import change_sign_of_dict_elements +from dict_toggle_sign import dict_toggle_sign diff --git a/python/trx/change_sign_of_dict_elements.py b/python/trx/dict_toggle_sign.py similarity index 94% rename from python/trx/change_sign_of_dict_elements.py rename to python/trx/dict_toggle_sign.py index fd7c585..d6cd8bd 100644 --- a/python/trx/change_sign_of_dict_elements.py +++ b/python/trx/dict_toggle_sign.py @@ -9,7 +9,7 @@ from gnuradio import gr from pmt import * -class change_sign_of_dict_elements(gr.basic_block): +class dict_toggle_sign(gr.basic_block): def __init__(self): # only default arguments here gr.basic_block.__init__( self, diff --git a/python/trx/radio_if_grc.py b/python/trx/radio_if_grc.py index 920b0c5..8a92f6e 100755 --- a/python/trx/radio_if_grc.py +++ b/python/trx/radio_if_grc.py @@ -8,7 +8,7 @@ # Generated: Fri Dec 1 10:49:25 2017 ################################################## -from change_sign_of_dict_elements import change_sign_of_dict_elements +from dict_toggle_sign import dict_toggle_sign from gnuradio import blocks from gnuradio import digital from gnuradio import eng_notation @@ -94,16 +94,16 @@ self.gsm_burst_type_filter_0 = grgsm.burst_type_filter(([3])) self.gsm_burst_to_fn_time_0 = grgsm.burst_to_fn_time() self.digital_burst_shaper_xx_0 = digital.burst_shaper_cc((firdes.window(firdes.WIN_HANN, 16, 0)), 0, 20, False, "packet_len") - self.change_sign_of_dict_elements = change_sign_of_dict_elements() + self.dict_toggle_sign = dict_toggle_sign() self.blocks_pdu_to_tagged_stream_0_0 = blocks.pdu_to_tagged_stream(blocks.byte_t, "packet_len") ################################################## # Connections ################################################## - self.msg_connect((self.change_sign_of_dict_elements, 'dict_out'), (self.gsm_msg_to_tag_0_0, 'msg')) + self.msg_connect((self.dict_toggle_sign, 'dict_out'), (self.gsm_msg_to_tag_0_0, 'msg')) self.msg_connect((self.gsm_burst_to_fn_time_0, 'fn_time_out'), (self.gsm_txtime_setter_0, 'fn_time')) self.msg_connect((self.gsm_burst_type_filter_0, 'bursts_out'), (self.gsm_burst_to_fn_time_0, 'bursts_in')) - self.msg_connect((self.gsm_clock_offset_control_0, 'ctrl'), (self.change_sign_of_dict_elements, 'dict_in')) + self.msg_connect((self.gsm_clock_offset_control_0, 'ctrl'), (self.dict_toggle_sign, 'dict_in')) self.msg_connect((self.gsm_clock_offset_control_0, 'ctrl'), (self.gsm_msg_to_tag_0, 'msg')) self.msg_connect((self.gsm_preprocess_tx_burst_0, 'bursts_out'), (self.blocks_pdu_to_tagged_stream_0_0, 'pdus')) self.msg_connect((self.gsm_receiver_0, 'C0'), (self.gsm_burst_type_filter_0, 'bursts_in')) -- To view, visit https://gerrit.osmocom.org/12575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie75e1d6e5e74c7c1cf34154633c1472e4b85dbb6 Gerrit-Change-Number: 12575 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:13:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 10:13:44 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: use existing 'dict_toggle_sign' block Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12576 Change subject: trx/radio_if.py: use existing 'dict_toggle_sign' block ...................................................................... trx/radio_if.py: use existing 'dict_toggle_sign' block Change-Id: Ifa616644a858f493b9f8706663f9e7fed717f3d0 --- M python/trx/radio_if.py 1 file changed, 1 insertion(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/76/12576/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 85970a9..49e6788 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -38,25 +38,7 @@ from gnuradio import filter from gnuradio.filter import firdes - -# HACK: should be implemented in C++! -class dict_toggle_sign(gr.basic_block): - def __init__(self): # only default arguments here - gr.basic_block.__init__(self, - name='Change sign of elts in dict', - in_sig=[], - out_sig=[] - ) - self.message_port_register_in(pmt.intern("dict_in")) - self.message_port_register_out(pmt.intern("dict_out")) - self.set_msg_handler(pmt.intern("dict_in"), self.change_sign) - - def change_sign(self, msg): - if pmt.is_dict(msg): - d = pmt.to_python(msg) - for key, value in d.items(): - d[key] *= -1 - self.message_port_pub(pmt.intern("dict_out"), pmt.to_pmt(d)) +from dict_toggle_sign import dict_toggle_sign class radio_if(gr.top_block): # PHY specific variables -- To view, visit https://gerrit.osmocom.org/12576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa616644a858f493b9f8706663f9e7fed717f3d0 Gerrit-Change-Number: 12576 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:36:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 10:36:00 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#12). Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 918 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/12 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:36:39 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 10:36:39 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c at 664 PS11, Line 664: {0} > Do we really need to zero-init this array? We don't, as gsm48_encode_bcd_number() doesn't read from this buffer before writing to it. I've verified this with valgrind just to be sure. The {0} is removed now, thanks for pointing it out! -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 10:36:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:42:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 10:42:51 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 10:42:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 10:42:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 10:42:56 +0000 Subject: Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR ...................................................................... VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 918 insertions(+), 57 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index b328b70..83c8e1b 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -65,6 +65,8 @@ VLR_ULA_E_ID_IMSI, /* IMSI recieved from MS */ VLR_ULA_E_ID_IMEI, /* IMEI received from MS */ VLR_ULA_E_ID_IMEISV, /* IMEISV received from MS */ + VLR_ULA_E_HLR_IMEI_ACK, /* Check_IMEI_VLR result from HLR */ + VLR_ULA_E_HLR_IMEI_NACK,/* Check_IMEI_VLR result from HLR */ VLR_ULA_E_HLR_LU_RES, /* HLR UpdateLocation result */ VLR_ULA_E_UPD_HLR_COMPL,/* UpdatE_HLR_VLR result */ VLR_ULA_E_LU_COMPL_SUCCESS,/* Location_Update_Completion_VLR result */ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 887602c..451c521 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -657,6 +657,28 @@ return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } +/* Initiate Check_IMEI_VLR Procedure (23.018 Chapter 7.1.2.9) */ +int vlr_subscr_tx_req_check_imei(const struct vlr_subscr *vsub) +{ + struct osmo_gsup_message gsup_msg = {0}; + uint8_t imei_enc[GSM23003_IMEI_NUM_DIGITS+2]; /* +2: IE header */ + int len; + + /* Encode IMEI */ + len = gsm48_encode_bcd_number(imei_enc, sizeof(imei_enc), 0, vsub->imei); + if (len < 1) { + LOGVSUBP(LOGL_ERROR, vsub, "Error: cannot encode IMEI '%s'\n", vsub->imei); + return -ENOSPC; + } + gsup_msg.imei_enc = imei_enc; + gsup_msg.imei_enc_len = len; + + /* Send CHECK_IMEI_REQUEST */ + gsup_msg.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST; + OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); + return vlr_tx_gsup_message(vsub->vlr, &gsup_msg); +} + /* Tell HLR that authentication failure occurred */ int vlr_subscr_tx_auth_fail_rep(const struct vlr_subscr *vsub) { @@ -991,6 +1013,29 @@ return rc; } +/* Handle Check_IMEI_VLR result and error from HLR */ +static int vlr_subscr_handle_check_imei(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup) +{ + if (!vsub->lu_fsm) { + LOGVSUBP(LOGL_ERROR, vsub, "Rx %s without LU in progress\n", + osmo_gsup_message_type_name(gsup->message_type)); + return -ENODEV; + } + + if (gsup->message_type == OSMO_GSUP_MSGT_CHECK_IMEI_RESULT) { + if (gsup->imei_result == OSMO_GSUP_IMEI_RESULT_ACK) + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_ACK, NULL); + else + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_NACK, NULL); + } else { + LOGVSUBP(LOGL_ERROR, vsub, "Check_IMEI_VLR failed; gmm_cause: %s\n", + get_value_string(gsm48_gmm_cause_names, gsup->cause)); + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_NACK, NULL); + } + + return 0; +} + /* Incoming handler for GSUP from HLR. * Keep this function non-static for direct invocation by unit tests. */ int vlr_gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg) @@ -1060,6 +1105,10 @@ gsup.message_type); rc = -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL; break; + case OSMO_GSUP_MSGT_CHECK_IMEI_ERROR: + case OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: + rc = vlr_subscr_handle_check_imei(vsub, &gsup); + break; default: /* Forward message towards MSC */ rc = vlr->ops.forward_gsup_msg(vsub, &gsup); diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index c249dff..41b8800 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -7,5 +7,6 @@ int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); +int vlr_subscr_tx_req_check_imei(const struct vlr_subscr *vsub); void vlr_subscr_update_tuples(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 8640d2b..a97e97a 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -653,6 +653,8 @@ OSMO_VALUE_STRING(VLR_ULA_E_ID_IMSI), OSMO_VALUE_STRING(VLR_ULA_E_ID_IMEI), OSMO_VALUE_STRING(VLR_ULA_E_ID_IMEISV), + OSMO_VALUE_STRING(VLR_ULA_E_HLR_IMEI_ACK), + OSMO_VALUE_STRING(VLR_ULA_E_HLR_IMEI_NACK), OSMO_VALUE_STRING(VLR_ULA_E_HLR_LU_RES), OSMO_VALUE_STRING(VLR_ULA_E_UPD_HLR_COMPL), OSMO_VALUE_STRING(VLR_ULA_E_LU_COMPL_SUCCESS), @@ -1229,9 +1231,17 @@ LU_COMPL_VLR_E_NEW_TMSI_ACK, NULL); break; case VLR_ULA_E_ID_IMEI: + /* Got the IMEI from ME, now send it to HLR */ + vlr_subscr_tx_req_check_imei(lfp->vsub); + break; + case VLR_ULA_E_HLR_IMEI_ACK: osmo_fsm_inst_dispatch(lfp->lu_compl_vlr_fsm, LU_COMPL_VLR_E_IMEI_CHECK_ACK, NULL); break; + case VLR_ULA_E_HLR_IMEI_NACK: + osmo_fsm_inst_dispatch(lfp->lu_compl_vlr_fsm, + LU_COMPL_VLR_E_IMEI_CHECK_NACK, NULL); + break; case VLR_ULA_E_LU_COMPL_SUCCESS: lu_fsm_discard_lu_compl_fsm(fi); @@ -1362,7 +1372,9 @@ S(VLR_ULA_E_LU_COMPL_FAILURE) | S(VLR_ULA_E_NEW_TMSI_ACK) | S(VLR_ULA_E_ID_IMEI) | - S(VLR_ULA_E_ID_IMEISV), + S(VLR_ULA_E_ID_IMEISV) | + S(VLR_ULA_E_HLR_IMEI_ACK) | + S(VLR_ULA_E_HLR_IMEI_NACK), .out_state_mask = S(VLR_ULA_S_DONE), .name = OSMO_STRINGIFY(VLR_ULA_S_WAIT_LU_COMPL), .action = lu_fsm_wait_lu_compl, diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 46dd9a1..f6f1ab6 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -573,9 +573,15 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -600,6 +606,192 @@ comment_end(); } +static void test_gsm_authen_imei_nack() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + comment_start(); + + net->authentication_required = true; + net->vlr->cfg.check_imei_rqd = true; + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("0508020081680001" + "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ + "089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* 5 auth vectors... */ + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + "0322" "2010" "12aca96fb4ffdea5c985cbafa9b6e18b" + "2104" "20bde240" "2208" "07fa7502e07e1c00" + "0322" "2010" "e7c03ba7cf0e2fde82b2dc4d63077d42" + "2104" "a29514ae" "2208" "e2b234f807886400" + "0322" "2010" "fa8f20b781b5881329d4fea26b1a3c51" + "2104" "5afc8d72" "2208" "2392f14f709ae000" + "0322" "2010" "0fd4cc8dbe8715d1f439e304edfd68dc" + "2104" "bc8d1c5b" "2208" "da7cdd6bfe2d7000", + NULL); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("If the HLR were to send a GSUP _UPDATE_LOCATION_RESULT we'd still reject"); + gsup_rx("06010809710000004026f0", NULL); + EXPECT_ACCEPTED(false); + + thwart_rx_non_initial_requests(); + + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0280102"); + ms_sends_msg("05542d8b2c3e"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804036470f1", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT, and we send an ID Request for the IMEI to the MS"); + dtap_expect_tx("051802"); + gsup_rx("06010809710000004026f0", NULL); + + btw("We will only do business when the IMEI is known"); + EXPECT_CONN_COUNT(1); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(vsub->imei[0], == 0, "%d"); + vlr_subscr_put(vsub); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); + ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + expect_bssap_clear(); + btw("HLR does not like the IMEI and sends NACK"); + gsup_rx("32010809710000004026f0510101", NULL); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} + +static void test_gsm_authen_imei_err() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + comment_start(); + + net->authentication_required = true; + net->vlr->cfg.check_imei_rqd = true; + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("0508020081680001" + "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ + "089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* 5 auth vectors... */ + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + "0322" "2010" "12aca96fb4ffdea5c985cbafa9b6e18b" + "2104" "20bde240" "2208" "07fa7502e07e1c00" + "0322" "2010" "e7c03ba7cf0e2fde82b2dc4d63077d42" + "2104" "a29514ae" "2208" "e2b234f807886400" + "0322" "2010" "fa8f20b781b5881329d4fea26b1a3c51" + "2104" "5afc8d72" "2208" "2392f14f709ae000" + "0322" "2010" "0fd4cc8dbe8715d1f439e304edfd68dc" + "2104" "bc8d1c5b" "2208" "da7cdd6bfe2d7000", + NULL); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("If the HLR were to send a GSUP _UPDATE_LOCATION_RESULT we'd still reject"); + gsup_rx("06010809710000004026f0", NULL); + EXPECT_ACCEPTED(false); + + thwart_rx_non_initial_requests(); + + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0280102"); + ms_sends_msg("05542d8b2c3e"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804036470f1", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT, and we send an ID Request for the IMEI to the MS"); + dtap_expect_tx("051802"); + gsup_rx("06010809710000004026f0", NULL); + + btw("We will only do business when the IMEI is known"); + EXPECT_CONN_COUNT(1); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(vsub->imei[0], == 0, "%d"); + vlr_subscr_put(vsub); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); + ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + expect_bssap_clear(); + btw("HLR can't parse the message and returns ERR"); + gsup_rx("31010809710000004026f0020160", NULL); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} + static void test_gsm_authen_tmsi_imei() { struct vlr_subscr *vsub; @@ -676,8 +868,14 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); @@ -998,6 +1196,8 @@ test_gsm_authen, test_gsm_authen_tmsi, test_gsm_authen_imei, + test_gsm_authen_imei_nack, + test_gsm_authen_imei_err, test_gsm_authen_tmsi_imei, test_gsm_milenage_authen, test_wrong_sres_length, diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index fddfe07..c69fde8 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1254,16 +1254,36 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for IMSI-901700000004620:MSISDN-46071 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1275,11 +1295,12 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1337,6 +1358,455 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 13 +===== test_gsm_authen_imei_nack +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM RAN_conn{RAN_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Updated ID +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: is child of RAN_conn(IMSI-901700000004620:GERAN-A-0:LU) +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Updated ID +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH +DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DVLR GSUP rx 191: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000004620) Received 5 auth tuples +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI-901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- If the HLR were to send a GSUP _UPDATE_LOCATION_RESULT we'd still reject +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Event VLR_ULA_E_HLR_LU_RES not permitted +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01 + lu_result_sent == 0 +- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI-901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804036470f1 +DVLR GSUP rx 17: 10010809710000004026f00804036470f1 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:46071 +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT, and we send an ID Request for the IMEI to the MS +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI +DMSC msc_tx 3 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A +- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802 +- DTAP matches expected message +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +- We will only do business when the IMEI is known + llist_count(&net->ran_conns) == 1 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 + vsub->imei[0] == 0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- MS replies with an Identity Response, VLR sends the IMEI to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 +DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR does not like the IMEI and sends NACK +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510101 +DVLR GSUP rx 14: 32010809710000004026f0510101 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_NACK +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_NACK +- sending LU Reject for IMSI-901700000004620:MSISDN-46071, cause 6 +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_FAILURE +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Deallocated +- sending LU Reject for IMSI-901700000004620:MSISDN-46071, cause 6 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +- BSSAP Clear --GERAN-A--> MS +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- BSS sends BSSMAP Clear Complete +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - release == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Removing from parent RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Deallocated +DRLL IMSI-901700000004620:MSISDN-46071: Freeing RAN connection +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 0 +DREF freeing VLR subscr IMSI-901700000004620:MSISDN-46071 +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Freeing instance +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Deallocated + llist_count(&net->ran_conns) == 0 +===== test_gsm_authen_imei_nack: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 13 + +===== test_gsm_authen_imei_err +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM RAN_conn{RAN_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Updated ID +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: LOCATION UPDATING REQUEST: MI=IMSI-901700000004620 LU-type=IMSI-ATTACH +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: is child of RAN_conn(IMSI-901700000004620:GERAN-A-0:LU) +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Updated ID +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3 +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH +DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DVLR GSUP rx 191: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000004620) Received 5 auth tuples +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI-901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- If the HLR were to send a GSUP _UPDATE_LOCATION_RESULT we'd still reject +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Event VLR_ULA_E_HLR_LU_RES not permitted +DREF VLR subscr IMSI-901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01 + lu_result_sent == 0 +- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI-901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A-0:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804036470f1 +DVLR GSUP rx 17: 10010809710000004026f00804036470f1 +DREF VLR subscr IMSI-901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:46071 +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT, and we send an ID Request for the IMEI to the MS +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A-0:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI +DMSC msc_tx 3 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A +- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802 +- DTAP matches expected message +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +- We will only do business when the IMEI is known + llist_count(&net->ran_conns) == 1 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 + vsub->imei[0] == 0 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- MS replies with an Identity Response, VLR sends the IMEI to HLR + MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) +DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 +DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR can't parse the message and returns ERR +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_ERROR: 31010809710000004026f0020160 +DVLR GSUP rx 14: 31010809710000004026f0020160 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071) Check_IMEI_VLR failed; gmm_cause: Invalid mandatory information +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_NACK +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_NACK +- sending LU Reject for IMSI-901700000004620:MSISDN-46071, cause 6 +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_FAILURE +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Deallocated +- sending LU Reject for IMSI-901700000004620:MSISDN-46071, cause 6 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +- BSSAP Clear --GERAN-A--> MS +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_ERROR: vlr_gsupc_read_cb() returns 0 +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- BSS sends BSSMAP Clear Complete +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - release == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Removing from parent RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU) +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_DONE}: Deallocated +DRLL IMSI-901700000004620:MSISDN-46071: Freeing RAN connection +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 0 +DREF freeing VLR subscr IMSI-901700000004620:MSISDN-46071 +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Freeing instance +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_RELEASED}: Deallocated + llist_count(&net->ran_conns) == 0 +===== test_gsm_authen_imei_err: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 13 + ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1485,22 +1955,41 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() -DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=1) +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100, with TMSI 0x03020100 -DREF IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index a641ec2..31b5f5d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -553,9 +553,15 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -758,8 +764,14 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 65e182c..914683f 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1192,16 +1192,36 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for IMSI-901700000004620:MSISDN-46071 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1213,11 +1233,12 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1651,22 +1672,41 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +ran_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() -DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=1) +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100, with TMSI 0x03020100 -DREF IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 3162149..d52d3d6 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -428,11 +428,15 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); /* 3GPP TS 23.003: 6.2.1 Composition of IMEI: the IMEI ends with a * spare digit that shall be sent as zero by the MS. */ ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -499,9 +503,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); @@ -652,9 +660,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); - expect_bssap_clear(); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + + btw("HLR accepts the IMEI"); + expect_bssap_clear(); + gsup_rx("32010809710000004026f0510100", NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -874,9 +886,13 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS replies with an Identity Response"); + btw("MS replies with an Identity Response, VLR sends the IMEI to HLR"); + gsup_expect_tx("30010809710000004026f050090824433224433224f0"); ms_sends_msg("0559084a32244332244302"); + btw("HLR accepts the IMEI"); + gsup_rx("32010809710000004026f0510100", NULL); + btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3e28468..3f6d8cd 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -933,16 +933,26 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for IMSI-901700000004620:MSISDN-46071 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -954,11 +964,12 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -1116,22 +1127,31 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() -DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=1) +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100, with TMSI 0x03020100 -DREF IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 @@ -1516,16 +1536,26 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for IMSI-901700000004620:MSISDN-46071 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) @@ -1537,11 +1567,12 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_UNUSED DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 -DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 - BSSAP Clear --GERAN-A--> MS -DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x100: release) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed lu_result_sent == 1 @@ -2091,22 +2122,31 @@ DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) DRLL subscr IMSI-901700000004620:MSISDN-46071: Message not permitted for initial conn: SMS:0x01 -- MS replies with an Identity Response +- MS replies with an Identity Response, VLR sends the IMEI to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) DMM IDENTITY RESPONSE: MI=IMEI-423423423423420 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420 DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI +DVLR GSUP tx: 30010809710000004026f050090824433224433224f0 +GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f0 +DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED +DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +- HLR accepts the IMEI +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f0510100 +DVLR GSUP rx 14: 32010809710000004026f0510100 +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 +DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_HLR_IMEI_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() -DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=1) +DVLR SUBSCR(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Updated ID DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100, with TMSI 0x03020100 -DREF IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100: MSC conn use - dtap == 0 (0x0: ) -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED -DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100:GERAN-A-0:LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED +DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSInew-0x03020100 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0 - a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl llist_count(&net->ran_conns) == 1 lu_result_sent == 1 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 13 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 11:58:35 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 11:58:35 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12572 ) Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12572/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12572/2//COMMIT_MSG at 9 PS2, Line 9: Prepare for transaction handling revamp in OsmoMSC: an enum is more are you planning to revamp transaction handling in OsmoMSC? I hope not any time soon, or we will end up in merge conflict hell! -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 11:58:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:00:22 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:00:22 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12577 Change subject: Enable SMS-related log in VLR tests ...................................................................... Enable SMS-related log in VLR tests The likely reason why it was disabled is due to paging_cb_mmsms_est_req() logging pointers which results in unstable log output. Fixing this allows us to track SMS-related regressions properly. Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 --- M src/libmsc/gsm_04_11.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 8 files changed, 590 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12577/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 15a92d4..8ef26a7 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -135,8 +135,7 @@ struct gsm_sms *sms = trans->sms.sms; int rc = 0; - DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u, " - "conn=%p, trans=%p)\n", hooknum, event, conn, trans); + DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u)\n", hooknum, event); if (hooknum != GSM_HOOK_RR_PAGING) return -EINVAL; diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index fddfe07..2bf19e0 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -270,8 +270,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -354,7 +363,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -374,19 +389,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -757,8 +792,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -841,7 +885,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -861,19 +911,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -1854,8 +1924,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1938,7 +2017,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1958,19 +2043,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 65e182c..8ed0d45 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -298,8 +298,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -407,7 +416,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -426,19 +441,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -838,8 +873,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -947,7 +991,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -966,19 +1016,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -2046,8 +2116,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -2145,7 +2224,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -2164,19 +2249,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) @@ -2536,8 +2641,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -2645,7 +2759,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -2664,19 +2784,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) @@ -3036,8 +3176,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -3140,7 +3289,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -3159,19 +3314,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 5372919..e09389c 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -461,8 +461,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -479,8 +488,17 @@ vsub->cs.is_paging == 1 - another request is added to the list but does not cause another paging DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 6 +DLSMS Going to send a MT SMS DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 7 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 already paged. llist_count(&vsub->cs.requests) == 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 6 @@ -489,10 +507,34 @@ - Total time passed: 11.000000 s DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 5 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4 DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 paging_stopped == 1 @@ -502,8 +544,17 @@ --- - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -524,7 +575,19 @@ DMM IMSI DETACH for IMSI-901700000004620:MSISDN-46071 DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3e28468..61ac09f 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -182,8 +182,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -224,7 +233,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -246,19 +261,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -541,8 +576,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -583,7 +627,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -605,19 +655,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index f5692b9..2147e84 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1215,8 +1215,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1253,7 +1262,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1280,19 +1295,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -1437,8 +1472,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1475,7 +1519,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1508,19 +1558,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 2 (0x28: cm_service,trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 2 (0xa: dtap,cm_service) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x8: cm_service) @@ -1680,8 +1750,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1718,7 +1797,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1743,19 +1828,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 18addc3..ee9eeba 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -287,8 +287,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000001) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -372,7 +381,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -392,19 +407,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -777,8 +812,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -877,7 +921,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -895,19 +945,39 @@ MSC <--UTRAN-Iu-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--UTRAN-Iu-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 44ecc50..296f055 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1023,9 +1023,9 @@ log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); if (cmdline_opts.verbose) { - log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); 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_use_color(osmo_stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:00:23 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:00:23 +0000 Subject: Change in osmo-msc[master]: SMS: remove code duplication in transaction init Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12578 Change subject: SMS: remove code duplication in transaction init ...................................................................... SMS: remove code duplication in transaction init Move code which allocates transaction for SMS and initializes corresponding FSM into separate function (shared by MT and MO code paths) to avoid code duplication and simplify further modifications. Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 --- M src/libmsc/gsm_04_11.c 1 file changed, 28 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12578/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 8ef26a7..4dc07bd 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1007,6 +1007,27 @@ return rc; } +static struct gsm_trans *gsm411_trans_init(struct gsm_network *net, struct vlr_subscr *vsub, struct ran_conn *conn, + uint8_t tid) +{ + /* Allocate a new transaction */ + struct gsm_trans *trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); + if (!trans) { + LOGP(DLSMS, LOGL_ERROR, "No memory for transaction\n"); + return NULL; + } + + /* Init both SMC and SMR state machines */ + gsm411_smc_init(&trans->sms.smc_inst, 0, 1, gsm411_mn_recv, gsm411_mm_send); + gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send); + + /* Associate transaction with connection */ + if (conn) + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); + + return trans; +} + static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net, struct vlr_subscr *vsub) { @@ -1023,24 +1044,15 @@ return NULL; } - /* Allocate a new transaction */ - trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); - if (!trans) { - LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); - return NULL; - } - - /* Init both SMC and SMR state machines */ - gsm411_smc_init(&trans->sms.smc_inst, 0, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, 0, 1, - gsm411_rl_recv, gsm411_mn_send); - /* Attempt to find an existing connection */ conn = connection_for_subscr(vsub); + + /* Allocate a new transaction */ + trans = gsm411_trans_init(net, vsub, conn, tid); + if (!trans) + return NULL; + if (conn) { - /* Associate transaction with connection */ - trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* Generate unique RP Message Reference */ trans->sms.sm_rp_mr = conn->next_rp_ref++; } @@ -1192,21 +1204,12 @@ } if (!trans) { - DEBUGP(DLSMS, " -> (new transaction)\n"); - trans = trans_alloc(conn->network, conn->vsub, - GSM48_PDISC_SMS, - transaction_id, new_callref++); + trans = gsm411_trans_init(conn->network, conn->vsub, conn, transaction_id); if (!trans) { - DEBUGP(DLSMS, " -> No memory for trans\n"); /* FIXME: send some error message */ return -ENOMEM; } - gsm411_smc_init(&trans->sms.smc_inst, 0, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, 0, 1, - gsm411_rl_recv, gsm411_mn_send); - trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ new_trans = 1; -- To view, visit https://gerrit.osmocom.org/12578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 Gerrit-Change-Number: 12578 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:02:46 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:02:46 +0000 Subject: Change in libosmocore[master]: Change GSM48_PDISC_* to enum type In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12572 ) Change subject: Change GSM48_PDISC_* to enum type ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12572/2/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12572/2/include/osmocom/gsm/protocol/gsm_04_08.h at 1355 PS2, Line 1355: enum osmo_pdisc { I do think some sort of layer name should be in there, just osmo_pdisc is too general. Given the value names I guess Vadim's choice is fair enough. But on a meta level let's first discuss your plans for osmo-msc. -- To view, visit https://gerrit.osmocom.org/12572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icbbe8786a776081d7643193f154e6270224399e6 Gerrit-Change-Number: 12572 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 12:02:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:04:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:04:33 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 1: Code-Review+1 nice! -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 16 Jan 2019 12:04:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:08:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:08:58 +0000 Subject: Change in osmo-msc[master]: SMS: remove code duplication in transaction init In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12578 ) Change subject: SMS: remove code duplication in transaction init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 Gerrit-Change-Number: 12578 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 Jan 2019 12:08:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:10:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:10:04 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12579 Change subject: Use transaction-specific debug macro ...................................................................... Use transaction-specific debug macro Move logging outside of trans_alloc() so the caller can use appropriate log subsystem. Log transaction allocation errors as such. Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 13 files changed, 60 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/12579/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 6e67f39..9d34ac1 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -9,6 +9,10 @@ #include #include +#define DEBUGTRAN(t, subsys, fmt, args ...) \ + DEBUGP(subsys, "(Ti %u, CRef 0x%X %s %s) " fmt, \ + t->transaction_id, t->callref, gsm48_pdisc_name(t->protocol), vlr_subscr_name(t->vsub), ## args) + enum bridge_state { BRIDGE_STATE_NONE, BRIDGE_STATE_LOOPBACK_PENDING, diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 7172184..3e7b3a9 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1931,7 +1931,7 @@ /* Create transaction */ trans = trans_alloc(net, vsub, GSM48_PDISC_CC, 0xff, data->callref); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); vlr_subscr_put(vsub); /* Ressource unavailable */ mncc_release_ind(net, NULL, data->callref, @@ -1939,6 +1939,7 @@ GSM48_CC_CAUSE_RESOURCE_UNAVAIL); return -ENOMEM; } + DEBUGTRAN(trans, DCC, "transaction allocated\n"); /* Find conn */ conn = connection_for_subscr(vsub); @@ -2129,12 +2130,14 @@ GSM48_PDISC_CC, transaction_id, new_callref++); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); rc = gsm48_tx_simple(conn, GSM48_PDISC_CC | (transaction_id << 4), GSM48_MT_CC_RELEASE_COMPL); return -ENOMEM; } + DEBUGTRAN(trans, DCC, "transaction allocated\n"); + /* Assign transaction */ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 4dc07bd..913678c 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -136,6 +136,7 @@ int rc = 0; DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u)\n", hooknum, event); + DEBUGTRAN(trans, DLSMS, "paging callback for MT SMS is triggered\n"); if (hooknum != GSM_HOOK_RR_PAGING) return -EINVAL; @@ -1017,6 +1018,8 @@ return NULL; } + DEBUGTRAN(trans, DLSMS, "transaction allocated\n"); + /* Init both SMC and SMR state machines */ gsm411_smc_init(&trans->sms.smc_inst, 0, 1, gsm411_mn_recv, gsm411_mm_send); gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 12bec9d..1d3cfd4 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -97,16 +97,16 @@ return -EINVAL; } - DEBUGP(DMM, " -> (new transaction)\n"); trans = trans_alloc(conn->network, conn->vsub, GSM48_PDISC_NC_SS, tid, new_callref++); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); gsm48_tx_simple(conn, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); return -ENOMEM; } + DEBUGTRAN(trans, DMM, "transaction allocated\n"); /* Count active NC SS/USSD sessions */ osmo_counter_inc(conn->network->active_nc_ss); @@ -298,9 +298,10 @@ trans = trans_alloc(net, vsub, GSM48_PDISC_NC_SS, 0xff, gsup_msg->session_id); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); return NULL; } + DEBUGTRAN(trans, DMM, "transaction allocated\n"); /* Count active NC SS/USSD sessions */ osmo_counter_inc(net->active_nc_ss); diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index df770ed..1ba01b7 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -109,14 +109,11 @@ /* a valid subscriber is indispensable */ if (vsub == NULL) { - LOGP(DCC, LOGL_NOTICE, + LOGP(DVLR, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n"); return NULL; } - DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction\n", - trans_id, vlr_subscr_name(vsub), callref); - trans = talloc_zero(tall_trans_ctx, struct gsm_trans); if (!trans) return NULL; diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index f190c31..9733e09 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -271,8 +271,8 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000001) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DCC (Ti 8, CRef 0x80000001 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) @@ -574,8 +574,8 @@ - after a while, MNCC asks us to setup a call, causing Paging DMNCC receive message MNCC_SETUP_REQ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 -DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DCC (Ti 255, CRef 0x423 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -960,8 +960,8 @@ - after a while, MNCC asks us to setup a call, causing Paging DMNCC receive message MNCC_SETUP_REQ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 -DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DCC (Ti 255, CRef 0x423 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1396,8 +1396,8 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000002) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DCC (Ti 8, CRef 0x80000002 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) @@ -1745,8 +1745,8 @@ DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) DCC Unknown transaction ID 8, creating new trans. -DCC (ti 08 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DCC (Ti 8, CRef 0x80000003 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 2bf19e0..b422f20 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -271,8 +271,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -364,6 +364,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -793,8 +794,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -886,6 +887,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -1925,8 +1927,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -2018,6 +2020,7 @@ DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) paging callback for MT SMS is triggered DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 8ed0d45..4bb185e 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -299,8 +299,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -417,6 +417,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -874,8 +875,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -992,6 +993,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -2117,8 +2119,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -2225,6 +2227,7 @@ DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) paging callback for MT SMS is triggered DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -2642,8 +2645,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000004 SMS IMSI-901700000004620:MSISDN-42342) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -2760,6 +2763,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000004 SMS IMSI-901700000004620:MSISDN-42342) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -3177,8 +3181,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000005 SMS IMSI-901700000004620:MSISDN-42342) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -3290,6 +3294,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000005 SMS IMSI-901700000004620:MSISDN-42342) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index e09389c..19d7984 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -462,8 +462,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -489,8 +489,8 @@ - another request is added to the list but does not cause another paging DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 6 DLSMS Going to send a MT SMS -DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 7 +DLSMS (Ti 1, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -508,6 +508,7 @@ DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING DLSMS SMC(0) MM layer is released DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE @@ -523,6 +524,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4 DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS (Ti 1, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING DLSMS SMC(0) MM layer is released DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE @@ -545,8 +547,8 @@ - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -576,6 +578,7 @@ DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING DLSMS SMC(0) MM layer is released DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 61ac09f..5163b6c 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -183,8 +183,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -234,6 +234,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -577,8 +578,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -628,6 +629,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 2147e84..2d4d4f7 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1216,8 +1216,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -1263,6 +1263,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -1473,8 +1474,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -1520,6 +1521,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -1751,8 +1753,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -1798,6 +1800,7 @@ DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index a801f9e..05805b9 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -150,9 +150,8 @@ DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service) DRLL Dispatching 04.08 message GSM0480_MTYPE_REGISTER (0xb:0x3b) DMM Received SS/USSD data (trans_id=8, msg_type=GSM0480_MTYPE_REGISTER) -DMM -> (new transaction) -DCC (ti 08 sub IMSI-901700000004620:MSISDN-46071 callref 20000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DMM (Ti 8, CRef 0x20000001 NCSS IMSI-901700000004620:MSISDN-46071) transaction allocated DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_nc_ss == 3 (0x4a: dtap,cm_service,trans_nc_ss) DMM IMSI-901700000004620:MSISDN-46071: rx msg GSM0480_MTYPE_REGISTER: received_cm_service_request changes to false DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - cm_service == 2 (0x42: dtap,trans_nc_ss) @@ -318,8 +317,8 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 DMSC Routed to GSM 09.11 SS/USSD handler DMM Establishing network-originated session -DCC (ti ff sub IMSI-901700000004620:MSISDN-46071 callref 20000101) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DMM (Ti 255, CRef 0x20000101 NCSS IMSI-901700000004620:MSISDN-46071) transaction allocated DMM Triggering Paging Request DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index ee9eeba..703b83f 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -288,8 +288,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000001) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -382,6 +382,7 @@ DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) paging callback for MT SMS is triggered DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data @@ -813,8 +814,8 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 DLSMS Going to send a MT SMS -DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE @@ -922,6 +923,7 @@ DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) +DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) paging callback for MT SMS is triggered DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:16:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:16:15 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11504/7/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/7/src/gsm/gsm0808_utils.c at 1450 PS7, Line 1450: bool exact_match) Is there any use-case where this would be called directly instead of gsm0808_cell_ids_match() and gsm0808_cell_id_matches_list()? If not than we can make this static as well. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 16 Jan 2019 12:16:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:24:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:24:52 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 1: Code-Review+1 (8 comments) potential additions... https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 89 PS1, Line 89: Equipment Identity Register "Core network element that stores and manages IMEI numbers"? (does it do something else?) https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 133 PS1, Line 133: International Mobile Equipment Identity; 14-digit unique identifier for the mobile phone plus a check digit (total digits: 15) - Mention "decimal" somehow? - modems also have IMEIs maybe "unique 14-digit decimal number to globally identify a mobile device"? To me it feels like "check digit" is a bit of a weird name. "checksum digit"? >From the recent osmo-hlr patches I remember that we're not always handling the IMEI in 15 digits, maybe "optionally with a 15th checksum digit"? https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 135 PS1, Line 135: IMEI software version; 14-digit unique identifier for the mobile phone plus two software version digits (total digits: 16) (same) https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 155 PS1, Line 155: Location Update in the specs usually "Location Updating" maybe add "Can be of type IMSI-Attach or Periodic. Procedure that indicates a subscriber's physical presence in a given radio cell." https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 244 PS1, Line 244: Proxy Visitor Location Register first time I hear of that, what does it do? https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 296 PS1, Line 296: Supplementary Services maybe add "textual dialog between subscriber and core network, e.g. '*#100#' -> 'Your extension is 1234'" https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 320 PS1, Line 320: Technical Specification heh https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 344 PS1, Line 344: Visitor Location Register "Volatile storage of attached subscribers in the MSC" -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 Jan 2019 12:24:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:27:28 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:27:28 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 28 PS3, Line 28: [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 > Done. Just to make clear, this is also used with "ASSERT_SEL(imei,..." in db_test.c. yes, but the unit test could easily just SEL by imsi again -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:27:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:32:22 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:32:22 +0000 Subject: Change in osmo-bsc[master]: LCLS: use Status for HO-COMPLETE message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12379 ) Change subject: LCLS: use Status for HO-COMPLETE message ...................................................................... Patch Set 2: Code-Review-2 reason: see libosmocore patch mentioned in the log -- To view, visit https://gerrit.osmocom.org/12379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab Gerrit-Change-Number: 12379 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 Jan 2019 12:32:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:38:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 12:38:53 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 1: Code-Review+1 (3 comments) I really like the idea of this patch! https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG at 7 PS1, Line 7: VLR The VTY itself has nothing to do with SMS, so it looks confusing. Rather say 'MSC/VTY' tests as they are combined. https://gerrit.osmocom.org/#/c/12577/1/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12577/1/tests/msc_vlr/msc_vlr_tests.c at 463 PS1, Line 463: test_categories I think it's a better place for tuning logging... https://gerrit.osmocom.org/#/c/12577/1/tests/msc_vlr/msc_vlr_tests.c at 1026 PS1, Line 1026: log_set_category_filter Please see my comment above. -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:38:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:40:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:40:54 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 1: (1 comment) Generally a good idea; - would prefer a LOG_TRANS(trans, LOGL_*, ...) that provides logging context for all log levels; and then replace all trans related logging with that. - Meta: generates merge conflicts with my inter-MSC efforts https://gerrit.osmocom.org/#/c/12579/1/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/12579/1/src/libmsc/gsm_09_11.c at 295 PS1, Line 295: DEBUGP(DMM, "Establishing network-originated session\n"); e.g. this could also use trans context -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:40:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:41:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:41:45 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG at 7 PS1, Line 7: VLR > The VTY itself has nothing to do with SMS, so it looks confusing. [?] VTY? -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:41:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:44:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 12:44:55 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12577/1//COMMIT_MSG at 7 PS1, Line 7: VLR > VTY? Oh, damn :/ I mean VLR of course. -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:44:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:45:09 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:45:09 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 1: (1 comment) > - would prefer a LOG_TRANS(trans, LOGL_*, ...) I thought about it too but so far there were no need to use anything but DEBUG and I'd rather not add dead code. > - Meta: generates merge conflicts with my inter-MSC efforts Is this available in some branch or gerrit submission? https://gerrit.osmocom.org/#/c/12579/1/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/12579/1/src/libmsc/gsm_09_11.c at 295 PS1, Line 295: DEBUGP(DMM, "Establishing network-originated session\n"); > e.g. [?] We don't have transaction at this point. -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:45:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:45:59 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:45:59 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12573 ) Change subject: Add function to combine nibbles into byte ...................................................................... Patch Set 2: Code-Review-1 I think this is API bloat. We do a lot of custom bit shifting and it's not something that needs API. Everyone knows how to compose a byte from two nibbles. We're not likely to replace all the nibbles-to-byte conversions with calls to this function. If you start like this, where will it lead? osmo_bytes_to_int16_t()? osmo_3bit_plus_5bit_to_byte()? -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 12:45:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:52:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:52:14 +0000 Subject: Change in libosmocore[master]: MNCC: move messages into public header and convert to enum In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12564 ) Change subject: MNCC: move messages into public header and convert to enum ...................................................................... Patch Set 1: Code-Review-2 (5 comments) I don't understand why you are coming up with this. https://gerrit.osmocom.org/#/c/12564/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12564/1//COMMIT_MSG at 7 PS1, Line 7: MNCC: move messages into public header and convert to enum why??? https://gerrit.osmocom.org/#/c/12564/1/include/osmocom/gsm/mncc.h File include/osmocom/gsm/mncc.h: https://gerrit.osmocom.org/#/c/12564/1/include/osmocom/gsm/mncc.h at 81 PS1, Line 81: GSM_TCHF_FRAME = 0x0300, rather first drop these along with RTP frame forwarding on mncc in a separate commit? https://gerrit.osmocom.org/#/c/12564/1/src/gsm/mncc.c File src/gsm/mncc.c: https://gerrit.osmocom.org/#/c/12564/1/src/gsm/mncc.c at a96 PS1, Line 96: silently dropping these https://gerrit.osmocom.org/#/c/12564/1/src/gsm/mncc.c at 37 PS1, Line 37: /* FIXME FIXME FIXME FIXME FIXME START */ this looked like it referred to the MNCC defines, now it's left behind on its own? doesn't look useful anyway. https://gerrit.osmocom.org/#/c/12564/1/src/gsm/mncc.c at 111 PS1, Line 111: /* FIXME FIXME FIXME FIXME FIXME END */ wtf :) -- To view, visit https://gerrit.osmocom.org/12564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie808b42871d3847b6b47964d9b0504b3c51c2fd0 Gerrit-Change-Number: 12564 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 Jan 2019 12:52:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:54:09 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:54:09 +0000 Subject: Change in osmo-msc[master]: MNCC: use explicit struct type in gsm_call In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12563 ) Change subject: MNCC: use explicit struct type in gsm_call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c Gerrit-Change-Number: 12563 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:54:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:54:26 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 12:54:26 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12573 ) Change subject: Add function to combine nibbles into byte ...................................................................... Patch Set 2: Code-Review-1 > I think this is API bloat. > If you start like this, where will it lead? Hehe, this reminds me the time when I was involved in web-development. jQuery has become so popular, so multiple funny questions from noobs began to appear on StackOverflow (not only), e.g.: how to sum two numbers using jQuery? :D So, in general I am agree with Neels. -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 Jan 2019 12:54:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:55:23 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 12:55:23 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helpers In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12492 ) Change subject: LCLS: add string dump helpers ...................................................................... Patch Set 8: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12492/8/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12492/8/src/gsm/gsm0808_utils.c at 597 PS8, Line 597: * \returns string representation of LCLS or NULL on error */ ignoring earlier review comment. I'm stopping the review right here. -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 Jan 2019 12:55:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:56:25 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:56:25 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Since the comments were about cosmetic changes (which could be addressed later on) and this patch adds test coverage to significant part of the code I'd rather get this merged right away. https://gerrit.osmocom.org/#/c/12577/1/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12577/1/tests/msc_vlr/msc_vlr_tests.c at 463 PS1, Line 463: test_categories > I think it's a better place for tuning logging... I've tried to use it but got weird error. Could be that I'm missing smth obvious but the essential part is to get SMS-related code covered by tests. Whether we do this via function call or extra struct field is rather minor implementation detail. -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 12:56:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:56:30 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:56:30 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Enable SMS-related log in VLR tests The likely reason why it was disabled is due to paging_cb_mmsms_est_req() logging pointers which results in unstable log output. Fixing this allows us to track SMS-related regressions properly. Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 --- M src/libmsc/gsm_04_11.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 8 files changed, 590 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, but someone else must approve Max: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 15a92d4..8ef26a7 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -135,8 +135,7 @@ struct gsm_sms *sms = trans->sms.sms; int rc = 0; - DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u, " - "conn=%p, trans=%p)\n", hooknum, event, conn, trans); + DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u)\n", hooknum, event); if (hooknum != GSM_HOOK_RR_PAGING) return -EINVAL; diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index c69fde8..6a67833 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -270,8 +270,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -354,7 +363,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -374,19 +389,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -757,8 +792,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -841,7 +885,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -861,19 +911,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -2343,8 +2413,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -2427,7 +2506,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -2447,19 +2532,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 914683f..af11385 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -298,8 +298,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -407,7 +416,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -426,19 +441,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -838,8 +873,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -947,7 +991,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -966,19 +1016,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -2086,8 +2156,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -2185,7 +2264,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -2204,19 +2289,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) @@ -2576,8 +2681,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -2685,7 +2799,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -2704,19 +2824,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) @@ -3076,8 +3216,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -3180,7 +3329,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -3199,19 +3354,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 5372919..e09389c 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -461,8 +461,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -479,8 +488,17 @@ vsub->cs.is_paging == 1 - another request is added to the list but does not cause another paging DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 6 +DLSMS Going to send a MT SMS DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 7 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 already paged. llist_count(&vsub->cs.requests) == 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 6 @@ -489,10 +507,34 @@ - Total time passed: 11.000000 s DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 5 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4 DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 1 paging_stopped == 1 @@ -502,8 +544,17 @@ --- - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -524,7 +575,19 @@ DMM IMSI DETACH for IMSI-901700000004620:MSISDN-46071 DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1) +DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING +DLSMS SMC(0) MM layer is released +DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE +DLSMS MNSMS-ERROR-IND, no cause +DLSMS SMR(0) message MNSMS-ERROR-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) TX SMS MNSMS-ERROR-IND +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state IDLE DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4 +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3f6d8cd..96d1ad7 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -182,8 +182,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -224,7 +233,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -246,19 +261,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -541,8 +576,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 @@ -583,7 +627,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -605,19 +655,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index f5692b9..2147e84 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1215,8 +1215,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1253,7 +1262,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1280,19 +1295,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) @@ -1437,8 +1472,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1475,7 +1519,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1508,19 +1558,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 2 (0x28: cm_service,trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:CM_SERVICE_REQ){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 2 (0xa: dtap,cm_service) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x8: cm_service) @@ -1680,8 +1750,17 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -1718,7 +1797,13 @@ DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1743,19 +1828,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 18addc3..ee9eeba 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -287,8 +287,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000001) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -372,7 +381,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -392,19 +407,39 @@ MSC <--GERAN-A-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--GERAN-A-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via GERAN-A - DTAP --GERAN-A--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) @@ -777,8 +812,17 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3 +DLSMS Going to send a MT SMS DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000002) New transaction DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4 +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 due to MMSMS_EST_REQ DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging. UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 @@ -877,7 +921,13 @@ DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0) DPAG Calling paging cbfn. +DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -895,19 +945,39 @@ MSC <--UTRAN-Iu-- MS: SMS:0x04 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x04) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms) llist_count(&net->ran_conns) == 1 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that MSC <--UTRAN-Iu-- MS: SMS:0x01 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DLSMS receiving data (trans_id=0, msg_type=SMS:0x01) DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu-42:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS sending CP message (trans=0) +DLSMS GSM4.11 TX 09 04 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 via UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 - DTAP matches expected message +DLSMS MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 3 +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS Got MMSMS_REL_REQ, destroying transaction. +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage decreases to: 2 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap) DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 44ecc50..296f055 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1023,9 +1023,9 @@ log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); if (cmdline_opts.verbose) { - log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); 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_use_color(osmo_stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 12:56:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 12:56:59 +0000 Subject: Change in osmo-msc[master]: MNCC: use explicit struct type in gsm_call In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12563 ) Change subject: MNCC: use explicit struct type in gsm_call ...................................................................... MNCC: use explicit struct type in gsm_call There's no need to use 'void *' because we have forward declaration for 'struct gsm_network' in the very same header. Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c --- M include/osmocom/msc/mncc.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index d2f0541..a9be004 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -38,7 +38,7 @@ struct llist_head entry; /* network handle */ - void *net; + struct gsm_network *net; /* the 'local' transaction */ uint32_t callref; -- To view, visit https://gerrit.osmocom.org/12563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5078ffcf2706adaca1b5df107f8b6a44062ca28c Gerrit-Change-Number: 12563 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:02:07 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:02:07 +0000 Subject: Change in osmo-msc[master]: Enable SMS-related log in VLR tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12577 ) Change subject: Enable SMS-related log in VLR tests ...................................................................... Patch Set 2: > Change has been successfully rebased and submitted as > 4813152691df910f9dbdb05d9e418be106c2cd14 by Max > Since the comments were about cosmetic changes > (which could be addressed later on) [...] Why not to address them before merging? At least the commit description could be modified. Was it a critical fix that required immediate merge? No. -- To view, visit https://gerrit.osmocom.org/12577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44ae817d9edb73d182ff33ff5a2fd942e224e344 Gerrit-Change-Number: 12577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 13:02:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:09:38 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 13:09:38 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... Patch Set 1: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 9 PS1, Line 9: This simplifies tests refactoring by showing exact byte where mismatch that's good. What I don't like is that msgb_eq_data_print() logs a multiline string to the osmo logging -- that's technically not allowed. I thought I had placed that review before merging. https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 10 PS1, Line 10: happened. It also makes code more readable. That's a personal preference at best. https://gerrit.osmocom.org/#/c/12571/1/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12571/1/tests/msc_vlr/msc_vlr_tests.c at 573 PS1, Line 573: uint8_t buf[OSMO_GSUP_MAX_MSISDN_LEN * OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; completely unrelated constants. Just use 4096 or 1024... https://gerrit.osmocom.org/#/c/12571/1/tests/msc_vlr/msc_vlr_tests.c at 579 PS1, Line 579: OSMO_ASSERT(gsup_tx_expected); OSMO_ASSERT(strlen(gsup_tx_expected) <= (sizeof(buf) * 2)); -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 13:09:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:21 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: use bool in sched_trx_reset() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12580 Change subject: trxcon/sched_trx.c: use bool in sched_trx_reset() ...................................................................... trxcon/sched_trx.c: use bool in sched_trx_reset() Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h M src/host/trxcon/trxcon.c 4 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/12580/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 02aa3fa..a2ced46 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -345,7 +345,7 @@ band_arfcn &~ ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ - sched_trx_reset(l1l->trx, 1); + sched_trx_reset(l1l->trx, true); /* Configure a single timeslot */ sched_trx_configure_ts(l1l->trx, 0, ch_config); @@ -431,7 +431,7 @@ /* Fall through */ case L1CTL_RES_T_SCHED: - sched_trx_reset(l1l->trx, 1); + sched_trx_reset(l1l->trx, true); break; default: LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n"); @@ -674,7 +674,7 @@ "switching back to CCCH\n"); /* Reset scheduler */ - sched_trx_reset(l1l->trx, 0); + sched_trx_reset(l1l->trx, false); msgb_free(msg); return 0; diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 19d1fe8..18516d3 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -2,7 +2,7 @@ * OsmocomBB <-> SDR connection bridge * TDMA scheduler: GSM PHY routines * - * (C) 2017 by Vadim Yanitskiy + * (C) 2017-2019 by Vadim Yanitskiy * * All Rights Reserved * @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -160,7 +161,7 @@ return 0; } -int sched_trx_reset(struct trx_instance *trx, int reset_clock) +int sched_trx_reset(struct trx_instance *trx, bool reset_clock) { int i; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index b7236d5..f914eee 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -263,7 +263,7 @@ /* Scheduler management functions */ int sched_trx_init(struct trx_instance *trx, uint32_t fn_advance); -int sched_trx_reset(struct trx_instance *trx, int reset_clock); +int sched_trx_reset(struct trx_instance *trx, bool reset_clock); int sched_trx_shutdown(struct trx_instance *trx); /* Timeslot management functions */ diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 251321d..874f893 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -93,7 +93,7 @@ if (app_data.trx->fsm->state != TRX_STATE_OFFLINE) { /* Reset scheduler and clock counter */ - sched_trx_reset(app_data.trx, 1); + sched_trx_reset(app_data.trx, true); /* TODO: implement trx_if_reset() */ trx_if_cmd_poweroff(app_data.trx); -- To view, visit https://gerrit.osmocom.org/12580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc Gerrit-Change-Number: 12580 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:22 +0000 Subject: Change in osmocom-bb[master]: trxcon: do not include trxcon.h everywhere Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12581 Change subject: trxcon: do not include trxcon.h everywhere ...................................................................... trxcon: do not include trxcon.h everywhere Change-Id: Ia78bd6dac7ab12970838e0b1a2929a106b898d9d --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_lchan_rach.c M src/host/trxcon/sched_lchan_sch.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_lchan_xcch.c 9 files changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/12581/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index a2ced46..0b6d75a 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -38,7 +38,6 @@ #include #include -#include "trxcon.h" #include "logging.h" #include "l1ctl_link.h" #include "l1ctl_proto.h" diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index d4054c9..66477b2 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -41,7 +41,6 @@ #include "scheduler.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 540a57f..921c466 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -42,7 +42,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */ diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c index 1a8987b..aa9cb6a 100644 --- a/src/host/trxcon/sched_lchan_pdtch.c +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index a255efb..ecf5df8 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" /** diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c index 1b241a0..e1977e1 100644 --- a/src/host/trxcon/sched_lchan_sch.c +++ b/src/host/trxcon/sched_lchan_sch.c @@ -40,7 +40,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info) diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index 09d504f..5bebe49 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -40,7 +40,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c index 7fb2809..5b7daa3 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -43,7 +43,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" static const uint8_t tch_h0_traffic_block_map[3][4] = { diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index b31f727..825fc58 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, -- To view, visit https://gerrit.osmocom.org/12581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia78bd6dac7ab12970838e0b1a2929a106b898d9d Gerrit-Change-Number: 12581 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if: refactor trx_if_open() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12582 Change subject: trxcon/trx_if: refactor trx_if_open() ...................................................................... trxcon/trx_if: refactor trx_if_open() Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h M src/host/trxcon/trxcon.c 3 files changed, 23 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/12582/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 982fb40..108f58b 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -626,52 +626,47 @@ return 0; } -/* - * Open/close OsmoTRX connection - */ - -int trx_if_open(struct trx_instance **trx, const char *local_host, - const char *remote_host, uint16_t port) +/* Init TRX interface (TRXC, TRXD sockets and FSM) */ +struct trx_instance *trx_if_open(void *tall_ctx, + const char *local_host, const char *remote_host, uint16_t port) { - struct trx_instance *trx_new; + struct trx_instance *trx; int rc; LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface\n"); /* Try to allocate memory */ - trx_new = talloc_zero(tall_trx_ctx, struct trx_instance); - if (!trx_new) { + trx = talloc_zero(tall_ctx, struct trx_instance); + if (!trx) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate memory\n"); - return -ENOMEM; + return NULL; } /* Initialize CTRL queue */ - INIT_LLIST_HEAD(&trx_new->trx_ctrl_list); + INIT_LLIST_HEAD(&trx->trx_ctrl_list); /* Open sockets */ - rc = trx_udp_open(trx_new, &trx_new->trx_ofd_ctrl, local_host, + rc = trx_udp_open(trx, &trx->trx_ofd_ctrl, local_host, port + 101, remote_host, port + 1, trx_ctrl_read_cb); if (rc < 0) - goto error; + goto udp_error; - rc = trx_udp_open(trx_new, &trx_new->trx_ofd_data, local_host, + rc = trx_udp_open(trx, &trx->trx_ofd_data, local_host, port + 102, remote_host, port + 2, trx_data_rx_cb); if (rc < 0) - goto error; + goto udp_error; /* Allocate a new dedicated state machine */ osmo_fsm_register(&trx_fsm); - trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new, + trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, NULL, LOGL_DEBUG, "trx_interface"); - *trx = trx_new; + return trx; - return 0; - -error: +udp_error: LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); - talloc_free(trx_new); - return rc; + talloc_free(trx); + return NULL; } /* Flush pending control messages */ diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index d551252..0b3f36f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -52,8 +52,8 @@ int cmd_len; }; -int trx_if_open(struct trx_instance **trx, const char *local_host, - const char *remote_host, uint16_t port); +struct trx_instance *trx_if_open(void *tall_ctx, + const char *local_host, const char *remote_host, uint16_t port); void trx_if_flush_ctrl(struct trx_instance *trx); void trx_if_close(struct trx_instance *trx); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 874f893..501d0c7 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -284,9 +284,10 @@ goto exit; /* Init transceiver interface */ - rc = trx_if_open(&app_data.trx, - app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); - if (rc) + app_data.trx = trx_if_open(tall_trx_ctx, + app_data.trx_bind_ip, app_data.trx_remote_ip, + app_data.trx_base_port); + if (!app_data.trx) goto exit; /* Bind L1CTL with TRX and vice versa */ -- To view, visit https://gerrit.osmocom.org/12582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c Gerrit-Change-Number: 12582 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: refactor l1ctl_link_init() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12583 Change subject: trxcon/l1ctl_link.c: refactor l1ctl_link_init() ...................................................................... trxcon/l1ctl_link.c: refactor l1ctl_link_init() Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/l1ctl_link.h M src/host/trxcon/trxcon.c 3 files changed, 16 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/12583/1 diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 20cb70c..6d6e356 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -229,53 +229,51 @@ return 0; } -int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path) +struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path) { - struct l1ctl_link *l1l_new; + struct l1ctl_link *l1l; struct osmo_fd *bfd; int rc; LOGP(DL1C, LOGL_NOTICE, "Init L1CTL link (%s)\n", sock_path); - l1l_new = talloc_zero(tall_trx_ctx, struct l1ctl_link); - if (!l1l_new) { + l1l = talloc_zero(tall_ctx, struct l1ctl_link); + if (!l1l) { LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory\n"); - return -ENOMEM; + return NULL; } /* Create a socket and bind handlers */ - bfd = &l1l_new->listen_bfd; + bfd = &l1l->listen_bfd; rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n", strerror(errno)); - talloc_free(l1l_new); - return rc; + talloc_free(l1l); + return NULL; } /* Bind shutdown handler */ - l1l_new->shutdown_cb = l1ctl_shutdown_cb; + l1l->shutdown_cb = l1ctl_shutdown_cb; /* Bind connection handler */ bfd->cb = l1ctl_link_accept; bfd->when = BSC_FD_READ; - bfd->data = l1l_new; + bfd->data = l1l; /** * To be able to accept first connection and * drop others, it should be set to -1 */ - l1l_new->wq.bfd.fd = -1; + l1l->wq.bfd.fd = -1; /* Allocate a new dedicated state machine */ osmo_fsm_register(&l1ctl_fsm); - l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new, + l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, NULL, LOGL_DEBUG, "l1ctl_link"); - *l1l = l1l_new; - - return 0; + return l1l; } void l1ctl_link_shutdown(struct l1ctl_link *l1l) diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/l1ctl_link.h index 01103dc..da64419 100644 --- a/src/host/trxcon/l1ctl_link.h +++ b/src/host/trxcon/l1ctl_link.h @@ -41,7 +41,7 @@ void (*shutdown_cb)(struct l1ctl_link *l1l); }; -int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path); +struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path); void l1ctl_link_shutdown(struct l1ctl_link *l1l); int l1ctl_link_send(struct l1ctl_link *l1l, struct msgb *msg); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 501d0c7..777138f 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -279,8 +279,8 @@ NULL, LOGL_DEBUG, "main"); /* Init L1CTL server */ - rc = l1ctl_link_init(&app_data.l1l, app_data.bind_socket); - if (rc) + app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket); + if (app_data.l1l == NULL) goto exit; /* Init transceiver interface */ -- To view, visit https://gerrit.osmocom.org/12583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b Gerrit-Change-Number: 12583 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:23 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not share tall_trx_ctx Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12584 Change subject: trxcon/trxcon.h: do not share tall_trx_ctx ...................................................................... trxcon/trxcon.h: do not share tall_trx_ctx Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 --- M src/host/trxcon/logging.c M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/12584/1 diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c index 6a3043b..b12df51 100644 --- a/src/host/trxcon/logging.c +++ b/src/host/trxcon/logging.c @@ -26,7 +26,8 @@ #include #include "logging.h" -#include "trxcon.h" + +extern void *tall_trxcon_ctx; static struct log_info_cat trx_log_info_cat[] = { [DAPP] = { @@ -80,7 +81,7 @@ int trx_log_init(const char *category_mask) { - osmo_init_logging2(tall_trx_ctx, &trx_log_info); + osmo_init_logging2(tall_trxcon_ctx, &trx_log_info); if (category_mask) log_parse_category_mask(osmo_stderr_target, category_mask); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 777138f..500d7e7 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -74,7 +74,7 @@ uint32_t trx_fn_advance; } app_data; -void *tall_trx_ctx = NULL; +void *tall_trxcon_ctx = NULL; struct osmo_fsm_inst *trxcon_fsm; static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, @@ -242,7 +242,7 @@ case SIGABRT: case SIGUSR1: case SIGUSR2: - talloc_report_full(tall_trx_ctx, stderr); + talloc_report_full(tall_trxcon_ctx, stderr); break; default: break; @@ -261,8 +261,8 @@ talloc_enable_null_tracking(); /* Init talloc memory management system */ - tall_trx_ctx = talloc_init("trxcon context"); - msgb_talloc_ctx_init(tall_trx_ctx, 0); + tall_trxcon_ctx = talloc_init("trxcon context"); + msgb_talloc_ctx_init(tall_trxcon_ctx, 0); /* Setup signal handlers */ signal(SIGINT, &signal_handler); @@ -275,7 +275,7 @@ /* Allocate the application state machine */ osmo_fsm_register(&trxcon_fsm_def); - trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trx_ctx, + trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); /* Init L1CTL server */ @@ -331,8 +331,8 @@ * Print report for the root talloc context in order * to be able to find and fix potential memory leaks. */ - talloc_report_full(tall_trx_ctx, stderr); - talloc_free(tall_trx_ctx); + talloc_report_full(tall_trxcon_ctx, stderr); + talloc_free(tall_trxcon_ctx); /* Make both Valgrind and ASAN happy */ talloc_report_full(NULL, stderr); diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index 65b5e85..f66a628 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -3,7 +3,6 @@ #define GEN_MASK(state) (0x01 << state) extern struct osmo_fsm_inst *trxcon_fsm; -extern void *tall_trx_ctx; enum trxcon_fsm_states { TRXCON_STATE_IDLE = 0, -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:23 +0000 Subject: Change in osmocom-bb[master]: trxcon: refactor finite state machine hierarchy Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12585 Change subject: trxcon: refactor finite state machine hierarchy ...................................................................... trxcon: refactor finite state machine hierarchy Change-Id: I035b2cb701e2d0b3fedec4d569507b79d400df5b --- M src/host/trxcon/Makefile.am M src/host/trxcon/l1ctl_link.c M src/host/trxcon/trx_if.c M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h A src/host/trxcon/trxcon_fsm.c 6 files changed, 160 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/12585/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index b51db02..7c6c270 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -27,6 +27,7 @@ trx_if.c \ logging.c \ trxcon.c \ + trxcon_fsm.c \ $(NULL) # Scheduler diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 6d6e356..abcf82c 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -176,8 +176,8 @@ return -1; } - osmo_fsm_inst_dispatch(trxcon_fsm, L1CTL_EVENT_CONNECT, l1l); osmo_fsm_inst_state_chg(l1l->fsm, L1CTL_STATE_CONNECTED, 0, 0); + osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_L1CTL_CONNECT, NULL); LOGP(DL1C, LOGL_NOTICE, "L1CTL has a new connection\n"); @@ -223,8 +223,8 @@ /* Clear pending messages */ osmo_wqueue_clear(&l1l->wq); - osmo_fsm_inst_dispatch(trxcon_fsm, L1CTL_EVENT_DISCONNECT, l1l); osmo_fsm_inst_state_chg(l1l->fsm, L1CTL_STATE_IDLE, 0, 0); + osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_L1CTL_DISCONNECT, NULL); return 0; } diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 108f58b..33970f3 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -173,7 +173,7 @@ if (++tcm->retry_cnt > 3) { LOGP(DTRX, LOGL_NOTICE, "Transceiver offline\n"); osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_OFFLINE, 0, 0); - osmo_fsm_inst_dispatch(trxcon_fsm, TRX_EVENT_OFFLINE, trx); + osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_TRX_DISCONNECT, NULL); return; } @@ -514,7 +514,7 @@ rsp_error: /* Notify higher layers about the problem */ - osmo_fsm_inst_dispatch(trxcon_fsm, TRX_EVENT_RSP_ERROR, trx); + osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_TRX_CTRL_ERROR, NULL); return -EIO; } diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 500d7e7..dda0a00 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -1,7 +1,7 @@ /* * OsmocomBB <-> SDR connection bridge * - * (C) 2016-2017 by Vadim Yanitskiy + * (C) 2016-2019 by Vadim Yanitskiy * * All Rights Reserved * @@ -77,72 +77,6 @@ void *tall_trxcon_ctx = NULL; struct osmo_fsm_inst *trxcon_fsm; -static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, - uint32_t event, void *data) -{ - if (event == L1CTL_EVENT_CONNECT) - osmo_fsm_inst_state_chg(trxcon_fsm, TRXCON_STATE_MANAGED, 0, 0); -} - -static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi, - uint32_t event, void *data) -{ - switch (event) { - case L1CTL_EVENT_DISCONNECT: - osmo_fsm_inst_state_chg(trxcon_fsm, TRXCON_STATE_IDLE, 0, 0); - - if (app_data.trx->fsm->state != TRX_STATE_OFFLINE) { - /* Reset scheduler and clock counter */ - sched_trx_reset(app_data.trx, true); - - /* TODO: implement trx_if_reset() */ - trx_if_cmd_poweroff(app_data.trx); - trx_if_cmd_echo(app_data.trx); - } - break; - case TRX_EVENT_RSP_ERROR: - case TRX_EVENT_OFFLINE: - /* TODO: notify L2 & L3 about that */ - break; - default: - LOGPFSML(fi, LOGL_ERROR, "Unhandled event %u\n", event); - } -} - -static struct osmo_fsm_state trxcon_fsm_states[] = { - [TRXCON_STATE_IDLE] = { - .in_event_mask = GEN_MASK(L1CTL_EVENT_CONNECT), - .out_state_mask = GEN_MASK(TRXCON_STATE_MANAGED), - .name = "IDLE", - .action = trxcon_fsm_idle_action, - }, - [TRXCON_STATE_MANAGED] = { - .in_event_mask = ( - GEN_MASK(L1CTL_EVENT_DISCONNECT) | - GEN_MASK(TRX_EVENT_RSP_ERROR) | - GEN_MASK(TRX_EVENT_OFFLINE)), - .out_state_mask = GEN_MASK(TRXCON_STATE_IDLE), - .name = "MANAGED", - .action = trxcon_fsm_managed_action, - }, -}; - -static const struct value_string app_evt_names[] = { - OSMO_VALUE_STRING(L1CTL_EVENT_CONNECT), - OSMO_VALUE_STRING(L1CTL_EVENT_DISCONNECT), - OSMO_VALUE_STRING(TRX_EVENT_OFFLINE), - OSMO_VALUE_STRING(TRX_EVENT_RSP_ERROR), - { 0, NULL } -}; - -static struct osmo_fsm trxcon_fsm_def = { - .name = "trxcon_app_fsm", - .states = trxcon_fsm_states, - .num_states = ARRAY_SIZE(trxcon_fsm_states), - .log_subsys = DAPP, - .event_names = app_evt_names, -}; - static void print_usage(const char *app) { printf("Usage: %s\n", app); @@ -273,18 +207,19 @@ /* Init logging system */ trx_log_init(app_data.debug_mask); - /* Allocate the application state machine */ - osmo_fsm_register(&trxcon_fsm_def); - trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx, - NULL, LOGL_DEBUG, "main"); + /* Allocate a trxcon machine */ + trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, + tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); + if (trxcon_fsm == NULL) + goto exit; /* Init L1CTL server */ - app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket); + app_data.l1l = l1ctl_link_init(tall_trxcon_ctx, app_data.bind_socket); if (app_data.l1l == NULL) goto exit; /* Init transceiver interface */ - app_data.trx = trx_if_open(tall_trx_ctx, + app_data.trx = trx_if_open(tall_trxcon_ctx, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); if (!app_data.trx) @@ -322,7 +257,8 @@ trx_if_close(app_data.trx); /* Shutdown main state machine */ - osmo_fsm_inst_free(trxcon_fsm); + if (trxcon_fsm != NULL) + osmo_fsm_inst_free(trxcon_fsm); /* Deinitialize logging */ log_fini(); diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index f66a628..37be9f5 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -2,19 +2,41 @@ #define GEN_MASK(state) (0x01 << state) +extern const struct value_string trxcon_fsm_event_names[]; extern struct osmo_fsm_inst *trxcon_fsm; +extern struct osmo_fsm trxcon_fsm_def; -enum trxcon_fsm_states { +enum trxcon_fsm_state_type { TRXCON_STATE_IDLE = 0, TRXCON_STATE_MANAGED, }; -enum trxcon_fsm_events { - /* L1CTL specific events */ - L1CTL_EVENT_CONNECT, - L1CTL_EVENT_DISCONNECT, +enum trxcon_event_type { + /* Events coming from L1CTL interface */ + TRXCON_E_L1CTL_DISCONNECT, /*!< L1CTL interface has lost a connection */ + TRXCON_E_L1CTL_CONNECT, /*!< L1CTL interface has got a connection */ + TRXCON_E_L1CTL_REQ, /*!< L1CTL request message from a client */ - /* TRX specific events */ - TRX_EVENT_RSP_ERROR, - TRX_EVENT_OFFLINE, + /* Events coming from TRX interface */ + TRXCON_E_TRX_DISCONNECT, /*!< TRX interface has lost connection */ + TRXCON_E_TRX_CTRL_ERROR, /*!< TRXC (CTRL) error from transceiver */ + TRXCON_E_TRX_CTRL_RSP, /*!< TRXC (CTRL) response from transceiver */ + TRXCON_E_TRX_DL_BURST, /*!< TRXD (DATA) DL burst from transceiver */ + + /* Events coming from scheduler */ + TRXCON_E_SCHED_CLCK_LOSS, /*!< No more clock from transceiver */ + TRXCON_E_SCHED_DT_IND, /*!< Decoded DL L2 frame from scheduler */ + TRXCON_E_SCHED_DT_CONF, /*!< Confirmation that an UL frame has been sent */ +}; + +struct trxcon { + /* FSM of this trxcon, see trxcon_fsm_def */ + struct osmo_fsm_inst *fsm; + + /* Connection with transceiver */ + struct trx_if *trx_if; + /* L1CTL server link */ + struct l1ctl_link *l1ctl_link; + /* L1CTL client connection */ + struct l1ctl_conn *l1ctl_conn; }; diff --git a/src/host/trxcon/trxcon_fsm.c b/src/host/trxcon/trxcon_fsm.c new file mode 100644 index 0000000..fe8c853 --- /dev/null +++ b/src/host/trxcon/trxcon_fsm.c @@ -0,0 +1,115 @@ +/* + * OsmocomBB <-> SDR connection bridge + * trxcon state machine definition + * + * (C) 2019 by Vadim Yanitskiy + * + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +#include +#include + +static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + /** + * TODO: associate trxcon->l1ctl_conn with this conn + */ + if (event == TRXCON_E_L1CTL_CONNECT) + osmo_fsm_inst_state_chg(fi, TRXCON_STATE_MANAGED, 0, 0); +} + +static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + switch ((enum trxcon_event_type) event) { + case TRXCON_E_L1CTL_DISCONNECT: + /* TODO: reset TRX interface */ + osmo_fsm_inst_state_chg(fi, TRXCON_STATE_IDLE, 0, 0); + break; + case TRXCON_E_TRX_DISCONNECT: + /* TODO: notify L1CTL interface */ + osmo_fsm_inst_state_chg(fi, TRXCON_STATE_IDLE, 0, 0); + break; + default: + LOGPFSML(fi, LOGL_ERROR, "Unhandled event '%s'\n", + get_value_string(trxcon_fsm_event_names, event)); + } +} + +/* Generates mask for a single state or event */ +#define S(x) (1 << x) + +static const struct osmo_fsm_state trxcon_fsm_states[] = { + [TRXCON_STATE_IDLE] = { + .name = "IDLE", + .out_state_mask = S(TRXCON_STATE_MANAGED), + .in_event_mask = S(TRXCON_E_L1CTL_CONNECT), + .action = &trxcon_fsm_idle_action, + }, + [TRXCON_STATE_MANAGED] = { + .name = "MANAGED", + .out_state_mask = S(TRXCON_STATE_IDLE), + .in_event_mask = S(TRXCON_E_L1CTL_DISCONNECT) + | S(TRXCON_E_L1CTL_CONNECT) + | S(TRXCON_E_L1CTL_REQ) + | S(TRXCON_E_TRX_DISCONNECT) + | S(TRXCON_E_TRX_CTRL_ERROR) + | S(TRXCON_E_TRX_CTRL_RSP) + | S(TRXCON_E_TRX_DL_BURST) + | S(TRXCON_E_SCHED_CLCK_LOSS) + | S(TRXCON_E_SCHED_DT_IND) + | S(TRXCON_E_SCHED_DT_CONF), + .action = &trxcon_fsm_managed_action, + }, +}; + +const struct value_string trxcon_fsm_event_names[] = { + OSMO_VALUE_STRING(TRXCON_E_L1CTL_DISCONNECT), + OSMO_VALUE_STRING(TRXCON_E_L1CTL_CONNECT), + OSMO_VALUE_STRING(TRXCON_E_L1CTL_REQ), + + OSMO_VALUE_STRING(TRXCON_E_TRX_DISCONNECT), + OSMO_VALUE_STRING(TRXCON_E_TRX_CTRL_ERROR), + OSMO_VALUE_STRING(TRXCON_E_TRX_CTRL_RSP), + OSMO_VALUE_STRING(TRXCON_E_TRX_DL_BURST), + + OSMO_VALUE_STRING(TRXCON_E_SCHED_CLCK_LOSS), + OSMO_VALUE_STRING(TRXCON_E_SCHED_DT_IND), + OSMO_VALUE_STRING(TRXCON_E_SCHED_DT_CONF), + + { 0, NULL } +}; + +struct osmo_fsm trxcon_fsm_def = { + .name = "trxcon_fsm", + .states = trxcon_fsm_states, + .num_states = ARRAY_SIZE(trxcon_fsm_states), + .event_names = trxcon_fsm_event_names, + .log_subsys = DAPP, +}; + +static __attribute__((constructor)) void on_dso_load(void) +{ + /* Register our FSM */ + OSMO_ASSERT(osmo_fsm_register(&trxcon_fsm_def) == 0); +} -- To view, visit https://gerrit.osmocom.org/12585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I035b2cb701e2d0b3fedec4d569507b79d400df5b Gerrit-Change-Number: 12585 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:23 +0000 Subject: Change in osmocom-bb[master]: trxcon: register both l1ctl_fsm and trx_fsm on DSO load Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12586 Change subject: trxcon: register both l1ctl_fsm and trx_fsm on DSO load ...................................................................... trxcon: register both l1ctl_fsm and trx_fsm on DSO load Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/trx_if.c 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/12586/1 diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index abcf82c..f2b031e 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -269,7 +269,6 @@ l1l->wq.bfd.fd = -1; /* Allocate a new dedicated state machine */ - osmo_fsm_register(&l1ctl_fsm); l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, NULL, LOGL_DEBUG, "l1ctl_link"); @@ -306,3 +305,8 @@ osmo_fsm_inst_free(l1l->fsm); talloc_free(l1l); } + +static __attribute__((constructor)) void on_dso_load(void) +{ + OSMO_ASSERT(osmo_fsm_register(&l1ctl_fsm) == 0); +} diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 33970f3..5fe5000 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -657,7 +657,6 @@ goto udp_error; /* Allocate a new dedicated state machine */ - osmo_fsm_register(&trx_fsm); trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, NULL, LOGL_DEBUG, "trx_interface"); @@ -705,3 +704,8 @@ osmo_fsm_inst_free(trx->fsm); talloc_free(trx); } + +static __attribute__((constructor)) void on_dso_load(void) +{ + OSMO_ASSERT(osmo_fsm_register(&trx_fsm) == 0); +} -- To view, visit https://gerrit.osmocom.org/12586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 Gerrit-Change-Number: 12586 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:23 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12587 Change subject: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed ...................................................................... trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 --- M src/host/trxcon/l1ctl_link.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/12587/1 diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index f2b031e..897259a 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -243,6 +243,16 @@ return NULL; } + /* Allocate a new dedicated state machine */ + l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, + NULL, LOGL_DEBUG, "l1ctl_link"); + if (l1l->fsm == NULL) { + LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " + "of FSM '%s'\n", l1ctl_fsm.name); + talloc_free(l1l); + return NULL; + } + /* Create a socket and bind handlers */ bfd = &l1l->listen_bfd; rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path, @@ -250,6 +260,7 @@ if (rc < 0) { LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n", strerror(errno)); + osmo_fsm_inst_free(l1l->fsm); talloc_free(l1l); return NULL; } @@ -268,10 +279,6 @@ */ l1l->wq.bfd.fd = -1; - /* Allocate a new dedicated state machine */ - l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, - NULL, LOGL_DEBUG, "l1ctl_link"); - return l1l; } -- To view, visit https://gerrit.osmocom.org/12587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 Gerrit-Change-Number: 12587 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:24 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: check if trx_fsm allocation failed Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12588 Change subject: trxcon/trx_if.c: check if trx_fsm allocation failed ...................................................................... trxcon/trx_if.c: check if trx_fsm allocation failed Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a --- M src/host/trxcon/trx_if.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/12588/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 5fe5000..f2db145 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -642,6 +642,16 @@ return NULL; } + /* Allocate a new dedicated state machine */ + trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, + NULL, LOGL_DEBUG, "trx_interface"); + if (trx->fsm == NULL) { + LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " + "of FSM '%s'\n", trx_fsm.name); + talloc_free(trx); + return NULL; + } + /* Initialize CTRL queue */ INIT_LLIST_HEAD(&trx->trx_ctrl_list); @@ -656,14 +666,11 @@ if (rc < 0) goto udp_error; - /* Allocate a new dedicated state machine */ - trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, - NULL, LOGL_DEBUG, "trx_interface"); - return trx; udp_error: LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); + osmo_fsm_inst_free(trx->fsm); talloc_free(trx); return NULL; } -- To view, visit https://gerrit.osmocom.org/12588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a Gerrit-Change-Number: 12588 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:24 +0000 Subject: Change in osmocom-bb[master]: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12589 Change subject: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm ...................................................................... trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm Change-Id: I6262726f2b6e23abe543d6d67edfd634eece1b71 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/l1ctl_link.h M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h M src/host/trxcon/trxcon.c 5 files changed, 22 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/12589/1 diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 897259a..f384753 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -177,7 +177,8 @@ } osmo_fsm_inst_state_chg(l1l->fsm, L1CTL_STATE_CONNECTED, 0, 0); - osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_L1CTL_CONNECT, NULL); + osmo_fsm_inst_dispatch(l1l->fsm->proc.parent, + TRXCON_E_L1CTL_CONNECT, NULL); LOGP(DL1C, LOGL_NOTICE, "L1CTL has a new connection\n"); @@ -224,12 +225,14 @@ osmo_wqueue_clear(&l1l->wq); osmo_fsm_inst_state_chg(l1l->fsm, L1CTL_STATE_IDLE, 0, 0); - osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_L1CTL_DISCONNECT, NULL); + osmo_fsm_inst_dispatch(l1l->fsm->proc.parent, + TRXCON_E_L1CTL_DISCONNECT, NULL); return 0; } -struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path) +struct l1ctl_link *l1ctl_link_init(struct osmo_fsm_inst *parent_fi, + const char *sock_path) { struct l1ctl_link *l1l; struct osmo_fd *bfd; @@ -237,15 +240,15 @@ LOGP(DL1C, LOGL_NOTICE, "Init L1CTL link (%s)\n", sock_path); - l1l = talloc_zero(tall_ctx, struct l1ctl_link); + l1l = talloc_zero(parent_fi, struct l1ctl_link); if (!l1l) { LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory\n"); return NULL; } /* Allocate a new dedicated state machine */ - l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, - NULL, LOGL_DEBUG, "l1ctl_link"); + l1l->fsm = osmo_fsm_inst_alloc_child(&l1ctl_fsm, + parent_fi, TRXCON_E_L1CTL_DISCONNECT); if (l1l->fsm == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", l1ctl_fsm.name); diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/l1ctl_link.h index da64419..ceeaa30 100644 --- a/src/host/trxcon/l1ctl_link.h +++ b/src/host/trxcon/l1ctl_link.h @@ -41,7 +41,8 @@ void (*shutdown_cb)(struct l1ctl_link *l1l); }; -struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path); +struct l1ctl_link *l1ctl_link_init(struct osmo_fsm_inst *parent_fi, + const char *sock_path); void l1ctl_link_shutdown(struct l1ctl_link *l1l); int l1ctl_link_send(struct l1ctl_link *l1l, struct msgb *msg); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index f2db145..7eca984 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -173,7 +173,8 @@ if (++tcm->retry_cnt > 3) { LOGP(DTRX, LOGL_NOTICE, "Transceiver offline\n"); osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_OFFLINE, 0, 0); - osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_TRX_DISCONNECT, NULL); + osmo_fsm_inst_dispatch(trx->fsm->proc.parent, + TRXCON_E_TRX_DISCONNECT, NULL); return; } @@ -514,7 +515,8 @@ rsp_error: /* Notify higher layers about the problem */ - osmo_fsm_inst_dispatch(trxcon_fsm, TRXCON_E_TRX_CTRL_ERROR, NULL); + osmo_fsm_inst_dispatch(trx->fsm->proc.parent, + TRXCON_E_TRX_CTRL_ERROR, NULL); return -EIO; } @@ -627,7 +629,7 @@ } /* Init TRX interface (TRXC, TRXD sockets and FSM) */ -struct trx_instance *trx_if_open(void *tall_ctx, +struct trx_instance *trx_if_open(struct osmo_fsm_inst *parent_fi, const char *local_host, const char *remote_host, uint16_t port) { struct trx_instance *trx; @@ -636,15 +638,15 @@ LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface\n"); /* Try to allocate memory */ - trx = talloc_zero(tall_ctx, struct trx_instance); + trx = talloc_zero(parent_fi, struct trx_instance); if (!trx) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate memory\n"); return NULL; } /* Allocate a new dedicated state machine */ - trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, - NULL, LOGL_DEBUG, "trx_interface"); + trx->fsm = osmo_fsm_inst_alloc_child(&trx_fsm, + parent_fi, TRXCON_E_TRX_DISCONNECT); if (trx->fsm == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index 0b3f36f..8180669 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -52,7 +52,7 @@ int cmd_len; }; -struct trx_instance *trx_if_open(void *tall_ctx, +struct trx_instance *trx_if_open(struct osmo_fsm_inst *parent_fi, const char *local_host, const char *remote_host, uint16_t port); void trx_if_flush_ctrl(struct trx_instance *trx); void trx_if_close(struct trx_instance *trx); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index dda0a00..ab753d0 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -214,12 +214,12 @@ goto exit; /* Init L1CTL server */ - app_data.l1l = l1ctl_link_init(tall_trxcon_ctx, app_data.bind_socket); + app_data.l1l = l1ctl_link_init(trxcon_fsm, app_data.bind_socket); if (app_data.l1l == NULL) goto exit; /* Init transceiver interface */ - app_data.trx = trx_if_open(tall_trxcon_ctx, + app_data.trx = trx_if_open(trxcon_fsm, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); if (!app_data.trx) -- To view, visit https://gerrit.osmocom.org/12589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6262726f2b6e23abe543d6d67edfd634eece1b71 Gerrit-Change-Number: 12589 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:18:25 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 Jan 2019 13:18:25 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12590 Change subject: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance ...................................................................... trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance Change-Id: I37812573a33e090e6edb45713d3132cb43bd4ffb --- M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/12590/1 diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index ab753d0..79b6ee4 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -75,7 +75,6 @@ } app_data; void *tall_trxcon_ctx = NULL; -struct osmo_fsm_inst *trxcon_fsm; static void print_usage(const char *app) { @@ -185,6 +184,7 @@ int main(int argc, char **argv) { + struct osmo_fsm_inst *trxcon_fsm; int rc = 0; printf("%s", COPYRIGHT); diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index 37be9f5..954ebc6 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -3,7 +3,6 @@ #define GEN_MASK(state) (0x01 << state) extern const struct value_string trxcon_fsm_event_names[]; -extern struct osmo_fsm_inst *trxcon_fsm; extern struct osmo_fsm trxcon_fsm_def; enum trxcon_fsm_state_type { -- To view, visit https://gerrit.osmocom.org/12590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37812573a33e090e6edb45713d3132cb43bd4ffb Gerrit-Change-Number: 12590 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 13:21:11 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 13:21:11 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 9 PS1, Line 9: This simplifies tests refactoring by showing exact byte where mismatch > logs a multiline string to the osmo logging -- that's technically not allowed. First time I hear about this. Why multiline logging is not allowed? I'm pretty sure I've seen it in several places before. -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 13:21:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:37:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:37:17 +0000 Subject: Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db* In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* ...................................................................... Patch Set 1: > Hmm, I see, if the make step fails, the removal is skipped. Maybe rather fix that. I don't think we should change that. If the test fails, it's nice to be able to look into the database the test created. -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:37:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:38:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:38:00 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#5). Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_imsi() and db_subscr_get_by_imei(). The new functions are used in db_test, and in follow-up commits [1], [2]. Upgrade DB schema to version 2. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. Follow-up commit [1] will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. [1] change-id I09274ecbed64224f7ae305e09ede773931da2a57 "Optionally store IMEI in subscriber table" [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 203 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/5 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:38:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:38:00 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#6). Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/6 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:38:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:38:00 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#6). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 119 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/6 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:38:33 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:38:33 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty File tests/test_subscriber.vty: https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty at 34 PS5, Line 34: % No subscriber for msisdn = '12345' > actually you should also add tests for the imei selector, basically copy-pasting "all" of those pres [?] Done -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:38:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:38:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:38:58 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG at 28 PS3, Line 28: [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 > yes, but the unit test could easily just SEL by imsi again right https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c at 426 PS4, Line 426: LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber IMSI='%s': SQL modified %d rows (expected 1)\n", > Argh hm, there's one thing I so far completely missed in this: would SQLite return 0 if the IMEI is [?] Oh, I've missed that too! Now that you say it, I ran into this with MySQL once: getting 0 rows modified instead of 1 when updating with the same data. But we got lucky here, SQLite does not behave this way (see the added test). -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:38:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:54:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 14:54:17 +0000 Subject: Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db* In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:54:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:55:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:55:20 +0000 Subject: Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db* In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* ...................................................................... gitignore: add tests/hlr_vty_test.db* Ignore files generated from the VTY test. Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Max: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c08a612..0397e35 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ tests/gsup_server/gsup_server_test tests/gsup/gsup_test tests/db/db_test +tests/hlr_vty_test.db* # manuals doc/manuals/*.html -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 14:55:41 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 16 Jan 2019 14:55:41 +0000 Subject: Change in osmo-hlr[master]: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12566 ) Change subject: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() ...................................................................... Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() Properly note that NULL can only be passed as msisdn, not imsi in that function. Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 --- M src/db_hlr.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/db_hlr.c b/src/db_hlr.c index c97cd82..2569477 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -141,8 +141,8 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. - * \param[in] msisdn ASCII string of MSISDN digits. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] msisdn ASCII string of MSISDN digits, or NULL to remove the MSISDN. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. */ -- To view, visit https://gerrit.osmocom.org/12566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 Gerrit-Change-Number: 12566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 15:44:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 15:44:57 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 6: (3 comments) https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c at 146 PS6, Line 146: /* IMEI passwed with checksum digit: verify and remove */ typo https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c at 150 PS6, Line 150: imei_buf[14] = '\0'; Maybe use osmo_strlcpy() in here? https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c at 546 PS6, Line 546: imei_buf[14] = '\0'; Here too. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Wed, 16 Jan 2019 15:44:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 15:49:27 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 15:49:27 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12554 ) Change subject: socket: add define for socket name length ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12554/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12554/2/src/socket.c at 786 PS2, Line 786: /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ It might make sense to move the comment as well: the format is explained in doxygen already. Without this comments it completely unclear where all the ..+ 1 + 5... come from. -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 16 Jan 2019 15:49:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 15:50:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 15:50:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: change default for mp_vlr_name In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12562 ) Change subject: MSC_Tests: change default for mp_vlr_name ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2bcfff8e2413437b92b744b2645e8e0024684bb1 Gerrit-Change-Number: 12562 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 16 Jan 2019 15:50:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 16:05:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 16 Jan 2019 16:05:26 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory.h: fix enum def within function signature Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12591 Change subject: ranap_msg_factory.h: fix enum def within function signature ...................................................................... ranap_msg_factory.h: fix enum def within function signature Include RANAP_KeyStatus.h so that we use the global enum RANAP_KeyStatus instead of defining another only within the ranap_new_msg_sec_mod_cmd() function declaration. Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 --- M include/osmocom/ranap/ranap_msg_factory.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/91/12591/1 diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index 120c6e6..f1f3fcc 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -7,6 +7,7 @@ #include #include #include +#include /*! \brief generate RANAP DIRECT TRANSFER message */ struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); -- To view, visit https://gerrit.osmocom.org/12591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 Gerrit-Change-Number: 12591 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:23 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:23 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12496 to look at the new patch set (#3). Change subject: add USB DFU description ...................................................................... add USB DFU description uses the USB CDC ACM example code as template to create a USB DFU description according to USB DFU specification version 1.1 USB DFU stack is under LGPLv2.1 or later license Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 --- M config/usbd_config.h M gcc/Makefile A usb/class/dfu/device/dfudf.c C usb/class/dfu/device/dfudf.h A usb/class/dfu/device/dfudf_desc.h A usb/class/dfu/usb_protocol_dfu.h R usb_dfu_main.c M usb_start.c M usb_start.h 9 files changed, 684 insertions(+), 305 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/96/12496/3 -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:23 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:23 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12516 to look at the new patch set (#3). Change subject: add README file ...................................................................... add README file this describes the project, how to compile, and how to flash the USB DFU bootloader Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf --- A README.md 1 file changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/16/12516/3 -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:25 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:25 +0000 Subject: Change in osmo-asf4-dfu[master]: start application if valid at boot Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12592 Change subject: start application if valid at boot ...................................................................... start application if valid at boot if the application is not valid, check and start the bootloader Change-Id: I323f2b3a1828d3e40a02c7fc755d07009fb43a85 --- M usb_dfu_main.c M usb_start.c 2 files changed, 85 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/92/12592/1 diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 2535475..91748a5 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -1,45 +1,95 @@ /** * \file + * \brief USB DFU bootloader implementation (DFU mode) * - * \brief Application implement + * Copyright (c) 2018-2019 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * 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. * - * \asf_license_start + * 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. * - * \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 - * - */ -/* - * Support and FAQ: visit Microchip Support + * 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 "atmel_start.h" #include "atmel_start_pins.h" +/** Start address of the application in flash + * \remark must be initialized by check_bootloader + */ +static uint32_t* application_start_address; + +/** Check if the bootloader is valid + * \return true if the bootloader is valid and can be run + * \remark initializes application_start_address + */ +static bool check_bootloader(void) +{ + if (hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw) > 15) { // ensure BOOTPROT setting is valid + return false; + } + application_start_address = (uint32_t*)((15 - hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw)) * 8192); // calculate bootloader size to know start address of the application (e.g. after the bootloader) + if (0 == application_start_address) { // no space has been reserved for the bootloader + return false; + } + return true; +} + +/** Check if starting the bootloader is forced + * \return true of the DFU bootloader should be started + */ +static bool check_force_dfu(void) +{ +} + +/** Check if the application is valid + * \return true if the application is valid and can be started + * \warning application_start_address must be initialized + */ +static bool check_application(void) +{ + /* the application starts with the vector table + * the first entry in the vector table is the initial stack pointer (SP) address + * the stack will be placed in RAM which begins at 0x2000 0000, and there is up to 256 KB of RAM (0x40000). + * 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)); +} + +/** Start the application + * \warning application_start_address must be initialized + */ +static void start_application(void) +{ + __set_MSP(*application_start_address); // re-base the Stack Pointer + 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 */ +} + int main(void) { - atmel_start_init(); - usb_dfu(); + atmel_start_init(); // initialise system + if (!check_bootloader()) { // check bootloader + // blink the LED to tell the user we don't know where the application starts + while (true) { + gpio_set_pin_level(LED_SYSTEM, false); + delay_ms(500); + gpio_set_pin_level(LED_SYSTEM, true); + delay_ms(500); + } + } + if (check_application()) { // application is valid + start_application(); // start application + } else { + usb_dfu(); // start DFU bootloader + } } diff --git a/usb_start.c b/usb_start.c index 7503094..ad91840 100644 --- a/usb_start.c +++ b/usb_start.c @@ -82,23 +82,16 @@ 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 - uint32_t application_start = hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw); // read BOOTPROT setting to get the bootloader size - ASSERT(application_start <= 15); - application_start = (15 - application_start) * 8192; // calculate bootloader size to know where we should write the application firmware - while (0 == application_start) { // no space has been reserved for the bootloader - // blink the LED to tell the user we don't know where the application starts - gpio_set_pin_level(LED_SYSTEM, false); - delay_ms(500); - gpio_set_pin_level(LED_SYSTEM, true); - delay_ms(500); - } + 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 + ASSERT(application_start_address > 0); 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 if (dfu_download_length > 0) { // there is some data to be flashed - int32_t rc = flash_write(&FLASH_0, application_start + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + 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) { dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed } else { // there has been a programming error -- To view, visit https://gerrit.osmocom.org/12592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I323f2b3a1828d3e40a02c7fc755d07009fb43a85 Gerrit-Change-Number: 12592 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:25 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:25 +0000 Subject: Change in osmo-asf4-dfu[master]: add button to force DFU bootloader Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12593 Change subject: add button to force DFU bootloader ...................................................................... add button to force DFU bootloader Change-Id: I163ab2de0fcbe13532c1992f6b78d49f4cda2d88 --- M atmel_start_pins.h M driver_init.c M usb_dfu_main.c 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/93/12593/1 diff --git a/atmel_start_pins.h b/atmel_start_pins.h index 23b8d33..86e1dfb 100644 --- a/atmel_start_pins.h +++ b/atmel_start_pins.h @@ -27,9 +27,12 @@ #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 (pull low to switch on) */ #define LED_SYSTEM GPIO(GPIO_PORTC, 18) +/** User button to force DFu bootloader (connected to ground when pressed) */ +#define BUTTON_FORCE_DFU GPIO(GPIO_PORTB, 31) + /** USB D+/D- pins */ #define PA24 GPIO(GPIO_PORTA, 24) #define PA25 GPIO(GPIO_PORTA, 25) diff --git a/driver_init.c b/driver_init.c index 0b07cc1..a91b0eb 100644 --- a/driver_init.c +++ b/driver_init.c @@ -148,6 +148,11 @@ 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); + gpio_set_pin_function(BUTTON_FORCE_DFU, GPIO_PIN_FUNCTION_OFF); + USB_DEVICE_INSTANCE_init(); FLASH_0_init(); } diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 91748a5..449b311 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -48,6 +48,8 @@ */ 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 } /** Check if the application is valid @@ -87,7 +89,7 @@ delay_ms(500); } } - if (check_application()) { // application is valid + if (!check_force_dfu() && check_application()) { // application is valid start_application(); // start application } else { usb_dfu(); // start DFU bootloader -- To view, visit https://gerrit.osmocom.org/12593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I163ab2de0fcbe13532c1992f6b78d49f4cda2d88 Gerrit-Change-Number: 12593 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:26 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:26 +0000 Subject: Change in osmo-asf4-dfu[master]: reduce number of endpoints Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12594 Change subject: reduce number of endpoints ...................................................................... reduce number of endpoints only endpoint 0 is used, thus there is no need to define more. this also saves RAM. Change-Id: I52a5d2d3c3d09ca7dfa165535ccc295bf190841b --- M config/hpl_usb_config.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/94/12594/1 diff --git a/config/hpl_usb_config.h b/config/hpl_usb_config.h index 02439a3..4445de5 100644 --- a/config/hpl_usb_config.h +++ b/config/hpl_usb_config.h @@ -39,7 +39,7 @@ // Max possible (by "Max Endpoint Number" config) // usbd_num_ep_sp #ifndef CONF_USB_D_NUM_EP_SP -#define CONF_USB_D_NUM_EP_SP CONF_USB_D_N_EP_MAX +#define CONF_USB_D_NUM_EP_SP CONF_USB_N_1 #endif // @@ -60,7 +60,7 @@ // The number of physical endpoints - 1 // usbd_arch_max_ep_n #ifndef CONF_USB_D_MAX_EP_N -#define CONF_USB_D_MAX_EP_N CONF_USB_N_2 +#define CONF_USB_D_MAX_EP_N CONF_USB_N_0 #endif // USB Speed Limit -- To view, visit https://gerrit.osmocom.org/12594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52a5d2d3c3d09ca7dfa165535ccc295bf190841b Gerrit-Change-Number: 12594 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:42:26 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:42:26 +0000 Subject: Change in osmo-asf4-dfu[master]: avoid mutli-packet USB transfer Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12595 Change subject: avoid mutli-packet USB transfer ...................................................................... avoid mutli-packet USB transfer the control endpoint packet size is 64 bytes for USB full speed. it is possible to make larger data transfer by transferring multiple packets which can then by re-assembled. this feature is also supported by the SAM E54 USB stack, but for an unknown reason is the transfer size is larger than 64 bytes but not a multiple of it, the transfer cannot complete (it is not ACKed). reducing the transfer size to 64 bytes removes this issue. the data needs to be re-assembled in software to fill a flash page. sadly a new issue has been uncovered using this method. the size of the last packet (e.g. request bLength) is kept by the USB stack for the next packet. Thus is the last packet is less than 6 bytes, the status request after the download request fails. Change-Id: Icb4c5f4bc06095f5f962152b8d8247054ef6a520 --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf.h M usb/class/dfu/device/dfudf_desc.h M usb_start.c 4 files changed, 53 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/95/12595/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 8232979..545f57c 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -42,7 +42,7 @@ enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; -uint8_t dfu_download_data[512]; +uint8_t dfu_download_data[64]; uint16_t dfu_download_length = 0; size_t dfu_download_offset = 0; bool dfu_manifestation_complete = false; @@ -244,12 +244,12 @@ to_return = ERR_INVALID_ARG; // stall control pipe to indicate error } else { // there is data to be flash if (USB_SETUP_STAGE == stage) { // there will be data to be flash - to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data + to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, req->wLength < 64); // send ack to the setup request to get the data } else { // now there is data to be flashed dfu_download_offset = req->wValue * sizeof(dfu_download_data); // remember which block to flash dfu_download_length = req->wLength; // remember the data size to be flash dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state - to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data + //to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK // we let the main application flash the data because this can be long and would stall the USB ISR } } diff --git a/usb/class/dfu/device/dfudf.h b/usb/class/dfu/device/dfudf.h index cee5845..a7143f9 100644 --- a/usb/class/dfu/device/dfudf.h +++ b/usb/class/dfu/device/dfudf.h @@ -43,10 +43,9 @@ 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 + * 64 bytes is the control buffer size */ -extern uint8_t dfu_download_data[512]; +extern uint8_t dfu_download_data[64]; /** Length of downloaded data in bytes */ extern uint16_t dfu_download_length; /** Offset of where the downloaded data should be flashed in bytes */ diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index cd6ba41..68880c7 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -75,9 +75,14 @@ CONF_USB_DFUD_BMATTRI, \ CONF_USB_DFUD_BMAXPOWER) +/** \remark ideally the transfer size should be the same size as flash pages (512 byte for SAM E5x/D5x). + the control endpoint transfer size is 64 byte for full speed device. + thus 512 transfers must be split in a mutli-packet transfer. + this should be supported by the hardware, but I did not manage to have complete/successful multi-packet transfer is the transfer is larger than 64 bytes but not a multiple of 64 + */ #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 */ \ + 64, /**< transfer size corresponds to the control endpoint packet size */ \ 0x0110 /**< DFU specification version 1.1 used */ ) #define DFUD_IFACE_DESCES \ diff --git a/usb_start.c b/usb_start.c index ad91840..487e672 100644 --- a/usb_start.c +++ b/usb_start.c @@ -42,8 +42,14 @@ /** 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; -/** Ctrl endpoint buffer */ +/** Control endpoint buffer */ static uint8_t ctrl_buffer[64]; +/** Buffer to store downloaded data before flashing a complete page */ +static uint8_t flash_page[512]; +/** Address offset where the flash page should be flashed */ +static uint32_t flash_offset = 0; +/** If the page has already been flashed */ +static bool flash_programmed = true; /** * \brief USB DFU Init @@ -55,6 +61,11 @@ usbdc_start(single_desc); usbdc_attach(); + + // initialise flash page with empty flash + for (uint16_t i = 0; i < ARRAY_SIZE(flash_page); i++) { + flash_page[i] = 0xff; + } } /** @@ -91,21 +102,38 @@ 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 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) { - dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed - } else { // there has been a programming error - dfu_state = USB_DFU_STATE_DFU_ERROR; - if (ERR_BAD_ADDRESS == rc) { - dfu_status = USB_DFU_STATUS_ERR_ADDRESS; - } else if (ERR_DENIED == rc) { - dfu_status = USB_DFU_STATUS_ERR_WRITE; - } else { - dfu_status = USB_DFU_STATUS_ERR_PROG; +/* + if (dfu_download_offset >= flash_offset + sizeof(flash_page)) { // we start a new page + if (!flash_programmed) { // the previous page needs to be flashed + int32_t rc = flash_write(&FLASH_0, application_start_address + flash_offset, flash_page, sizeof(flash_page)); // write re-assembled downloaded data chunks to flash + if (ERR_NONE == rc) { + // nothing to do for now + } else { // there has been a programming error + dfu_state = USB_DFU_STATE_DFU_ERROR; + if (ERR_BAD_ADDRESS == rc) { + dfu_status = USB_DFU_STATUS_ERR_ADDRESS; + } else if (ERR_DENIED == rc) { + dfu_status = USB_DFU_STATUS_ERR_WRITE; + } else { + dfu_status = USB_DFU_STATUS_ERR_PROG; + } + } + // initialise flash page with empty flash + for (uint16_t i = 0; i < ARRAY_SIZE(flash_page); i++) { + flash_page[i] = 0xff; + } + flash_programmed = true; // remember we programmed the flash page } + flash_offset = (dfu_download_offset / sizeof(flash_page)) * sizeof(flash_page); // remember new page offset } - } else { // there was no data to flash - // this case should not happen, but it's not a critical error + // copy data from download buffer to our flash page + for (uint16_t i = 0; i < dfu_download_length && i < ARRAY_SIZE(dfu_download_data) && i + (dfu_download_offset % ARRAY_SIZE(flash_page)) < ARRAY_SIZE(flash_page); i++) { + flash_page[dfu_download_offset % ARRAY_SIZE(flash_page) + i] = dfu_download_data[i]; + } + flash_programmed = false; // remember there is data to be flashed +*/ + dfu_download_length = 0; // remember we copied the data (in the next turn the state will be idle again if there was no error before) + } else { // there was no data to be copied/flashed 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 -- To view, visit https://gerrit.osmocom.org/12595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icb4c5f4bc06095f5f962152b8d8247054ef6a520 Gerrit-Change-Number: 12595 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:43:33 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:43:33 +0000 Subject: Change in osmo-asf4-dfu[master]: switch to LGPLv2 license In-Reply-To: References: Message-ID: K?vin Redon has abandoned this change. ( https://gerrit.osmocom.org/12504 ) Change subject: switch to LGPLv2 license ...................................................................... Abandoned squashed with previous commit -- To view, visit https://gerrit.osmocom.org/12504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I235997ff9f4e597300697d1bd5a18caefd49c314 Gerrit-Change-Number: 12504 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:44:25 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:44:25 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12496 ) Change subject: add USB DFU description ...................................................................... Patch Set 3: > I thought we wanted to make it LGPL-2.1-or-later? fixed. later commit and been squashed with this one -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 16 Jan 2019 17:44:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 17:44:59 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 16 Jan 2019 17:44:59 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12516 ) Change subject: add README file ...................................................................... Patch Set 3: > let's call it README.md and use markdown syntax. cgit (and any > github mirrors) will then format it nicely. fixed -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 16 Jan 2019 17:44:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 16 19:04:14 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 16 Jan 2019 19:04:14 +0000 Subject: Change in osmo-bsc[master]: Log MDCX ACK for established lchan Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12596 Change subject: Log MDCX ACK for established lchan ...................................................................... Log MDCX ACK for established lchan Previously LCHAN_RTP_EV_IPACC_MDCX_ACK was not permitted for LCHAN_RTP_ST_ESTABLISHED state in lchan FSM. However this message is normal in case of LCLS loop closed via IPA (as opposed to MGCP). Let's permit this message and log it to make debug output easier to read. Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Related: OS#2487 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/12596/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 84cc287..2d15bf2 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -565,13 +565,19 @@ static void lchan_rtp_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + switch (event) { case LCHAN_RTP_EV_RELEASE: case LCHAN_RTP_EV_ROLLBACK: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0); return; - + case LCHAN_RTP_EV_IPACC_MDCX_ACK: + LOG_LCHAN_RTP(lchan, LOGL_NOTICE, + "Received MDCX ACK on established lchan's RTP port: %s\n", + mgwep_ci_name(lchan->mgw_endpoint_ci_bts)); + return; default: OSMO_ASSERT(false); } @@ -689,6 +695,7 @@ .in_event_mask = 0 | S(LCHAN_RTP_EV_RELEASE) | S(LCHAN_RTP_EV_ROLLBACK) + | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) , }, [LCHAN_RTP_ST_ROLLBACK] = { -- To view, visit https://gerrit.osmocom.org/12596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Gerrit-Change-Number: 12596 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:09:28 +0000 Subject: Change in osmo-msc[master]: Make alert notifications vty configurable per ESME Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12597 Change subject: Make alert notifications vty configurable per ESME ...................................................................... Make alert notifications vty configurable per ESME Adds (no) alert-notifications as a per-esme vty command, in order to allow some ESMEs to be excluded from alerts. The default is still to send alert notifications to all esme, so no changes are required to the config file to maintain identical operation after this patch. Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 --- M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_vty.c 4 files changed, 35 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/97/12597/1 diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 10f3cfa..fb9b0f8 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -283,8 +283,13 @@ llist_for_each_entry(esme, &smsc->esme_list, list) { /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery - * pending flag to be set before, FIXME: make this VTY - * configurable */ + * pending flag to be set before. */ + if (!esme->acl->alert_notifications) { + LOGP(DSMPP, LOGL_DEBUG, + "[%s] is not set to receive Alert Notifications\n", + esme->system_id); + continue; + } if (esme->acl && esme->acl->deliver_src_imsi) { smpp_tx_alert(esme, TON_Subscriber_Number, NPI_Land_Mobile_E212, diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index ea5303c..2350d84 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -148,6 +148,7 @@ acl->smsc = smsc; strcpy(acl->system_id, sys_id); + acl->alert_notifications = 1; INIT_LLIST_HEAD(&acl->route_list); llist_add_tail(&acl->list, &smsc->acl_list); diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 27a2646..dc7b7c1 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -68,6 +68,7 @@ int deliver_src_imsi; int osmocom_ext; int dcs_transparent; + int alert_notifications; struct llist_head route_list; }; diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index be55c4d..5896707 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -499,6 +499,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_esme_alert_notif, cfg_esme_alert_notif_cmd, + "alert-notifications", + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_esme_no_alert_notif, cfg_esme_no_alert_notif_cmd, + "no alert-notifications", NO_STR + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 0; + + return CMD_SUCCESS; +} + static void dump_one_esme(struct vty *vty, struct osmo_esme *esme) { @@ -560,6 +582,8 @@ vty_out(vty, " osmocom-extensions%s", VTY_NEWLINE); if (acl->dcs_transparent) vty_out(vty, " dcs-transparent%s", VTY_NEWLINE); + if (acl->alert_notifications) + vty_out(vty, " alert-notifications%s", VTY_NEWLINE); llist_for_each_entry(r, &acl->route_list, list) write_esme_route_single(vty, r); @@ -603,6 +627,8 @@ install_element(SMPP_ESME_NODE, &cfg_esme_no_osmo_ext_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_dcs_transp_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_no_dcs_transp_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_alert_notif_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_no_alert_notif_cmd); install_element_ve(&show_esme_cmd); -- To view, visit https://gerrit.osmocom.org/12597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 Gerrit-Change-Number: 12597 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:09:28 +0000 Subject: Change in osmo-msc[master]: Move enum definition to header file Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12598 Change subject: Move enum definition to header file ...................................................................... Move enum definition to header file Move the definition for the esme bind flags to the header file. Also corrects a typo in the name of the enum. Change-Id: I71b2512894ec2a71a25f35f07ff4308035d951f9 --- M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/12598/1 diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 2350d84..5e27644 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -49,11 +49,6 @@ memset(str, 0, sizeof(*str)); \ rc = smpp34_unpack(type, str, data, len) -enum emse_bind { - ESME_BIND_RX = 0x01, - ESME_BIND_TX = 0x02, -}; - const struct value_string smpp_status_strs[] = { { ESME_ROK, "No Error" }, { ESME_RINVMSGLEN, "Message Length is invalid" }, diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index dc7b7c1..d7a51c1 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -19,6 +19,11 @@ #define MODE_7BIT 7 #define MODE_8BIT 8 +enum esme_bind { + ESME_BIND_RX = 0x01, + ESME_BIND_TX = 0x02, +}; + enum esme_read_state { READ_ST_IN_LEN = 0, READ_ST_IN_MSG = 1, -- To view, visit https://gerrit.osmocom.org/12598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I71b2512894ec2a71a25f35f07ff4308035d951f9 Gerrit-Change-Number: 12598 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:09:28 +0000 Subject: Change in osmo-msc[master]: Don't send Alert Notifications to ESME not bound for RX Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12599 Change subject: Don't send Alert Notifications to ESME not bound for RX ...................................................................... Don't send Alert Notifications to ESME not bound for RX Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df --- M src/libmsc/smpp_openbsc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/12599/1 diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index fb9b0f8..6b7ecbc 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -284,6 +284,12 @@ /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery * pending flag to be set before. */ + if (!(esme->bind_flags & ESME_BIND_RX)) { + LOGP(DSMPP, LOGL_INFO, + "[%s] is not bound for RX, skipping alert\n", + esme->system_id); + continue; + } if (!esme->acl->alert_notifications) { LOGP(DSMPP, LOGL_DEBUG, "[%s] is not set to receive Alert Notifications\n", -- To view, visit https://gerrit.osmocom.org/12599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df Gerrit-Change-Number: 12599 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:09:29 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:09:29 +0000 Subject: Change in osmo-msc[master]: Cosmetic: Fix spelling in smpp vty Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12600 Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Cosmetic: Fix spelling in smpp vty Change-Id: Id3fa3f26c333bf445590fd75ad7a08be68fed3e2 --- M src/libmsc/smpp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/12600/1 diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index 5896707..4c179d4 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -164,7 +164,7 @@ DEFUN(cfg_smpp_policy, cfg_smpp_policy_cmd, "policy (accept-all|closed)", "Set the authentication policy of this SMSC\n" - "Accept all SMPP connections independeint of system ID / passwd\n" + "Accept all SMPP connections independent of system ID / password\n" "Accept only SMPP connections from ESMEs explicitly configured") { struct smsc *smsc = smsc_from_vty(vty); @@ -541,7 +541,7 @@ DEFUN(show_esme, show_esme_cmd, "show smpp esme", - SHOW_STR "SMPP Interface\n" "SMPP Extrenal SMS Entity\n") + SHOW_STR "SMPP Interface\n" "SMPP External SMS Entity\n") { struct smsc *smsc = smsc_from_vty(vty); struct osmo_esme *esme; -- To view, visit https://gerrit.osmocom.org/12600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id3fa3f26c333bf445590fd75ad7a08be68fed3e2 Gerrit-Change-Number: 12600 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:12:02 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:12:02 +0000 Subject: Change in osmo-msc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12597 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12597/1/src/libmsc/smpp_smsc.c File src/libmsc/smpp_smsc.c: https://gerrit.osmocom.org/#/c/12597/1/src/libmsc/smpp_smsc.c at 151 PS1, Line 151: acl->alert_notifications = 1; I'm not sure if this is correct. If not, somebody please point me to where one should set a default for a vty config option. thnx -- To view, visit https://gerrit.osmocom.org/12597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 Gerrit-Change-Number: 12597 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Keith Whyte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 00:12:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:19:55 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:19:55 +0000 Subject: Change in osmo-msc[master]: Don't send Alert Notifications to ESME not bound for RX In-Reply-To: References: Message-ID: Keith Whyte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12599 ) Change subject: Don't send Alert Notifications to ESME not bound for RX ...................................................................... Don't send Alert Notifications to ESME not bound for RX Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df --- M src/libmsc/smpp_openbsc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/12599/2 -- To view, visit https://gerrit.osmocom.org/12599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df Gerrit-Change-Number: 12599 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:29:46 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:29:46 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12603 Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Cosmetic: Fix spelling in smpp vty Change-Id: If2180828e2acd28d96754c593c317c2868644c4b --- M openbsc/src/libmsc/smpp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/03/12603/1 diff --git a/openbsc/src/libmsc/smpp_vty.c b/openbsc/src/libmsc/smpp_vty.c index ff0314e..f1df652 100644 --- a/openbsc/src/libmsc/smpp_vty.c +++ b/openbsc/src/libmsc/smpp_vty.c @@ -164,7 +164,7 @@ DEFUN(cfg_smpp_policy, cfg_smpp_policy_cmd, "policy (accept-all|closed)", "Set the authentication policy of this SMSC\n" - "Accept all SMPP connections independeint of system ID / passwd\n" + "Accept all SMPP connections independent of system ID / password\n" "Accept only SMPP connections from ESMEs explicitly configured") { struct smsc *smsc = smsc_from_vty(vty); @@ -541,7 +541,7 @@ DEFUN(show_esme, show_esme_cmd, "show smpp esme", - SHOW_STR "SMPP Interface\n" "SMPP Extrenal SMS Entity\n") + SHOW_STR "SMPP Interface\n" "SMPP External SMS Entity\n") { struct smsc *smsc = smsc_from_vty(vty); struct osmo_esme *esme; -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:29:45 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:29:45 +0000 Subject: Change in openbsc[master]: Make alert notifications vty configurable per ESME Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12601 Change subject: Make alert notifications vty configurable per ESME ...................................................................... Make alert notifications vty configurable per ESME OSMO-MSC backport Adds (no) alert-notifications as a per-esme vty command, in order to allow some ESMEs to be excluded from alerts. The default is still to send alert notifications to all esme, so no changes are required to the config file to maintain identical operation after this patch. Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 --- M openbsc/src/libmsc/smpp_openbsc.c M openbsc/src/libmsc/smpp_smsc.c M openbsc/src/libmsc/smpp_smsc.h M openbsc/src/libmsc/smpp_vty.c 4 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/01/12601/1 diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index 3fe2dfd..f463e1c 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -278,8 +278,12 @@ llist_for_each_entry(esme, &smsc->esme_list, list) { /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery - * pending flag to be set before, FIXME: make this VTY - * configurable */ + * pending flag to be set before. */ + if (!esme->acl->alert_notifications) { + LOGP(DSMPP, LOGL_DEBUG, + "[%s] is not set to receive Alert Notifications\n", esme->system_id); + continue; + } if (esme->acl && esme->acl->deliver_src_imsi) { smpp_tx_alert(esme, TON_Subscriber_Number, NPI_Land_Mobile_E212, diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index e4acd3a..35097b4 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -148,6 +148,7 @@ acl->smsc = smsc; strcpy(acl->system_id, sys_id); + acl->alert_notifications = 1; INIT_LLIST_HEAD(&acl->route_list); llist_add_tail(&acl->list, &smsc->acl_list); diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index 257383f..2398201 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -68,6 +68,7 @@ int deliver_src_imsi; int osmocom_ext; int dcs_transparent; + int alert_notifications; struct llist_head route_list; }; diff --git a/openbsc/src/libmsc/smpp_vty.c b/openbsc/src/libmsc/smpp_vty.c index 0a84358..ff0314e 100644 --- a/openbsc/src/libmsc/smpp_vty.c +++ b/openbsc/src/libmsc/smpp_vty.c @@ -499,6 +499,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_esme_alert_notif, cfg_esme_alert_notif_cmd, + "alert-notifications", + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_esme_no_alert_notif, cfg_esme_no_alert_notif_cmd, + "no alert-notifications", NO_STR + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 0; + + return CMD_SUCCESS; +} + static void dump_one_esme(struct vty *vty, struct osmo_esme *esme) { @@ -560,6 +582,8 @@ vty_out(vty, " osmocom-extensions%s", VTY_NEWLINE); if (acl->dcs_transparent) vty_out(vty, " dcs-transparent%s", VTY_NEWLINE); + if (acl->alert_notifications) + vty_out(vty, " alert-notifications%s", VTY_NEWLINE); llist_for_each_entry(r, &acl->route_list, list) write_esme_route_single(vty, r); @@ -603,6 +627,8 @@ install_element(SMPP_ESME_NODE, &cfg_esme_no_osmo_ext_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_dcs_transp_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_no_dcs_transp_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_alert_notif_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_no_alert_notif_cmd); install_element_ve(&show_esme_cmd); -- To view, visit https://gerrit.osmocom.org/12601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 Gerrit-Change-Number: 12601 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 00:29:45 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 00:29:45 +0000 Subject: Change in openbsc[master]: Don't deliver alert notification to ESME not bound for RX Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12602 Change subject: Don't deliver alert notification to ESME not bound for RX ...................................................................... Don't deliver alert notification to ESME not bound for RX Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf --- M openbsc/src/libmsc/smpp_openbsc.c M openbsc/src/libmsc/smpp_smsc.c M openbsc/src/libmsc/smpp_smsc.h 3 files changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/02/12602/1 diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index f463e1c..f993480 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -279,6 +279,12 @@ /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery * pending flag to be set before. */ + + if (!(esme->bind_flags & ESME_BIND_RX)) { + LOGP(DSMPP, LOGL_INFO, + "[%s] is not bound for RX, skipping alert\n", esme->system_id); + continue; + } if (!esme->acl->alert_notifications) { LOGP(DSMPP, LOGL_DEBUG, "[%s] is not set to receive Alert Notifications\n", esme->system_id); diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index 35097b4..1cee3fe 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -49,11 +49,6 @@ memset(str, 0, sizeof(*str)); \ rc = smpp34_unpack(type, str, data, len) -enum emse_bind { - ESME_BIND_RX = 0x01, - ESME_BIND_TX = 0x02, -}; - const struct value_string smpp_status_strs[] = { { ESME_ROK, "No Error" }, { ESME_RINVMSGLEN, "Message Length is invalid" }, diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index 2398201..ad1af76 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -19,6 +19,11 @@ #define MODE_7BIT 7 #define MODE_8BIT 8 +enum esme_bind { + ESME_BIND_RX = 0x01, + ESME_BIND_TX = 0x02, +}; + enum esme_read_state { READ_ST_IN_LEN = 0, READ_ST_IN_MSG = 1, -- To view, visit https://gerrit.osmocom.org/12602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf Gerrit-Change-Number: 12602 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:24:51 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12587 to look at the new patch set (#2). Change subject: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed ...................................................................... trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 --- M src/host/trxcon/l1ctl_link.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/12587/2 -- To view, visit https://gerrit.osmocom.org/12587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 Gerrit-Change-Number: 12587 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:24:51 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: check if trx_fsm allocation failed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12588 to look at the new patch set (#2). Change subject: trxcon/trx_if.c: check if trx_fsm allocation failed ...................................................................... trxcon/trx_if.c: check if trx_fsm allocation failed Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a --- M src/host/trxcon/trx_if.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/12588/2 -- To view, visit https://gerrit.osmocom.org/12588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a Gerrit-Change-Number: 12588 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:24:51 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12584 to look at the new patch set (#2). Change subject: trxcon/trxcon.h: do not expose tall_trx_ctx ...................................................................... trxcon/trxcon.h: do not expose tall_trx_ctx Both l1ctl_link_init() and trx_if_open() do accept 'tall_ctx' now, so there is no need to expose the root context anymore. Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 --- M src/host/trxcon/logging.c M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 3 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/12584/2 -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:24:51 +0000 Subject: Change in osmocom-bb[master]: trxcon: register both l1ctl_fsm and trx_fsm on DSO load In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12586 to look at the new patch set (#2). Change subject: trxcon: register both l1ctl_fsm and trx_fsm on DSO load ...................................................................... trxcon: register both l1ctl_fsm and trx_fsm on DSO load Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/trx_if.c 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/12586/2 -- To view, visit https://gerrit.osmocom.org/12586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 Gerrit-Change-Number: 12586 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:24:51 +0000 Subject: Change in osmocom-bb[master]: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12589 to look at the new patch set (#2). Change subject: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm ...................................................................... trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm Change-Id: I6262726f2b6e23abe543d6d67edfd634eece1b71 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/l1ctl_link.h M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h M src/host/trxcon/trxcon.c 5 files changed, 22 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/12589/2 -- To view, visit https://gerrit.osmocom.org/12589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6262726f2b6e23abe543d6d67edfd634eece1b71 Gerrit-Change-Number: 12589 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:25:03 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:25:03 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: use bool in sched_trx_reset() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12580 ) Change subject: trxcon/sched_trx.c: use bool in sched_trx_reset() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc Gerrit-Change-Number: 12580 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 05:25:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:26:20 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:26:20 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if: refactor trx_if_open() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12582 ) Change subject: trxcon/trx_if: refactor trx_if_open() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c Gerrit-Change-Number: 12582 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 05:26:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 05:26:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 05:26:24 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: refactor l1ctl_link_init() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12583 ) Change subject: trxcon/l1ctl_link.c: refactor l1ctl_link_init() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b Gerrit-Change-Number: 12583 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 05:26:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 07:52:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 07:52:53 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix memleak triggered by unsupported messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12604 Change subject: trxcon/l1ctl.c: fix memleak triggered by unsupported messages ...................................................................... trxcon/l1ctl.c: fix memleak triggered by unsupported messages Change-Id: I6e636afec8e45d7dc786f5f159cd5d7784d9a83b --- M src/host/trxcon/l1ctl.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/12604/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 02aa3fa..b8e2faa 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -872,6 +872,7 @@ case L1CTL_SIM_REQ: LOGP(DL1C, LOGL_NOTICE, "Ignoring unsupported message " "(type=%u)\n", l1h->msg_type); + msgb_free(msg); return -ENOTSUP; default: LOGP(DL1C, LOGL_ERROR, "Unknown MSG type %u: %s\n", l1h->msg_type, -- To view, visit https://gerrit.osmocom.org/12604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e636afec8e45d7dc786f5f159cd5d7784d9a83b Gerrit-Change-Number: 12604 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 07:53:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 07:53:21 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix memleak triggered by unsupported messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12604 ) Change subject: trxcon/l1ctl.c: fix memleak triggered by unsupported messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e636afec8e45d7dc786f5f159cd5d7784d9a83b Gerrit-Change-Number: 12604 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 07:53:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 09:13:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 09:13:45 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#7). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/7 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 09:15:41 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 09:15:41 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c at 150 PS6, Line 150: imei_buf[14] = '\0'; > Maybe use osmo_strlcpy() in here? Oh, right. Fixed in the next patch along with the typo you found, thanks! -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 09:15:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 17 09:41:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 17 Jan 2019 09:41:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#817?= Message-ID: <1698983028.610.1547718119928.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.02 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp4-eeprom chmod +x burn-usrp2-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 17 09:45:54 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 09:45:54 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12567 to look at the new patch set (#2). Change subject: common: extend glossary.adoc ...................................................................... common: extend glossary.adoc Add EIR, IMEISV, LU, SS, TS and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/2 -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 09:46:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 09:46:24 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 1: (2 comments) Updated. https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 89 PS1, Line 89: Equipment Identity Register > "Core network element that stores and manages IMEI numbers"? (does it do something else?) That sounds accurate. https://en.wikipedia.org/wiki/Network_switching_subsystem#Equipment_identity_register_(EIR) https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc at 244 PS1, Line 244: Proxy Visitor Location Register > first time I hear of that, what does it do? I found it in osmo-msc.git/src/libvlr/vlr_lu_fsm.c; it is not spelled out or described there, and git blame points to the big "Add libvlr implementation" commit with no further description of what PVLR is. With online research I figured, that it probably means Proxy Visitor Location Register. But researching further, it seems to be "Previous VLR" as noted in Figure 4.1.2.7 (sheet 1 of 1): Process Send_Identification_PVLR of TS 23.012. I'll remove this from the patch. -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 09:46:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 10:07:25 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 10:07:25 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12603 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 10:07:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 10:18:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 10:18:26 +0000 Subject: Change in osmo-hlr[master]: docs: running: same argument order as osmo-hlr -h Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12605 Change subject: docs: running: same argument order as osmo-hlr -h ...................................................................... docs: running: same argument order as osmo-hlr -h Change the Synopsis and Options sections of the Running OsmoHLR chapter to list the arguments in the same order as osmo-hlr. This makes it easier to compare, which options are already documented, and which ones are missing. A follow-up commit will document the missing -U/--db-upgrade option. Change-Id: If866124e9cfb43c6986d458712961713541e03b6 --- M doc/manuals/chapters/running.adoc 1 file changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/12605/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5f24746..d20c907 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,24 +5,27 @@ === SYNOPSIS -*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] === OPTIONS +// Keep the order the same as in osmo-hlr --help! + *-h, --help*:: Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-hlr.cfg` in the current + working directory. +*-l, --database 'DATABASE'*:: + Specify the file name of the SQLite3 database to use as HLR/AUC + storage *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, see <> for further information. *-D, --daemonize*:: Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-hlr.cfg` in the current - working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> @@ -35,9 +38,8 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as HLR/AUC - storage +*-V, --version*:: + Print the compile-time version number of the OsmoBTS program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If866124e9cfb43c6986d458712961713541e03b6 Gerrit-Change-Number: 12605 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 10:18:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 10:18:26 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12606 Change subject: docs: running: document --db-upgrade ...................................................................... docs: running: document --db-upgrade Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/12606/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d20c907..a2e122a 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,7 +5,7 @@ === SYNOPSIS -*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-U] [-V] === OPTIONS @@ -38,6 +38,11 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. +*-U, --db-upgrade*:: + Allow HLR database schema upgrades. If OsmoHLR was updated and + requires a newer database schema, it will refuse to start unless + this option is specified. The updated database can not be + downgraded, make backups as necessary. *-V, --version*:: Print the compile-time version number of the OsmoBTS program -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:09:57 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 11:09:57 +0000 Subject: Change in osmo-bsc[master]: Log MDCX ACK for established lchan In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12596 ) Change subject: Log MDCX ACK for established lchan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Gerrit-Change-Number: 12596 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 11:09:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:20:23 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 11:20:23 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c at 62 PS7, Line 62: IMEI I don't know, are there any benefits of storing IMEI without the checksum in the DB, but maybe we should at least print the full IMEI with 15th digit (i.e. pre-calculate it)? -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 11:20:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:22:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 11:22:45 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12603 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 11:22:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:29:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 Jan 2019 11:29:31 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 Jan 2019 11:29:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:30:59 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 Jan 2019 11:30:59 +0000 Subject: Change in osmo-hlr[master]: docs: running: same argument order as osmo-hlr -h In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12605 ) Change subject: docs: running: same argument order as osmo-hlr -h ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12605/1/doc/manuals/chapters/running.adoc File doc/manuals/chapters/running.adoc: https://gerrit.osmocom.org/#/c/12605/1/doc/manuals/chapters/running.adoc at 42 PS1, Line 42: Print the compile-time version number of the OsmoBTS program OsmoBTS :) -- To view, visit https://gerrit.osmocom.org/12605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If866124e9cfb43c6986d458712961713541e03b6 Gerrit-Change-Number: 12605 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 Jan 2019 11:30:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:39:40 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 11:39:40 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c at 62 PS7, Line 62: IMEI > I don't know, are there any benefits of storing IMEI without the checksum in the DB Yes: this allows searching via VTY for the IMEI, even if the checksum digit is not known. The MS does not send the checksum digit to the MSC (it gets replaced with 0), and the MSC does not send it to the HLR either. So at least when we are debugging something (possibly looking at a saved pcap file without the original IMEI available), we might run into the situation where the last digit is not always known. > but maybe we should at least print the full IMEI with 15th digit (i.e. pre-calculate it)? That makes sense, I'll update the patch. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 11:39:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:44:39 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 11:44:39 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#8). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/8 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 11:56:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 11:56:30 +0000 Subject: Change in osmo-msc[master]: SMS: remove code duplication in transaction init In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12578 ) Change subject: SMS: remove code duplication in transaction init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 Gerrit-Change-Number: 12578 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 11:56:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:01:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 12:01:17 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12606 to look at the new patch set (#2). Change subject: docs: running: document --db-upgrade ...................................................................... docs: running: document --db-upgrade Related: OS#3759 Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/12606/2 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:01:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 17 Jan 2019 12:01:20 +0000 Subject: Change in osmo-hlr[master]: docs: running: s/OsmoBTS/OsmoHLR Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12607 Change subject: docs: running: s/OsmoBTS/OsmoHLR ...................................................................... docs: running: s/OsmoBTS/OsmoHLR Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/07/12607/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d20c907..ad89974 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -39,7 +39,7 @@ been deprecated by VTY based logging configuration, see <> for more information. *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the OsmoHLR program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 Gerrit-Change-Number: 12607 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:07:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:07:41 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12496 ) Change subject: add USB DFU description ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Thu, 17 Jan 2019 12:07:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:13 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore output files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12495 ) Change subject: ignore output files ...................................................................... ignore output files Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 --- A .gitignore 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4608957 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.d +*.o +*.bin +*.eep +*.elf +*.hex +*.lss +*.map +NOTES -- To view, visit https://gerrit.osmocom.org/12495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia6c90711a67a9b1cafc7a6cc3b07aa769e8684d0 Gerrit-Change-Number: 12495 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:13 +0000 Subject: Change in osmo-asf4-dfu[master]: add USB DFU description In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12496 ) Change subject: add USB DFU description ...................................................................... add USB DFU description uses the USB CDC ACM example code as template to create a USB DFU description according to USB DFU specification version 1.1 USB DFU stack is under LGPLv2.1 or later license Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 --- M config/usbd_config.h M gcc/Makefile A usb/class/dfu/device/dfudf.c C usb/class/dfu/device/dfudf.h A usb/class/dfu/device/dfudf_desc.h A usb/class/dfu/usb_protocol_dfu.h R usb_dfu_main.c M usb_start.c M usb_start.h 9 files changed, 684 insertions(+), 305 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/config/usbd_config.h b/config/usbd_config.h index e8334ec..e33f4ba 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -14,33 +14,54 @@ #define CONF_USBD_HS_SP 0 #endif -// ---- USB Device Stack CDC ACM Options ---- +// ---- USB Device Stack DFU Options ---- // Enable String Descriptors -// usb_cdcd_acm_str_en -#ifndef CONF_USB_CDCD_ACM_STR_EN -#define CONF_USB_CDCD_ACM_STR_EN 0 +// USB_DFUD_STR_EN +#ifndef CONF_USB_DFUD_STR_EN +#define CONF_USB_DFUD_STR_EN 0 #endif // Language IDs // Language IDs in c format, split by comma (E.g., 0x0409 ...) -// usb_cdcd_acm_langid -#ifndef CONF_USB_CDCD_ACM_LANGID -#define CONF_USB_CDCD_ACM_LANGID "0x0409" +// usb_dufd_langid +#ifndef CONF_USB_DFUD_LANGID +#define CONF_USB_DFUD_LANGID "0x0409" #endif -#ifndef CONF_USB_CDCD_ACM_LANGID_DESC -#define CONF_USB_CDCD_ACM_LANGID_DESC +#ifndef CONF_USB_DFUD_LANGID_DESC +#define CONF_USB_DFUD_LANGID_DESC 4, 0x03, 0x09, 0x04, #endif // -// CDC ACM Device Descriptor +// DFU Device Descriptor // bcdUSB // <0x0200=> USB 2.0 version // <0x0210=> USB 2.1 version -// usb_cdcd_acm_bcdusb -#ifndef CONF_USB_CDCD_ACM_BCDUSB -#define CONF_USB_CDCD_ACM_BCDUSB 0x200 +// usb_dfud_bcdusb +#ifndef CONF_USB_DFUD_BCDUSB +#define CONF_USB_DFUD_BCDUSB 0x200 +#endif + +// bDeviceClass +// <0=> unused +// usb_dfud_bdeviceclass +#ifndef CONF_USB_DFUD_BDEVICECLASS +#define CONF_USB_DFUD_BDEVICECLASS 0 +#endif + +// bDeviceSubClass +// <0=> unused +// usb_dfud_bdevicesubclass +#ifndef CONF_USB_DFUD_BDEVICESUBCLASS +#define CONF_USB_DFUD_BDEVICESUBCLASS 0 +#endif + +// bDeviceProtocol +// <0=> unused +// usb_dfud_bdeviceprotocol +#ifndef CONF_USB_DFUD_BDEVICEPROTOCOL +#define CONF_USB_DFUD_BDEVICEPROTOCOL 0 #endif // bMaxPackeSize0 @@ -48,133 +69,149 @@ // <0x0010=> 16 bytes // <0x0020=> 32 bytes // <0x0040=> 64 bytes -// usb_cdcd_acm_bmaxpksz0 -#ifndef CONF_USB_CDCD_ACM_BMAXPKSZ0 -#define CONF_USB_CDCD_ACM_BMAXPKSZ0 0x40 +// usb_dufd_bmaxpksz0 +#ifndef CONF_USB_DFUD_BMAXPKSZ0 +#define CONF_USB_DFUD_BMAXPKSZ0 0x40 #endif -// idVender <0x0000-0xFFFF> -// usb_cdcd_acm_idvender -#ifndef CONF_USB_CDCD_ACM_IDVENDER -#define CONF_USB_CDCD_ACM_IDVENDER 0x3eb +// idVendor <0x0000-0xFFFF> +// <0x1d50=> OpenMoko +// usb_octsim_idvendor +#ifndef CONF_USB_OCTSIM_IDVENDOR +#define CONF_USB_OCTSIM_IDVENDOR 0x1d50 #endif // idProduct <0x0000-0xFFFF> -// usb_cdcd_acm_idproduct -#ifndef CONF_USB_CDCD_ACM_IDPRODUCT -#define CONF_USB_CDCD_ACM_IDPRODUCT 0x2404 +// <0x6140=> sysmoOCTSIM +// usb_dufd_idproduct +#ifndef CONF_USB_OCTSIM_IDPRODUCT +#define CONF_USB_OCTSIM_IDPRODUCT 0x6140 #endif // bcdDevice <0x0000-0xFFFF> -// usb_cdcd_acm_bcddevice -#ifndef CONF_USB_CDCD_ACM_BCDDEVICE -#define CONF_USB_CDCD_ACM_BCDDEVICE 0x100 +// usb_dufd_bcddevice +#ifndef CONF_USB_DFUD_BCDDEVICE +#define CONF_USB_DFUD_BCDDEVICE 0x000 #endif // Enable string descriptor of iManufact -// usb_cdcd_acm_imanufact_en -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_EN -#define CONF_USB_CDCD_ACM_IMANUFACT_EN 0 +// usb_dufd_imanufact_en +#ifndef CONF_USB_DFUD_IMANUFACT_EN +#define CONF_USB_DFUD_IMANUFACT_EN 1 #endif -#ifndef CONF_USB_CDCD_ACM_IMANUFACT -#define CONF_USB_CDCD_ACM_IMANUFACT (CONF_USB_CDCD_ACM_IMANUFACT_EN * (CONF_USB_CDCD_ACM_IMANUFACT_EN)) +#ifndef CONF_USB_DFUD_IMANUFACT +#define CONF_USB_DFUD_IMANUFACT (CONF_USB_DFUD_IMANUFACT_EN * (CONF_USB_DFUD_IMANUFACT_EN)) #endif // Unicode string of iManufact -// usb_cdcd_acm_imanufact_str -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR -#define CONF_USB_CDCD_ACM_IMANUFACT_STR "Atmel" +// usb_dufd_imanufact_str +#ifndef CONF_USB_DFUD_IMANUFACT_STR +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" #endif -#ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC +#ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC +#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, #endif // // Enable string descriptor of iProduct -// usb_cdcd_acm_iproduct_en -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_EN -#define CONF_USB_CDCD_ACM_IPRODUCT_EN 0 +// usb_dufd_iproduct_en +#ifndef CONF_USB_DFUD_IPRODUCT_EN +#define CONF_USB_DFUD_IPRODUCT_EN 1 #endif -#ifndef CONF_USB_CDCD_ACM_IPRODUCT -#define CONF_USB_CDCD_ACM_IPRODUCT \ - (CONF_USB_CDCD_ACM_IPRODUCT_EN * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN)) +#ifndef CONF_USB_DFUD_IPRODUCT +#define CONF_USB_DFUD_IPRODUCT \ + (CONF_USB_DFUD_IPRODUCT_EN * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN)) #endif // Unicode string of iProduct -// usb_cdcd_acm_iproduct_str -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR -#define CONF_USB_CDCD_ACM_IPRODUCT_STR "CDC ACM Serial Bridge Demo" +// usb_dufd_iproduct_str +#ifndef CONF_USB_DFUD_IPRODUCT_STR +#define CONF_USB_DFUD_IPRODUCT_STR "sysmoOCTSIM" #endif -#ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC -#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC +#ifndef CONF_USB_DFUD_IPRODUCT_STR_DESC +#define CONF_USB_DFUD_IPRODUCT_STR_DESC 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', 0x00, 'M', 0x00, #endif // // Enable string descriptor of iSerialNum -// usb_cdcd_acm_iserialnum_en -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_EN -#define CONF_USB_CDCD_ACM_ISERIALNUM_EN 0 +// usb_dufd_iserialnum_en +#ifndef CONF_USB_DFUD_ISERIALNUM_EN +#define CONF_USB_DFUD_ISERIALNUM_EN 0 #endif -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM -#define CONF_USB_CDCD_ACM_ISERIALNUM \ - (CONF_USB_CDCD_ACM_ISERIALNUM_EN \ - * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN + CONF_USB_CDCD_ACM_ISERIALNUM_EN)) +#ifndef CONF_USB_DFUD_ISERIALNUM +#define CONF_USB_DFUD_ISERIALNUM \ + (CONF_USB_DFUD_ISERIALNUM_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN)) #endif // Unicode string of iSerialNum -// usb_cdcd_acm_iserialnum_str -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_STR -#define CONF_USB_CDCD_ACM_ISERIALNUM_STR "123456789ABCDEF" +// usb_dufd_iserialnum_str +#ifndef CONF_USB_DFUD_ISERIALNUM_STR +#define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF" #endif -#ifndef CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC -#define CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC +#ifndef CONF_USB_DFUD_ISERIALNUM_STR_DESC +#define CONF_USB_DFUD_ISERIALNUM_STR_DESC #endif // // bNumConfigurations <0x01-0xFF> -// usb_cdcd_acm_bnumconfig -#ifndef CONF_USB_CDCD_ACM_BNUMCONFIG -#define CONF_USB_CDCD_ACM_BNUMCONFIG 0x1 +// usb_dufd_bnumconfig +#ifndef CONF_USB_DFUD_BNUMCONFIG +#define CONF_USB_DFUD_BNUMCONFIG 0x1 #endif // -// CDC ACM Configuration Descriptor -// bConfigurationValue <0x01-0xFF> -// usb_cdcd_acm_bconfigval -#ifndef CONF_USB_CDCD_ACM_BCONFIGVAL -#define CONF_USB_CDCD_ACM_BCONFIGVAL 0x1 -#endif -// Enable string descriptor of iConfig -// usb_cdcd_acm_iconfig_en -#ifndef CONF_USB_CDCD_ACM_ICONFIG_EN -#define CONF_USB_CDCD_ACM_ICONFIG_EN 0 +// DFU Configuration Descriptor + +// wTotalLength <0x01-0xFF> +// usb_dufd_wtotallength +#ifndef CONF_USB_DFUD_WTOTALLENGTH +#define CONF_USB_DFUD_WTOTALLENGTH 27 #endif -#ifndef CONF_USB_CDCD_ACM_ICONFIG -#define CONF_USB_CDCD_ACM_ICONFIG \ - (CONF_USB_CDCD_ACM_ICONFIG_EN \ - * (CONF_USB_CDCD_ACM_IMANUFACT_EN + CONF_USB_CDCD_ACM_IPRODUCT_EN + CONF_USB_CDCD_ACM_ISERIALNUM_EN \ - + CONF_USB_CDCD_ACM_ICONFIG_EN)) +// bNumInterfaces <0x01-0xFF> +// usb_dufd_bnuminterfaces +#ifndef CONF_USB_DFUD_BNUMINTERFACES +#define CONF_USB_DFUD_BNUMINTERFACES 1 +#endif + +// bConfigurationValue <0x01-0xFF> +// usb_dufd_bconfigval +#ifndef CONF_USB_DFUD_BCONFIGVAL +#define CONF_USB_DFUD_BCONFIGVAL 0x1 +#endif + +// Enable string descriptor of iConfig +// usb_dufd_iconfig_en +#ifndef CONF_USB_DFUD_ICONFIG_EN +#define CONF_USB_DFUD_ICONFIG_EN 0 +#endif + +#ifndef CONF_USB_DFUD_ICONFIG +#define CONF_USB_DFUD_ICONFIG \ + (CONF_USB_DFUD_ICONFIG_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN \ + + CONF_USB_DFUD_ICONFIG_EN)) #endif // Unicode string of iConfig -// usb_cdcd_acm_iconfig_str -#ifndef CONF_USB_CDCD_ACM_ICONFIG_STR -#define CONF_USB_CDCD_ACM_ICONFIG_STR "" +// usb_dufd_iconfig_str +#ifndef CONF_USB_DFUD_ICONFIG_STR +#define CONF_USB_DFUD_ICONFIG_STR "" #endif -#ifndef CONF_USB_CDCD_ACM_ICONFIG_STR_DESC -#define CONF_USB_CDCD_ACM_ICONFIG_STR_DESC +#ifndef CONF_USB_DFUD_ICONFIG_STR_DESC +#define CONF_USB_DFUD_ICONFIG_STR_DESC #endif // @@ -184,157 +221,62 @@ // <0xA0=> Bus power supply, support for remote wakeup // <0xC0=> Self powered, not support for remote wakeup // <0xE0=> Self powered, support for remote wakeup -// usb_cdcd_acm_bmattri -#ifndef CONF_USB_CDCD_ACM_BMATTRI -#define CONF_USB_CDCD_ACM_BMATTRI 0x80 +// usb_dufd_bmattri +#ifndef CONF_USB_DFUD_BMATTRI +#define CONF_USB_DFUD_BMATTRI 0x80 #endif // bMaxPower <0x00-0xFF> -// usb_cdcd_acm_bmaxpower -#ifndef CONF_USB_CDCD_ACM_BMAXPOWER -#define CONF_USB_CDCD_ACM_BMAXPOWER 0x32 +// usb_dufd_bmaxpower +#ifndef CONF_USB_DFUD_BMAXPOWER +#define CONF_USB_DFUD_BMAXPOWER 0x32 #endif // -// CDC ACM Communication Interface Descriptor +// DFU Interface Descriptor // bInterfaceNumber <0x00-0xFF> -// usb_cdcd_acm_comm_bifcnum -#ifndef CONF_USB_CDCD_ACM_COMM_BIFCNUM -#define CONF_USB_CDCD_ACM_COMM_BIFCNUM 0x0 +// usb_dufd_bifcnum +#ifndef CONF_USB_DFUD_BIFCNUM +#define CONF_USB_DFUD_BIFCNUM 0x0 #endif + // bAlternateSetting <0x00-0xFF> -// usb_cdcd_acm_comm_baltset -#ifndef CONF_USB_CDCD_ACM_COMM_BALTSET -#define CONF_USB_CDCD_ACM_COMM_BALTSET 0x0 +// usb_dufd_baltset +#ifndef CONF_USB_DFUD_BALTSET +#define CONF_USB_DFUD_BALTSET 0x0 #endif -// iInterface <0x00-0xFF> -// usb_cdcd_acm_comm_iifc -#ifndef CONF_USB_CDCD_ACM_COMM_IIFC -#define CONF_USB_CDCD_ACM_COMM_IIFC 0x0 +// bNumEndpoints <0x00-0xFF> +// usb_dufd_bnumep +#ifndef CONF_USB_DFUD_BNUMEP +#define CONF_USB_DFUD_BNUMEP 0x0 #endif -// Interrupt IN Endpoint Address -// <0x81=> EndpointAddress = 0x81 -// <0x82=> EndpointAddress = 0x82 -// <0x83=> EndpointAddress = 0x83 -// <0x84=> EndpointAddress = 0x84 -// <0x85=> EndpointAddress = 0x85 -// <0x86=> EndpointAddress = 0x86 -// <0x87=> EndpointAddress = 0x87 -// usb_cdcd_acm_epaddr -#ifndef CONF_USB_CDCD_ACM_COMM_INT_EPADDR -#define CONF_USB_CDCD_ACM_COMM_INT_EPADDR 0x82 +// Enable string descriptor of iInterface +// usb_dufd_iinterface_en +#ifndef CONF_USB_DFUD_IINTERFACE_EN +#define CONF_USB_DFUD_IINTERFACE_EN 1 #endif -// Interrupt IN Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_comm_int_maxpksz -#ifndef CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ -#define CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ 0x40 +#ifndef CONF_USB_DFUD_IINTERFACE +#define CONF_USB_DFUD_IINTERFACE \ + (CONF_USB_DFUD_IINTERFACE_EN \ + * (CONF_USB_DFUD_IMANUFACT_EN + CONF_USB_DFUD_IPRODUCT_EN + CONF_USB_DFUD_ISERIALNUM_EN \ + + CONF_USB_DFUD_ICONFIG_EN + CONF_USB_DFUD_IINTERFACE_EN)) #endif -// Interrupt IN Endpoint Interval <0x00-0xFF> -// usb_cdcd_acm_comm_int_interval -#ifndef CONF_USB_CDCD_ACM_COMM_INT_INTERVAL -#define CONF_USB_CDCD_ACM_COMM_INT_INTERVAL 0xa -#endif -// - -// CDC ACM Data Interface Descriptor - -// bInterfaceNumber <0x00-0xFF> -// usb_cdcd_acm_data_bifcnum -#ifndef CONF_USB_CDCD_ACM_DATA_BIFCNUM -#define CONF_USB_CDCD_ACM_DATA_BIFCNUM 0x1 -#endif -// bAlternateSetting <0x00-0xFF> -// usb_cdcd_acm_data_baltset -#ifndef CONF_USB_CDCD_ACM_DATA_BALTSET -#define CONF_USB_CDCD_ACM_DATA_BALTSET 0x0 +// Unicode string of iInterface +// usb_dufd_iinterface_str +#ifndef CONF_USB_DFUD_IINTERFAGE_STR +#define CONF_USB_DFUD_IINTERFACE_STR "SAM D5x/E5x DFU bootloader (DFU mode)" #endif -// iInterface <0x00-0xFF> -// usb_cdcd_acm_data_iifc -#ifndef CONF_USB_CDCD_ACM_DATA_IIFC -#define CONF_USB_CDCD_ACM_DATA_IIFC 0x0 +#ifndef CONF_USB_DFUD_IINTERFACE_STR_DESC +#define CONF_USB_DFUD_IINTERFACE_STR_DESC 76, 0x03, 'S', 0x00, 'A', 0x00, 'M', 0x00, ' ', 0x00, 'D', 0x00, '5', 0x00, 'x', 0x00, '/', 0x00, 'E', 0x00, '5', 0x00, 'x', 0x00, ' ', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, ' ', 0x00, 'b', 0x00, 'o', 0x00, 'o', 0x00, 't', 0x00, 'l', 0x00, 'o', 0x00, 'a', 0x00, 'd', 0x00, 'e', 0x00, 'r', 0x00, ' ', 0x00, '(', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, ' ', 0x00, 'm', 0x00, 'o', 0x00, 'd', 0x00, 'e', 0x00, ')', 0x00, #endif -// BULK IN Endpoint Address -// <0x81=> EndpointAddress = 0x81 -// <0x82=> EndpointAddress = 0x82 -// <0x83=> EndpointAddress = 0x83 -// <0x84=> EndpointAddress = 0x84 -// <0x85=> EndpointAddress = 0x85 -// <0x86=> EndpointAddress = 0x86 -// <0x87=> EndpointAddress = 0x87 -// usb_cdcd_acm_data_bulkin_epaddr -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR -#define CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR 0x81 -#endif - -// BULK IN Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_data_builin_maxpksz -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ -#define CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ 0x40 -#endif - -// BULK IN Endpoint wMaxPacketSize for High Speed -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// <0x0080=> 128 bytes -// <0x0100=> 256 bytes -// <0x0200=> 512 bytes -// usb_cdcd_acm_data_builin_maxpksz_hs -#ifndef CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS -#define CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS 0x200 -#endif - -// BULK OUT Endpoint Address -// <0x01=> EndpointAddress = 0x01 -// <0x02=> EndpointAddress = 0x02 -// <0x03=> EndpointAddress = 0x03 -// <0x04=> EndpointAddress = 0x04 -// <0x05=> EndpointAddress = 0x05 -// <0x06=> EndpointAddress = 0x06 -// <0x07=> EndpointAddress = 0x07 -// usb_cdcd_acm_data_bulkout_epaddr -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR 0x1 -#endif - -// BULK OUT Endpoint wMaxPacketSize -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// usb_cdcd_acm_data_buckout_maxpksz -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ 0x40 -#endif - -// BULK OUT Endpoint wMaxPacketSize for High Speed -// <0x0008=> 8 bytes -// <0x0010=> 16 bytes -// <0x0020=> 32 bytes -// <0x0040=> 64 bytes -// <0x0080=> 128 bytes -// <0x0100=> 256 bytes -// <0x0200=> 512 bytes -// usb_cdcd_acm_data_buckout_maxpksz_hs -#ifndef CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS -#define CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS 0x200 -#endif +// // // <<< end of configuration section >>> diff --git a/gcc/Makefile b/gcc/Makefile index 6542661..231ed39 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -31,7 +31,7 @@ hpl/osc32kctrl \ hpl/ramecc \ hpl/dmac \ -usb/class/cdc/device \ +usb/class/dfu/device \ hal/src \ hpl/mclk \ usb \ @@ -49,7 +49,7 @@ OBJS += \ hal/src/hal_io.o \ hpl/core/hpl_core_m4.o \ -usb/class/cdc/device/cdcdf_acm.o \ +usb/class/dfu/device/dfudf.o \ hal/utils/src/utils_syscalls.o \ hpl/dmac/hpl_dmac.o \ gcc/system_same54.o \ @@ -77,14 +77,14 @@ hal/src/hal_cache.o \ hpl/cmcc/hpl_cmcc.o \ atmel_start.o \ -usb_cdc_echo_main.o \ +usb_dfu_main.o \ usb/device/usbdc.o \ hal/src/hal_atomic.o OBJS_AS_ARGS += \ "hal/src/hal_io.o" \ "hpl/core/hpl_core_m4.o" \ -"usb/class/cdc/device/cdcdf_acm.o" \ +"usb/class/dfu/device/dfudf.o" \ "hal/utils/src/utils_syscalls.o" \ "hpl/dmac/hpl_dmac.o" \ "gcc/system_same54.o" \ @@ -112,7 +112,7 @@ "hal/src/hal_cache.o" \ "hpl/cmcc/hpl_cmcc.o" \ "atmel_start.o" \ -"usb_cdc_echo_main.o" \ +"usb_dfu_main.o" \ "usb/device/usbdc.o" \ "hal/src/hal_atomic.o" @@ -125,7 +125,7 @@ "hpl/ramecc/hpl_ramecc.d" \ "hpl/core/hpl_core_m4.d" \ "hal/utils/src/utils_syscalls.d" \ -"usb/class/cdc/device/cdcdf_acm.d" \ +"usb/class/dfu/device/dfudf.d" \ "gcc/gcc/startup_same54.d" \ "hpl/usb/hpl_usb.d" \ "hal/utils/src/utils_list.d" \ @@ -140,7 +140,7 @@ "hal/src/hal_usb_device.d" \ "hpl/dmac/hpl_dmac.d" \ "hal/src/hal_init.d" \ -"usb_cdc_echo_main.d" \ +"usb_dfu_main.d" \ "hpl/mclk/hpl_mclk.d" \ "driver_init.d" \ "hpl/osc32kctrl/hpl_osc32kctrl.d" \ @@ -199,7 +199,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -208,7 +208,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -217,7 +217,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ +-I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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: $< @@ -237,4 +237,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 \ No newline at end of file + $(OUTPUT_FILE_NAME).srec diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c new file mode 100644 index 0000000..7747a23 --- /dev/null +++ b/usb/class/dfu/device/dfudf.c @@ -0,0 +1,186 @@ +/** + * \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" + +/** USB Device DFU Fucntion 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; + +/** + * \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; + uint8_t i; + + ifc = desc->sod; + for (i = 0; i < 2; i++) { + 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 CDC class request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to 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)) { + // we don't verify the bmRequestType + switch (req->bRequest) { + default: + return ERR_UNSUPPORTED_OP; + } + } else { + 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 Deinitialize 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/usb_cdc_echo_main.c b/usb/class/dfu/device/dfudf.h similarity index 62% copy from usb_cdc_echo_main.c copy to usb/class/dfu/device/dfudf.h index fe02810..ba5cdd5 100644 --- a/usb_cdc_echo_main.c +++ b/usb/class/dfu/device/dfudf.h @@ -1,9 +1,10 @@ /** * \file * - * \brief Application implement + * \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 * @@ -15,7 +16,7 @@ * 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, + * 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 @@ -28,17 +29,31 @@ * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. * * \asf_license_stop - * - */ -/* - * Support and FAQ: visit Microchip Support */ -#include "atmel_start.h" -#include "atmel_start_pins.h" +#ifndef USBDF_DFU_H_ +#define USBDF_DFU_H_ -int main(void) -{ - atmel_start_init(); - cdcd_acm_example(); -} +#include "usbdc.h" + +/** + * \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/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h new file mode 100644 index 0000000..f9eca38 --- /dev/null +++ b/usb/class/dfu/device/dfudf_desc.h @@ -0,0 +1,112 @@ +/** + * \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_OCTSIM_IDVENDOR, \ + CONF_USB_OCTSIM_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_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), \ + USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ + 200, /* maximum time in milliseconds to detach (and reboot) */ \ + 1024, /* maximum transfer size */ \ + 0x0110 /*< DFU specification version 1.1 used */ ) + +#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/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h new file mode 100644 index 0000000..2e7323f --- /dev/null +++ b/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; + uint8_t bDescriptorType; + uint8_t bmAttributes; + le16_t wDetachTimeOut; + le16_t wTransferSize; + le16_t bcdDFUVersion; +} usb_dfu_func_desc_t; + +#define USB_DFU_FUNC_DESC_LEN 0x09 +#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/usb_cdc_echo_main.c b/usb_dfu_main.c similarity index 93% rename from usb_cdc_echo_main.c rename to usb_dfu_main.c index fe02810..2535475 100644 --- a/usb_cdc_echo_main.c +++ b/usb_dfu_main.c @@ -4,6 +4,7 @@ * \brief Application implement * * 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 * @@ -40,5 +41,5 @@ int main(void) { atmel_start_init(); - cdcd_acm_example(); + usb_dfu(); } diff --git a/usb_start.c b/usb_start.c index de86172..4f9f875 100644 --- a/usb_start.c +++ b/usb_start.c @@ -1,9 +1,19 @@ /* - * Code generated from Atmel Start. + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file or main.c - * to avoid loosing it when reconfiguring. + * 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 "atmel_start.h" #include "usb_start.h" @@ -11,16 +21,14 @@ #if CONF_USBD_HS_SP static uint8_t single_desc_bytes[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_HS_DESCES_LS_FS}; + DFUD_HS_DESCES_LS_FS}; static uint8_t single_desc_bytes_hs[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_HS_DESCES_HS}; -#define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS + DFUD_HS_DESCES_HS}; #else static uint8_t single_desc_bytes[] = { /* Device descriptors and Configuration descriptors list. */ - CDCD_ACM_DESCES_LS_FS}; -#define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ + DFUD_DESCES_LS_FS}; #endif static struct usbd_descriptors single_desc[] @@ -31,62 +39,19 @@ #endif }; -/** Buffers to receive and echo the communication bytes. */ -static uint32_t usbd_cdc_buffer[CDCD_ECHO_BUF_SIZ / 4]; - /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; /** - * \brief Callback invoked when bulk OUT data received + * \brief USB DFU Init */ -static bool usb_device_cb_bulk_out(const uint8_t ep, const enum usb_xfer_code rc, const uint32_t count) -{ - cdcdf_acm_write((uint8_t *)usbd_cdc_buffer, count); - - /* No error. */ - return false; -} - -/** - * \brief Callback invoked when bulk IN data received - */ -static bool usb_device_cb_bulk_in(const uint8_t ep, const enum usb_xfer_code rc, const uint32_t count) -{ - /* Echo data. */ - cdcdf_acm_read((uint8_t *)usbd_cdc_buffer, sizeof(usbd_cdc_buffer)); - - /* No error. */ - return false; -} - -/** - * \brief Callback invoked when Line State Change - */ -static bool usb_device_cb_state_c(usb_cdc_control_signal_t state) -{ - if (state.rs232.DTR) { - /* Callbacks must be registered after endpoint allocation */ - cdcdf_acm_register_callback(CDCDF_ACM_CB_READ, (FUNC_PTR)usb_device_cb_bulk_out); - cdcdf_acm_register_callback(CDCDF_ACM_CB_WRITE, (FUNC_PTR)usb_device_cb_bulk_in); - /* Start Rx */ - cdcdf_acm_read((uint8_t *)usbd_cdc_buffer, sizeof(usbd_cdc_buffer)); - } - - /* No error. */ - return false; -} - -/** - * \brief CDC ACM Init - */ -void cdc_device_acm_init(void) +void usb_dfu_init(void) { /* usb stack init */ usbdc_init(ctrl_buffer); /* usbdc_register_funcion inside */ - cdcdf_acm_init(); + dfudf_init(); usbdc_start(single_desc); usbdc_attach(); @@ -102,14 +67,12 @@ * - Open a HyperTerminal or other COM tools in PC side. * - Send out a character or string and it will echo the content received. */ -void cdcd_acm_example(void) +void usb_dfu(void) { - while (!cdcdf_acm_is_enabled()) { - // wait cdc acm to be installed + while (!dfudf_is_enabled()) { + // wait DFU to be installed }; - cdcdf_acm_register_callback(CDCDF_ACM_CB_STATE_C, (FUNC_PTR)usb_device_cb_state_c); - while (1) { } } @@ -117,5 +80,5 @@ void usb_init(void) { - cdc_device_acm_init(); + usb_dfu_init(); } diff --git a/usb_start.h b/usb_start.h index 48b2735..37502b4 100644 --- a/usb_start.h +++ b/usb_start.h @@ -1,9 +1,19 @@ /* - * Code generated from Atmel Start. + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file or main.c - * to avoid loosing it when reconfiguring. + * 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_DEVICE_MAIN_H #define USB_DEVICE_MAIN_H @@ -12,11 +22,11 @@ extern "C" { #endif // __cplusplus -#include "cdcdf_acm.h" -#include "cdcdf_acm_desc.h" +#include "dfudf.h" +#include "dfudf_desc.h" -void cdcd_acm_example(void); -void cdc_device_acm_init(void); +void usb_dfu(void); +void usb_dfu_init(void); /** * \berif Initialize USB -- To view, visit https://gerrit.osmocom.org/12496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7bd6cb46b734ffe8a51f2de7083b4f9e76d385e6 Gerrit-Change-Number: 12496 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:14 +0000 Subject: Change in osmo-asf4-dfu[master]: ignore gdb history file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12497 ) Change subject: ignore gdb history file ...................................................................... ignore gdb history file Change-Id: Ie3acf07ad7404fa3981baf65dab2a3ef416f9938 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4608957..ad0fce7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ *.hex *.lss *.map +.gdb_history NOTES -- To view, visit https://gerrit.osmocom.org/12497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie3acf07ad7404fa3981baf65dab2a3ef416f9938 Gerrit-Change-Number: 12497 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:15 +0000 Subject: Change in osmo-asf4-dfu[master]: fix USB enabling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12498 ) Change subject: fix USB enabling ...................................................................... fix USB enabling Change-Id: I22cdd77648ac21490909423bf529fb31f30d6af0 --- M usb/class/dfu/device/dfudf.c 1 file changed, 22 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 7747a23..faf12c1 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -46,33 +46,31 @@ usb_iface_desc_t ifc_desc; uint8_t * ifc; - uint8_t i; ifc = desc->sod; - for (i = 0; i < 2; i++) { - 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); + 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; -- To view, visit https://gerrit.osmocom.org/12498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I22cdd77648ac21490909423bf529fb31f30d6af0 Gerrit-Change-Number: 12498 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:15 +0000 Subject: Change in osmo-asf4-dfu[master]: add documentation and fix timeout value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12499 ) Change subject: add documentation and fix timeout value ...................................................................... add documentation and fix timeout value Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8 --- M usb/class/dfu/device/dfudf_desc.h M usb/class/dfu/usb_protocol_dfu.h 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index f9eca38..5590e16 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -84,9 +84,9 @@ USB_DFU_PROTOCOL_DFU, \ CONF_USB_DFUD_IINTERFACE), \ USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ - 200, /* maximum time in milliseconds to detach (and reboot) */ \ - 1024, /* maximum transfer size */ \ - 0x0110 /*< DFU specification version 1.1 used */ ) + 0, /**< detaching makes only sense in run-time mode */ \ + 1024, /**< transfer size corresponds to page size for optimal flash writing */ \ + 0x0110 /**< DFU specification version 1.1 used */ ) #define DFUD_STR_DESCES \ CONF_USB_DFUD_LANGID_DESC \ diff --git a/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h index 2e7323f..7f82743 100644 --- a/usb/class/dfu/usb_protocol_dfu.h +++ b/usb/class/dfu/usb_protocol_dfu.h @@ -79,15 +79,15 @@ //! DFU Functional Descriptor typedef struct usb_dfu_func_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bmAttributes; - le16_t wDetachTimeOut; - le16_t wTransferSize; - le16_t bcdDFUVersion; + 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 0x09 +#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 */ \ -- To view, visit https://gerrit.osmocom.org/12499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8 Gerrit-Change-Number: 12499 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:16 +0000 Subject: Change in osmo-asf4-dfu[master]: add initial DFU class request handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12500 ) Change subject: add initial DFU class request handling ...................................................................... add initial DFU class request handling downloading is not supported yet, but the rest works Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf --- M usb/class/dfu/device/dfudf.c 1 file changed, 49 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index faf12c1..f3286a1 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -34,6 +34,9 @@ static struct usbdf_driver _dfudf; static struct dfudf_func_data _dfudf_funcd; +static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU state */ +static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU status */ + /** * \brief Enable DFU Function * \param[in] drv Pointer to USB device function driver @@ -137,15 +140,55 @@ if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request return ERR_NOT_FOUND; } + + int32_t to_return = ERR_NONE; + uint8_t response[6]; // buffer for the response to this request if ((req->wIndex == _dfudf_funcd.func_iface)) { // we don't verify the bmRequestType switch (req->bRequest) { - default: - return ERR_UNSUPPORTED_OP; + case USB_DFU_GETSTATUS: // get status + response[0] = dfu_status; // set status + response[1] = 100; // 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) { + dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state + } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode + dfu_state = USB_DFU_STATE_APP_DETACH; + } + 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, true); // send ACK + 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; + case USB_DFU_ABORT: // abort current operation + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK + //flash_pointer = (uint32_t)&__application_beginning; // reset download location + break; + case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode + case USB_DFU_UPLOAD: // upload firmware from flash not supported + case USB_DFU_DNLOAD: // download firmware on flash TODO implement + default: // all other DFU class request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) + break; } } else { - return ERR_NOT_FOUND; + to_return = ERR_NOT_FOUND; } + return to_return; } /** USB Device DFU Handler Struct */ @@ -165,11 +208,13 @@ 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; } /** - * \brief Deinitialize the USB DFU Function Driver + * \brief De-initialize the USB DFU Function Driver */ void dfudf_deinit(void) { -- To view, visit https://gerrit.osmocom.org/12500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf Gerrit-Change-Number: 12500 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:16 +0000 Subject: Change in osmo-asf4-dfu[master]: add flash ASF4 driver In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12501 ) Change subject: add flash ASF4 driver ...................................................................... add flash ASF4 driver this is imported from the Atmel Start website Change-Id: I5eccb37da64c7def7b99418773d09b6d98664432 --- A config/hpl_nvmctrl_config.h M gcc/Makefile A hal/documentation/flash.rst A hal/include/hal_flash.h A hal/include/hpl_flash.h A hal/include/hpl_user_area.h A hal/src/hal_flash.c A hpl/nvmctrl/hpl_nvmctrl.c 8 files changed, 1,705 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/config/hpl_nvmctrl_config.h b/config/hpl_nvmctrl_config.h new file mode 100644 index 0000000..daaba85 --- /dev/null +++ b/config/hpl_nvmctrl_config.h @@ -0,0 +1,36 @@ +/* Auto-generated config file hpl_nvmctrl_config.h */ +#ifndef HPL_NVMCTRL_CONFIG_H +#define HPL_NVMCTRL_CONFIG_H + +// <<< Use Configuration Wizard in Context Menu >>> + +// Basic Settings + +// Power Reduction Mode During Sleep +// <0x00=> Wake On Access +// <0x01=> Wake Up Instant +// <0x03=> Disabled +// nvm_arch_sleepprm +#ifndef CONF_NVM_SLEEPPRM +#define CONF_NVM_SLEEPPRM 0 +#endif + +// AHB0 Cache Disable +// Indicate whether AHB0 cache is disable or not +// nvm_arch_cache0 +#ifndef CONF_NVM_CACHE0 +#define CONF_NVM_CACHE0 0 +#endif + +// AHB1 Cache Disable +// Indicate whether AHB1 cache is disable or not +// nvm_arch_cache1 +#ifndef CONF_NVM_CACHE1 +#define CONF_NVM_CACHE1 0 +#endif + +// + +// <<< end of configuration section >>> + +#endif // HPL_NVMCTRL_CONFIG_H diff --git a/gcc/Makefile b/gcc/Makefile index 231ed39..f7c5b65 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -41,6 +41,7 @@ usb/device \ hpl/oscctrl \ gcc/gcc \ +hpl/nvmctrl \ hpl/usb \ hpl/core \ hpl/cmcc @@ -52,6 +53,7 @@ usb/class/dfu/device/dfudf.o \ hal/utils/src/utils_syscalls.o \ hpl/dmac/hpl_dmac.o \ +hpl/nvmctrl/hpl_nvmctrl.o \ gcc/system_same54.o \ hpl/usb/hpl_usb.o \ hal/src/hal_delay.o \ @@ -65,6 +67,7 @@ hpl/mclk/hpl_mclk.o \ hpl/ramecc/hpl_ramecc.o \ usb/usb_protocol.o \ +hal/src/hal_flash.o \ hal/src/hal_init.o \ gcc/gcc/startup_same54.o \ hal/src/hal_usb_device.o \ @@ -81,12 +84,14 @@ usb/device/usbdc.o \ hal/src/hal_atomic.o + OBJS_AS_ARGS += \ "hal/src/hal_io.o" \ "hpl/core/hpl_core_m4.o" \ "usb/class/dfu/device/dfudf.o" \ "hal/utils/src/utils_syscalls.o" \ "hpl/dmac/hpl_dmac.o" \ +"hpl/nvmctrl/hpl_nvmctrl.o" \ "gcc/system_same54.o" \ "hpl/usb/hpl_usb.o" \ "hal/src/hal_delay.o" \ @@ -100,6 +105,7 @@ "hpl/mclk/hpl_mclk.o" \ "hpl/ramecc/hpl_ramecc.o" \ "usb/usb_protocol.o" \ +"hal/src/hal_flash.o" \ "hal/src/hal_init.o" \ "gcc/gcc/startup_same54.o" \ "hal/src/hal_usb_device.o" \ @@ -125,6 +131,7 @@ "hpl/ramecc/hpl_ramecc.d" \ "hpl/core/hpl_core_m4.d" \ "hal/utils/src/utils_syscalls.d" \ +"hpl/nvmctrl/hpl_nvmctrl.d" \ "usb/class/dfu/device/dfudf.d" \ "gcc/gcc/startup_same54.d" \ "hpl/usb/hpl_usb.d" \ @@ -136,6 +143,7 @@ "hpl/core/hpl_init.d" \ "hpl/pm/hpl_pm.d" \ "usb/usb_protocol.d" \ +"hal/src/hal_flash.d" \ "hpl/gclk/hpl_gclk.d" \ "hal/src/hal_usb_device.d" \ "hpl/dmac/hpl_dmac.d" \ @@ -199,7 +207,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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: $< @@ -208,7 +216,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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: $< @@ -217,7 +225,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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" \ +-I"../" -I"../config" -I"../examples" -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/hal/documentation/flash.rst b/hal/documentation/flash.rst new file mode 100644 index 0000000..fcc86e6 --- /dev/null +++ b/hal/documentation/flash.rst @@ -0,0 +1,52 @@ +The Flash Driver +================ + +Flash is a re-programmable memory that retains program and data +storage even with power off. + +User can write or read several bytes from any valid address in a flash. + +As to the erase/lock/unlock command, the input parameter of address should +be a bytes address aligned with the page start, otherwise, the command will fail +to be executed. At the meantime, the number of pages that can be locked or unlocked +at once depends on region size of the flash. User can get the real number +from the function return value which could be different for the different devices. + +Features +-------- + +* Initialization/de-initialization +* Writing/Reading bytes +* Locking/Unlocking/Erasing pages +* Notifications about errors or being ready for a new command + +Applications +------------ + +* Mini disk which can retain program and data storage +* Boot loader +* Non volatile storage + +Dependencies +------------ + +The peripheral which controls a re-programmable flash memory. + +Concurrency +----------- + +N/A + +Limitations +----------- + +User should pay attention to set a proper stack size in their application, +since the driver manages a temporary buffer in stack to cache unchanged data +when calling flash write and erase function. +Due to flash memory architecture of SAMD21/D20/L21/L22/C20/C21/D09/D10/D11/R21, +write operation erazes row content before each write. + +Known issues and workarounds +---------------------------- + +N/A diff --git a/hal/include/hal_flash.h b/hal/include/hal_flash.h new file mode 100644 index 0000000..8216afd --- /dev/null +++ b/hal/include/hal_flash.h @@ -0,0 +1,209 @@ +/** + * \file + * + * \brief Flash related functionality declaration. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HAL_FLASH_H_INCLUDED +#define _HAL_FLASH_H_INCLUDED + +#include + +/** + * \addtogroup doc_driver_hal_flash + * + * @{ + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Forward declaration of flash_descriptor. */ +struct flash_descriptor; + +/** The callback types */ +enum flash_cb_type { + /** Callback type for ready to accept a new command */ + FLASH_CB_READY, + /** Callback type for error */ + FLASH_CB_ERROR, + FLASH_CB_N +}; + +/** \brief Prototype of callback on FLASH + * + */ +typedef void (*flash_cb_t)(struct flash_descriptor *const descr); + +/** \brief FLASH HAL callbacks + * + */ +struct flash_callbacks { + /** Callback invoked when ready to accept a new command */ + flash_cb_t cb_ready; + /** Callback invoked when error occurs */ + flash_cb_t cb_error; +}; + +/** \brief FLASH HAL driver struct for asynchronous access + */ +struct flash_descriptor { + /** Pointer to FLASH device instance */ + struct _flash_device dev; + /** Callbacks for asynchronous transfer */ + struct flash_callbacks callbacks; +}; + +/** \brief Initialize the FLASH HAL instance and hardware for callback mode + * + * Initialize FLASH HAL with interrupt mode (uses callbacks). + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] hw Pointer to the hardware base. + * \return Initialize status. + */ +int32_t flash_init(struct flash_descriptor *flash, void *const hw); + +/** \brief Deinitialize the FLASH HAL instance + * + * Abort transfer, disable and reset FLASH, and deinitialize software. + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \return Deinitialze status. + */ +int32_t flash_deinit(struct flash_descriptor *flash); + +/** \brief Writes a number of bytes to a page in the internal Flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to a buffer where the content + * will be written to the flash + * \param[in] length Number of bytes to write + * \return Write status. + */ +int32_t flash_write(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Appends a number of bytes to a page in the internal Flash + * + * This functions never erases the flash before writing. + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address to write to flash + * \param[in] buffer Pointer to a buffer with data to write to flash + * \param[in] length Number of bytes to append + * \return Append status. + */ +int32_t flash_append(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Reads a number of bytes to a page in the internal Flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read pages will be stored + * \param[in] length Number of bytes to read + * \return Read status. + */ +int32_t flash_read(struct flash_descriptor *flash, uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** \brief Register a function as FLASH transfer completion callback + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] type Callback type (\ref flash_cb_type). + * \param[in] func Pointer to callback function. + * \retval 0 Success + * \retval -1 Error + */ +int32_t flash_register_callback(struct flash_descriptor *flash, const enum flash_cb_type type, flash_cb_t func); + +/** \brief Execute lock in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be locked + * \param[in] page_nums Number of pages to be locked + * + * \return Real locked numbers of pages. + */ +int32_t flash_lock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** \brief Execute unlock in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be unlocked + * \param[in] page_nums Number of pages to be unlocked + * + * \return Real unlocked numbers of pages. + */ +int32_t flash_unlock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** \brief Execute erase in the internal flash + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] dst_addr Destination bytes address aligned with page + * start to be erased + * \param[in] page_nums Number of pages to be erased + * \retval 0 Success + * \retval -1 Error + */ +int32_t flash_erase(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums); + +/** + * \brief Get the flash page size + * + * \param[in, out] flash Pointer to the HAL FLASH instance + * + * \return The flash page size + */ +uint32_t flash_get_page_size(struct flash_descriptor *flash); + +/** + * \brief Get the number of flash page + * + * \param[in, out] flash Pointer to the HAL FLASH instance. + * + * \return The flash total page numbers + */ +uint32_t flash_get_total_pages(struct flash_descriptor *flash); + +/** \brief Retrieve the current driver version + * + * \return Current driver version. + */ +uint32_t flash_get_version(void); + +#ifdef __cplusplus +} +#endif +/**@}*/ +#endif /* ifndef _HAL_FLASH_H_INCLUDED */ diff --git a/hal/include/hpl_flash.h b/hal/include/hpl_flash.h new file mode 100644 index 0000000..3a42c44 --- /dev/null +++ b/hal/include/hpl_flash.h @@ -0,0 +1,265 @@ +/** + * \file + * + * \brief FLASH related functionality declaration. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HPL_FLASH_H_INCLUDED +#define _HPL_FLASH_H_INCLUDED + +/** + * \addtogroup hpl__flash__group FLASH HPL APIs + * + */ + +/**@{*/ + +#include +#include "hpl_irq.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief FLASH device structure + * + * The FLASH device structure forward declaration. + */ +struct _flash_device; + +/** The callback types */ +enum _flash_cb_type { FLASH_DEVICE_CB_READY, FLASH_DEVICE_CB_ERROR, FLASH_DEVICE_CB_N }; + +/** + * \brief FLASH interrupt handlers structure + */ +struct _flash_callback { + /** Ready to accept new command handler */ + void (*ready_cb)(struct _flash_device *device); + /** Error handler */ + void (*error_cb)(struct _flash_device *device); +}; + +/** + * \brief FLASH descriptor device structure. + */ +struct _flash_device { + struct _flash_callback flash_cb; /*!< Interrupt handers */ + struct _irq_descriptor irq; /*!< Interrupt descriptor */ + void * hw; /*!< Hardware module instance handler */ +}; + +/** + * \brief Initialize FLASH. + * + * This function does low level FLASH configuration. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] hw The pointer to hardware instance + * + * \return Initialize status. + */ +int32_t _flash_init(struct _flash_device *const device, void *const hw); + +/** + * \brief Deinitialize FLASH. + * + * \param[in] device The pointer to FLASH device instance + */ +void _flash_deinit(struct _flash_device *const device); + +/** + * \brief Reads a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read page will be stored + * \param[in] length Number of bytes to read + */ +void _flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Writes a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] length Number of bytes to write + */ +void _flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Appends a number of bytes in the internal Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer with data to write to flash + * \param[in] length Number of bytes to write + */ +void _flash_append(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); + +/** \brief Execute lock in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be locked + * \param[in] page_nums Number of pages to be locked + * + * \return Real locked numbers of pages. + */ +int32_t _flash_lock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** \brief Execute unlock in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be unlocked + * \param[in] page_nums Number of pages to be unlocked + * + * \return Real unlocked numbers of pages. + */ +int32_t _flash_unlock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** \brief check whether the region which is pointed by address + * is locked + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to check + * + * \return The lock status of assigned address. + */ +bool _flash_is_locked(struct _flash_device *const device, const uint32_t dst_addr); + +/** \brief Execute erase in the internal flash + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address aligned with page + * start to be erased + * \param[in] page_nums Number of pages to be erased + */ +void _flash_erase(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums); + +/** + * \brief Get the flash page size. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash page size + */ +uint32_t _flash_get_page_size(struct _flash_device *const device); + +/** + * \brief Get the numbers of flash page. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash total page numbers + */ +uint32_t _flash_get_total_pages(struct _flash_device *const device); + +/** + * \brief Get the number of wait states for read and write operations. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The number of wait states for read and write operations + */ +uint8_t _flash_get_wait_state(struct _flash_device *const device); + +/** + * \brief Set the number of wait states for read and write operations. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] state The number of wait states + * + */ +void _flash_set_wait_state(struct _flash_device *const device, uint8_t state); + +/** + * \brief Enable/disable Flash interrupt + * + * param[in] device The pointer to Flash device instance + * param[in] type The type of interrupt to disable/enable if applicable + * param[in] state Enable or disable + */ +void _flash_set_irq_state(struct _flash_device *const device, const enum _flash_cb_type type, const bool state); + +/* + * Below RWW flash APIs are only available for device which has RWWEE + * flash array, such as SAM C20/C21/D21/L21/L22/R30/DA1/HA1 etc. + */ +/** + * \brief Get the RWWEE flash page size. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash page size + */ +uint32_t _rww_flash_get_page_size(struct _flash_device *const device); + +/** + * \brief Get the total page numbers of RWWEE flash. + * + * \param[in] device The pointer to FLASH device instance + * + * \return The flash total page numbers + */ +uint32_t _rww_flash_get_total_pages(struct _flash_device *const device); + +/** + * \brief Reads a number of bytes in the internal RWWEE Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] src_addr Source bytes address to read from flash + * \param[out] buffer Pointer to a buffer where the content + * of the read page will be stored + * \param[in] length Number of bytes to read + * + * \return Read status, ERR_NONE for successful read. + */ +int32_t _rww_flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length); + +/** + * \brief Writes a number of bytes in the internal RWWEE Flash. + * + * \param[in] device The pointer to FLASH device instance + * \param[in] dst_addr Destination bytes address to write into flash + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] length Number of bytes to write + * + * \return Write status, ERR_NONE for successful write. + */ +int32_t _rww_flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length); +#ifdef __cplusplus +} +#endif + +/**@}*/ + +#endif /* _HPL_FLASH_H_INCLUDED */ diff --git a/hal/include/hpl_user_area.h b/hal/include/hpl_user_area.h new file mode 100644 index 0000000..1f14098 --- /dev/null +++ b/hal/include/hpl_user_area.h @@ -0,0 +1,123 @@ +/** + * \file + * + * \brief Special user data area access + * + * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 _HPL_USER_DATA_H_INCLUDED +#define _HPL_USER_DATA_H_INCLUDED + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief Read data from user data area + * + * The user data area could be the area that stores user data that is not erased + * with the flash contents, e.g., + * - NVM Software Calibration Area of SAM D/L/C family + * - User Signature of SAM E/S/V 70 + * + * \param[in] base The base address of the user area + * \param[in] offset The byte offset of the data to be read inside the area + * \param[out] buf Pointer to buffer to place the read data + * \param[in] size Size of data in number of bytes + * + * \return Operation status or bytes read. + * \retval ERR_NONE Data read successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_read(const void *base, const uint32_t offset, uint8_t *buf, const uint32_t size); + +/** + * \brief Read no more than 32 bits data from user data area + * + * When reading bits, the bitfield can cross 32-bis boundaries. + * + * \param[in] base The base address of the user area + * \param[in] bit_offset Offset in number of bits + * \param[in] n_bits Number of bits to read + * \return data read, assert if anything wrong (address not in user area + * offset, size error, etc.). + */ +uint32_t _user_area_read_bits(const void *base, const uint32_t bit_offset, const uint8_t n_bits); + +/** + * \brief Write data to user data area + * + * The user data area could be the area that stores user data that is not erased + * with the flash contents, e.g., + * - NVM Software Calibration Area of SAM D/L/C family + * - User Signature of SAM E/S/V 70 + * + * When assigned offset and size exceeds the data area, error is reported. + * + * \param[out] base The base address of the user area + * \param[in] offset The offset of the data to be written inside the area + * \param[in] buf Pointer to buffer to place the written data + * \param[in] size Size of data in number of bytes + * + * \return Operation status or bytes writting. + * \retval ERR_NONE Data written successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_DENIED Security bit is set + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_write(void *base, const uint32_t offset, const uint8_t *buf, const uint32_t size); + +/** + * \brief Write no more than 32 bits data to user data area + * + * When writting bits, the bitfield can cross 32-bis boundaries. + * + * \param[out] base The base address of the user area + * \param[in] bit_offset Offset in number of bits + * \param[in] bits The data content + * \param[in] n_bits Number of bits to write + * \return Operation result + * \retval ERR_NONE Data written successfully + * \retval ERR_UNSUPPORTED_OP base address not in any supported user area + * \retval ERR_DENIED Security bit is set + * \retval ERR_BAD_ADDRESS offset not in right area + * \retval ERR_INVALID_ARG offset and size exceeds the right area + */ +int32_t _user_area_write_bits(void *base, const uint32_t bit_offset, const uint32_t bits, const uint8_t n_bits); + +#ifdef __cplusplus +} +#endif + +#endif /* _HPL_USER_DATA_H_INCLUDED */ diff --git a/hal/src/hal_flash.c b/hal/src/hal_flash.c new file mode 100644 index 0000000..b1a58b7 --- /dev/null +++ b/hal/src/hal_flash.c @@ -0,0 +1,314 @@ +/** + * \file + * + * \brief Flash functionality implementation. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 + * + */ + +#include "hal_flash.h" +#include +#include +#include + +/** + * \brief Driver version + */ +#define DRIVER_VERSION 0x00000001u + +static void flash_ready(struct _flash_device *device); +static void flash_error(struct _flash_device *device); + +static int32_t flash_is_address_aligned(struct flash_descriptor *flash, const uint32_t flash_addr); + +/** + * \brief Initialize the FLASH HAL instance and hardware for callback mode. + */ +int32_t flash_init(struct flash_descriptor *flash, void *const hw) +{ + int32_t rc; + + ASSERT(flash && hw); + + rc = _flash_init(&flash->dev, hw); + if (rc) { + return rc; + } + + flash->dev.flash_cb.ready_cb = flash_ready; + flash->dev.flash_cb.error_cb = flash_error; + + return ERR_NONE; +} + +/** + * \brief Deinitialize the FLASH HAL instance. + */ +int32_t flash_deinit(struct flash_descriptor *flash) +{ + ASSERT(flash); + + _flash_deinit(&flash->dev); + + return ERR_NONE; +} + +/** + * \brief Reads a number of bytes to a page in the internal Flash + */ +int32_t flash_read(struct flash_descriptor *flash, uint32_t src_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((src_addr > page_size * total_pages) || (src_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + _flash_read(&flash->dev, src_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Updates several bytes to the internal Flash + */ +int32_t flash_write(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((dst_addr > page_size * total_pages) || (dst_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + if (_flash_is_locked(&flash->dev, dst_addr)) { + return ERR_DENIED; + } + + _flash_write(&flash->dev, dst_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Appends a number of bytes to a page in the internal Flash + */ +int32_t flash_append(struct flash_descriptor *flash, uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + ASSERT(flash && buffer && length); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + + /* Check if the address is valid */ + if ((dst_addr > page_size * total_pages) || (dst_addr + length > page_size * total_pages)) { + return ERR_BAD_ADDRESS; + } + + if (_flash_is_locked(&flash->dev, dst_addr)) { + return ERR_DENIED; + } + + _flash_append(&flash->dev, dst_addr, buffer, length); + + return ERR_NONE; +} + +/** + * \brief Execute erase in the internal flash + */ +int32_t flash_erase(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + _flash_erase(&flash->dev, dst_addr, page_nums); + + return ERR_NONE; +} + +/** + * \brief Register a function as FLASH transfer completion callback + */ +int32_t flash_register_callback(struct flash_descriptor *flash, const enum flash_cb_type type, flash_cb_t func) +{ + ASSERT(flash); + + switch (type) { + case FLASH_CB_READY: + flash->callbacks.cb_ready = func; + break; + + case FLASH_CB_ERROR: + flash->callbacks.cb_error = func; + break; + + default: + return ERR_INVALID_ARG; + } + + _flash_set_irq_state(&flash->dev, (enum _flash_cb_type)type, NULL != func); + + return ERR_NONE; +} + +/** + * \brief Execute lock in the internal flash + */ +int32_t flash_lock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + return _flash_lock(&flash->dev, dst_addr, page_nums); +} + +/** + * \brief Execute unlock in the internal flash + */ +int32_t flash_unlock(struct flash_descriptor *flash, const uint32_t dst_addr, const uint32_t page_nums) +{ + ASSERT(flash && page_nums); + uint32_t page_size = _flash_get_page_size(&flash->dev); + uint32_t total_pages = _flash_get_total_pages(&flash->dev); + int32_t rc; + + rc = flash_is_address_aligned(flash, dst_addr); + if (rc) { + return rc; + } + + if ((page_nums > total_pages) || (dst_addr / page_size + page_nums > total_pages)) { + return ERR_INVALID_ARG; + } + + return _flash_unlock(&flash->dev, dst_addr, page_nums); +} + +/** + * \brief Get the flash page size. + */ +uint32_t flash_get_page_size(struct flash_descriptor *flash) +{ + ASSERT(flash); + return _flash_get_page_size(&flash->dev); +} + +/** + * \brief Get the numbers of flash page. + */ +uint32_t flash_get_total_pages(struct flash_descriptor *flash) +{ + ASSERT(flash); + return _flash_get_total_pages(&flash->dev); +} + +/** + * \brief Retrieve the current driver version + */ +uint32_t flash_get_version(void) +{ + return DRIVER_VERSION; +} + +/** + * \internal check the address whether it is aligned + * \param[in, out] flash Pointer to the HAL FLASH instance. + * \param[in] flash_addr address to be check in flash + * + * \return whether it is valid + * \retval 0 Valid. + * \retval -1 Error, invalid. + */ +static int32_t flash_is_address_aligned(struct flash_descriptor *flash, const uint32_t flash_addr) +{ + ASSERT(flash); + + uint32_t page_size = _flash_get_page_size(&flash->dev); + + /* Check if the read address not aligned to the start of a page */ + if (flash_addr & (page_size - 1)) { + return ERR_BAD_ADDRESS; + } + return ERR_NONE; +} + +/** + * \internal Ready for a new flash command + * + * \param[in] device The pointer to flash device structure + */ +static void flash_ready(struct _flash_device *device) +{ + struct flash_descriptor *const descr = CONTAINER_OF(device, struct flash_descriptor, dev); + if (descr->callbacks.cb_ready) { + descr->callbacks.cb_ready(descr); + } +} + +/** + * \internal Error occurs in flash command + * + * \param[in] device The pointer to flash device structure + */ +static void flash_error(struct _flash_device *device) +{ + struct flash_descriptor *const descr = CONTAINER_OF(device, struct flash_descriptor, dev); + if (descr->callbacks.cb_error) { + descr->callbacks.cb_error(descr); + } +} diff --git a/hpl/nvmctrl/hpl_nvmctrl.c b/hpl/nvmctrl/hpl_nvmctrl.c new file mode 100644 index 0000000..63f6145 --- /dev/null +++ b/hpl/nvmctrl/hpl_nvmctrl.c @@ -0,0 +1,695 @@ + +/** + * \file + * + * \brief Non-Volatile Memory Controller + * + * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries. + * + * \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 + * + */ + +#include +#include +#include +#include +#include +#include + +#define NVM_MEMORY ((volatile uint32_t *)FLASH_ADDR) +#define NVMCTRL_BLOCK_PAGES (NVMCTRL_BLOCK_SIZE / NVMCTRL_PAGE_SIZE) +#define NVMCTRL_REGIONS_NUM 32 +#define NVMCTRL_INTFLAG_ERR \ + (NVMCTRL_INTFLAG_ADDRE | NVMCTRL_INTFLAG_PROGE | NVMCTRL_INTFLAG_LOCKE | NVMCTRL_INTFLAG_ECCSE \ + | NVMCTRL_INTFLAG_NVME | NVMCTRL_INTFLAG_SEESOVF) +/** + * \brief NVM configuration type + */ +struct nvm_configuration { + hri_nvmctrl_ctrlb_reg_t ctrla; /*!< Control B Register */ +}; + +/** + * \brief Array of NVM configurations + */ +static struct nvm_configuration _nvm + = {(CONF_NVM_CACHE0 << NVMCTRL_CTRLA_CACHEDIS0_Pos) | (CONF_NVM_CACHE1 << NVMCTRL_CTRLA_CACHEDIS1_Pos) + | (NVMCTRL_CTRLA_PRM(CONF_NVM_SLEEPPRM))}; + +/*!< Pointer to hpl device */ +static struct _flash_device *_nvm_dev = NULL; + +static void _flash_erase_block(void *const hw, const uint32_t dst_addr); +static void _flash_program(void *const hw, const uint32_t dst_addr, const uint8_t *buffer, const uint16_t size); + +/** + * \brief Initialize NVM + */ +int32_t _flash_init(struct _flash_device *const device, void *const hw) +{ + uint32_t ctrla; + + ASSERT(device && (hw == NVMCTRL)); + + device->hw = hw; + ctrla = hri_nvmctrl_read_CTRLA_reg(hw); + ctrla &= ~(NVMCTRL_CTRLA_CACHEDIS0 | NVMCTRL_CTRLA_CACHEDIS1 | NVMCTRL_CTRLA_PRM_Msk); + ctrla |= _nvm.ctrla; + hri_nvmctrl_write_CTRLA_reg(hw, ctrla); + + _nvm_dev = device; + NVIC_DisableIRQ(NVMCTRL_0_IRQn); + NVIC_DisableIRQ(NVMCTRL_1_IRQn); + NVIC_ClearPendingIRQ(NVMCTRL_0_IRQn); + NVIC_ClearPendingIRQ(NVMCTRL_1_IRQn); + NVIC_EnableIRQ(NVMCTRL_0_IRQn); + NVIC_EnableIRQ(NVMCTRL_1_IRQn); + + return ERR_NONE; +} + +/** + * \brief De-initialize NVM + */ +void _flash_deinit(struct _flash_device *const device) +{ + device->hw = NULL; + NVIC_DisableIRQ(NVMCTRL_0_IRQn); + NVIC_DisableIRQ(NVMCTRL_1_IRQn); +} + +/** + * \brief Get the flash page size. + */ +uint32_t _flash_get_page_size(struct _flash_device *const device) +{ + (void)device; + return (uint32_t)NVMCTRL_PAGE_SIZE; +} + +/** + * \brief Get the numbers of flash page. + */ +uint32_t _flash_get_total_pages(struct _flash_device *const device) +{ + (void)device; + return (uint32_t)hri_nvmctrl_read_PARAM_NVMP_bf(device->hw); +} + +/** + * \brief Get the number of wait states for read and write operations. + */ +uint8_t _flash_get_wait_state(struct _flash_device *const device) +{ + return hri_nvmctrl_get_CTRLA_reg(device->hw, NVMCTRL_CTRLA_RWS_Msk); +} + +/** + * \brief Set the number of wait states for read and write operations. + */ +void _flash_set_wait_state(struct _flash_device *const device, uint8_t state) +{ + hri_nvmctrl_write_CTRLA_RWS_bf(device->hw, state); +} + +/** + * \brief Reads a number of bytes to a page in the internal Flash. + */ +void _flash_read(struct _flash_device *const device, const uint32_t src_addr, uint8_t *buffer, uint32_t length) +{ + uint8_t *nvm_addr = (uint8_t *)NVM_MEMORY; + uint32_t i; + + /* Check if the module is busy */ + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + for (i = 0; i < length; i++) { + buffer[i] = nvm_addr[src_addr + i]; + } +} + +/** + * \brief Writes a number of bytes to a page in the internal Flash. + */ +void _flash_write(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + uint8_t tmp_buffer[NVMCTRL_BLOCK_PAGES][NVMCTRL_PAGE_SIZE]; + uint32_t block_start_addr, block_end_addr; + uint32_t i, j, k; + uint32_t wr_start_addr = dst_addr; + + do { + block_start_addr = wr_start_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + block_end_addr = block_start_addr + NVMCTRL_BLOCK_SIZE - 1; + + /* store the erase data into temp buffer before write */ + for (i = 0; i < NVMCTRL_BLOCK_PAGES; i++) { + _flash_read(device, block_start_addr + i * NVMCTRL_PAGE_SIZE, tmp_buffer[i], NVMCTRL_PAGE_SIZE); + } + + /* temp buffer update */ + j = (wr_start_addr - block_start_addr) / NVMCTRL_PAGE_SIZE; + k = wr_start_addr - block_start_addr - j * NVMCTRL_PAGE_SIZE; + while ((wr_start_addr <= block_end_addr) && (length > 0)) { + tmp_buffer[j][k] = *buffer; + k = (k + 1) % NVMCTRL_PAGE_SIZE; + + if (0 == k) { + j++; + } + + wr_start_addr++; + buffer++; + length--; + } + + /* erase row before write */ + _flash_erase_block(device->hw, block_start_addr); + + /* write buffer to flash */ + for (i = 0; i < NVMCTRL_BLOCK_PAGES; i++) { + _flash_program(device->hw, block_start_addr + i * NVMCTRL_PAGE_SIZE, tmp_buffer[i], NVMCTRL_PAGE_SIZE); + } + } while (block_end_addr < (wr_start_addr + length - 1)); +} + +/** + * \brief Appends a number of bytes in the internal Flash. + */ +void _flash_append(struct _flash_device *const device, const uint32_t dst_addr, uint8_t *buffer, uint32_t length) +{ + uint32_t page_start_addr = dst_addr & ~(NVMCTRL_PAGE_SIZE - 1); + uint32_t size; + uint32_t offset = 0; + + if (dst_addr != page_start_addr) { + /* Need to write some data to the end of a page */ + size = min(length, NVMCTRL_PAGE_SIZE - (dst_addr - page_start_addr)); + _flash_program(device->hw, dst_addr, buffer, size); + page_start_addr += NVMCTRL_PAGE_SIZE; + offset += size; + } + + while (offset < length) { + size = min(length - offset, NVMCTRL_PAGE_SIZE); + _flash_program(device->hw, page_start_addr, buffer + offset, size); + page_start_addr += NVMCTRL_PAGE_SIZE; + offset += size; + } +} + +/** + * \brief Execute erase in the internal flash + */ +void _flash_erase(struct _flash_device *const device, uint32_t dst_addr, uint32_t page_nums) +{ + uint8_t tmp_buffer[NVMCTRL_PAGE_SIZE]; + uint32_t block_start_addr; + uint32_t i; + + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + memset(tmp_buffer, 0xFF, NVMCTRL_PAGE_SIZE); + + /* when address is not aligned with block start address */ + if (dst_addr != block_start_addr) { + block_start_addr += NVMCTRL_BLOCK_SIZE; + for (i = 0; i < NVMCTRL_BLOCK_PAGES - 1; i++) { + _flash_write(device, dst_addr, tmp_buffer, NVMCTRL_PAGE_SIZE); + + if (--page_nums == 0) { + return; + } + + dst_addr += NVMCTRL_PAGE_SIZE; + + if (dst_addr == block_start_addr) { + break; + } + } + } + + while (page_nums >= NVMCTRL_BLOCK_PAGES) { + _flash_erase_block(device->hw, block_start_addr); + block_start_addr += NVMCTRL_BLOCK_SIZE; + page_nums -= NVMCTRL_BLOCK_PAGES; + } + + if (page_nums != 0) { + for (i = 0; i < page_nums; i++) { + _flash_write(device, block_start_addr, tmp_buffer, NVMCTRL_PAGE_SIZE); + block_start_addr += NVMCTRL_PAGE_SIZE; + } + } +} + +/** + * \brief Execute lock in the internal flash + */ +int32_t _flash_lock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums) +{ + uint32_t region_pages; + uint32_t block_start_addr; + + region_pages = (uint32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + if ((page_nums != region_pages) || (dst_addr != block_start_addr)) { + return ERR_INVALID_ARG; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(device->hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(device->hw, NVMCTRL_CTRLB_CMD_LR | NVMCTRL_CTRLB_CMDEX_KEY); + + return (int32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); +} + +/** + * \brief Execute unlock in the internal flash + */ +int32_t _flash_unlock(struct _flash_device *const device, const uint32_t dst_addr, uint32_t page_nums) +{ + uint32_t region_pages; + uint32_t block_start_addr; + + region_pages = (uint32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); + block_start_addr = dst_addr & ~(NVMCTRL_BLOCK_SIZE - 1); + + if ((page_nums != region_pages) || (dst_addr != block_start_addr)) { + return ERR_INVALID_ARG; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(device->hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(device->hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(device->hw, NVMCTRL_CTRLB_CMD_UR | NVMCTRL_CTRLB_CMDEX_KEY); + + return (int32_t)FLASH_SIZE / (NVMCTRL_REGIONS_NUM * NVMCTRL_PAGE_SIZE); +} + +/** + * \brief check whether the region which is pointed by address + */ +bool _flash_is_locked(struct _flash_device *const device, const uint32_t dst_addr) +{ + uint16_t region_id; + + /* Get region for given page */ + region_id = dst_addr / (FLASH_SIZE / NVMCTRL_REGIONS_NUM); + + return !(hri_nvmctrl_get_RUNLOCK_reg(device->hw, 1 << region_id)); +} + +/** + * \brief Enable/disable Flash interrupt + */ +void _flash_set_irq_state(struct _flash_device *const device, const enum _flash_cb_type type, const bool state) +{ + ASSERT(device); + + if (FLASH_DEVICE_CB_READY == type) { + hri_nvmctrl_write_INTEN_DONE_bit(device->hw, state); + } else if (FLASH_DEVICE_CB_ERROR == type) { + if (state) { + hri_nvmctrl_write_INTEN_reg(device->hw, NVMCTRL_INTFLAG_ERR); + } else { + hri_nvmctrl_clear_INTEN_reg(device->hw, NVMCTRL_INTFLAG_ERR); + } + } +} + +/** + * \internal erase a row in flash + * \param[in] hw The pointer to hardware instance + * \param[in] dst_addr Destination page address to erase + */ +static void _flash_erase_block(void *const hw, const uint32_t dst_addr) +{ + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + /* Set address and command */ + hri_nvmctrl_write_ADDR_reg(hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_EB | NVMCTRL_CTRLB_CMDEX_KEY); +} + +/** + * \internal write a page in flash + * \param[in] hw The pointer to hardware instance + * \param[in] dst_addr Destination page address to write + * \param[in] buffer Pointer to buffer where the data to + * write is stored + * \param[in] size The size of data to write to a page + */ +static void _flash_program(void *const hw, const uint32_t dst_addr, const uint8_t *buffer, const uint16_t size) +{ + uint32_t *ptr_read = (uint32_t *)buffer; + uint32_t nvm_address = dst_addr / 4; + uint16_t i; + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_PBC | NVMCTRL_CTRLB_CMDEX_KEY); + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + /* Writes to the page buffer must be 32 bits, perform manual copy + * to ensure alignment */ + for (i = 0; i < size; i += 4) { + NVM_MEMORY[nvm_address++] = *ptr_read; + ptr_read++; + } + + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + hri_nvmctrl_write_ADDR_reg(hw, dst_addr); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_WP | NVMCTRL_CTRLB_CMDEX_KEY); +} + +/** + * \internal NVM interrupt handler + * + * \param[in] p The pointer to interrupt parameter + */ +static void _nvm_interrupt_handler(struct _flash_device *device) +{ + void *const hw = device->hw; + + if (hri_nvmctrl_get_INTFLAG_DONE_bit(hw)) { + hri_nvmctrl_clear_INTFLAG_DONE_bit(hw); + + if (NULL != device->flash_cb.ready_cb) { + device->flash_cb.ready_cb(device); + } + } else if (hri_nvmctrl_read_INTFLAG_reg(hw) && ~NVMCTRL_INTFLAG_ERR) { + hri_nvmctrl_clear_INTFLAG_reg(hw, NVMCTRL_INTFLAG_ERR); + + if (NULL != device->flash_cb.error_cb) { + device->flash_cb.error_cb(device); + } + } +} + +/** + * \internal NVM 0 interrupt handler + */ +void NVMCTRL_0_Handler(void) +{ + _nvm_interrupt_handler(_nvm_dev); +} + +/** + * \internal NVM 1 interrupt handler + */ +void NVMCTRL_1_Handler(void) +{ + _nvm_interrupt_handler(_nvm_dev); +} + +/* + The NVM User Row contains calibration data that are automatically read at device + power on. + The NVM User Row can be read at address 0x804000. + + The first eight 32-bit words (32 Bytes) of the Non Volatile Memory (NVM) User + Page contain calibration data that are automatically read at device power-on. + The remaining 480 Bytes can be used for storing custom parameters. + */ +#ifndef _NVM_USER_ROW_BASE +#define _NVM_USER_ROW_BASE 0x804000 +#endif +#define _NVM_USER_ROW_N_BITS 4096 +#define _NVM_USER_ROW_N_BYTES (_NVM_USER_ROW_N_BITS / 8) +#define _NVM_USER_ROW_END (((uint8_t *)_NVM_USER_ROW_BASE) + _NVM_USER_ROW_N_BYTES - 1) +#define _IS_NVM_USER_ROW(b) \ + (((uint8_t *)(b) >= (uint8_t *)(_NVM_USER_ROW_BASE)) && ((uint8_t *)(b) <= (uint8_t *)(_NVM_USER_ROW_END))) +#define _IN_NVM_USER_ROW(b, o) (((uint8_t *)(b) + (o)) <= (uint8_t *)(_NVM_USER_ROW_END)) + +/* + The NVM Software Calibration Area can be read at address 0x00800080. + The NVM Software Calibration Area can not be written. + */ +#ifndef _NVM_SW_CALIB_AREA_BASE +#define _NVM_SW_CALIB_AREA_BASE 0x00800080 +#endif +#define _NVM_SW_CALIB_AREA_N_BITS 45 +#define _NVM_SW_CALIB_AREA_N_BYTES (_NVM_SW_CALIB_AREA_N_BITS / 8) +#define _NVM_SW_CALIB_AREA_END (((uint8_t *)_NVM_SW_CALIB_AREA_BASE) + _NVM_SW_CALIB_AREA_N_BYTES - 1) +#define _IS_NVM_SW_CALIB_AREA(b) \ + (((uint8_t *)(b) >= (uint8_t *)_NVM_SW_CALIB_AREA_BASE) && ((uint8_t *)(b) <= (uint8_t *)_NVM_SW_CALIB_AREA_END)) +#define _IN_NVM_SW_CALIB_AREA(b, o) (((uint8_t *)(b) + (o)) <= (uint8_t *)(_NVM_SW_CALIB_AREA_END)) + +/** + * \internal Read left aligned data bits + * \param[in] base Base address for the data + * \param[in] bit_offset Offset for the bitfield start + * \param[in] n_bits Number of bits in the bitfield + */ +static inline uint32_t _user_area_read_l32_bits(const volatile uint32_t *base, const uint32_t bit_offset, + const uint8_t n_bits) +{ + return base[bit_offset >> 5] & ((1 << n_bits) - 1); +} + +/** + * \internal Read right aligned data bits + * \param[in] base Base address for the data + * \param[in] bit_offset Offset for the bitfield start + * \param[in] n_bits Number of bits in the bitfield + */ +static inline uint32_t _user_area_read_r32_bits(const volatile uint32_t *base, const uint32_t bit_offset, + const uint8_t n_bits) +{ + return (base[bit_offset >> 5] >> (bit_offset & 0x1F)) & ((1 << n_bits) - 1); +} + +int32_t _user_area_read(const void *base, const uint32_t offset, uint8_t *buf, uint32_t size) +{ + ASSERT(buf); + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, offset)) { + return ERR_BAD_ADDRESS; + } + + /* Cut off if request too many bytes */ + if (!_IN_NVM_USER_ROW(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + if (!_IN_NVM_SW_CALIB_AREA(base, offset)) { + return ERR_BAD_ADDRESS; + } + + /* Cut off if request too many bytes */ + if (!_IN_NVM_SW_CALIB_AREA(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else { + return ERR_UNSUPPORTED_OP; + } + + /* Copy data */ + memcpy(buf, ((uint8_t *)base) + offset, size); + return ERR_NONE; +} + +uint32_t _user_area_read_bits(const void *base, const uint32_t bit_offset, const uint8_t n_bits) +{ + volatile uint32_t *mem_base = (volatile uint32_t *)base; + uint32_t l_off, l_bits; + uint32_t r_off, r_bits; + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + ASSERT(_IN_NVM_USER_ROW(base, bit_offset >> 3) && _IN_NVM_USER_ROW(base, (bit_offset + n_bits - 1) >> 3)); + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + ASSERT(_IN_NVM_SW_CALIB_AREA(base, bit_offset >> 3) + && _IN_NVM_SW_CALIB_AREA(base, (bit_offset + n_bits - 1) >> 3)); + } else { + ASSERT(false); + } + + /* Since the bitfield can cross 32-bits boundaries, + * left and right bits are read from 32-bit aligned address + * and then combined together. */ + l_off = bit_offset & (~(32 - 1)); + r_off = l_off + 32; + l_bits = 32 - (bit_offset & (32 - 1)); + + if (n_bits > l_bits) { + r_bits = n_bits - l_bits; + } else { + l_bits = n_bits; + r_bits = 0; + } + + return _user_area_read_r32_bits(mem_base, bit_offset, l_bits) + + (_user_area_read_l32_bits(mem_base, r_off, r_bits) << l_bits); +} + +/** \internal Write 4096-bit user row + * \param[in] _row Pointer to 4096-bit user row data. + */ +static int32_t _user_row_write_exec(const uint32_t *_row) +{ + Nvmctrl *hw = NVMCTRL; + uint32_t ctrla = hri_nvmctrl_read_CTRLA_reg(NVMCTRL); + uint32_t i; + + /* Denied if Security Bit is set */ + if (DSU->STATUSB.bit.PROT) { + return ERR_DENIED; + } + + /* Do Save */ + + /* - Prepare. */ + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + hri_nvmctrl_clear_CTRLA_WMODE_bf(NVMCTRL, NVMCTRL_CTRLA_WMODE_Msk); + + /* - Erase AUX row. */ + hri_nvmctrl_write_ADDR_reg(hw, (hri_nvmctrl_addr_reg_t)_NVM_USER_ROW_BASE); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_EP | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + + for (i = 0; i < 32; i++) { /* 32 Quad words for User row: 32 * (4 bytes * 4) = 512 bytes */ + /* - Page buffer clear & write. */ + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_PBC | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + *(((uint32_t *)NVMCTRL_USER) + i * 4) = _row[i * 4]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 1) = _row[i * 4 + 1]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 2) = _row[i * 4 + 2]; + *(((uint32_t *)NVMCTRL_USER) + i * 4 + 3) = _row[i * 4 + 3]; + + /* - Write AUX row. */ + hri_nvmctrl_write_ADDR_reg(hw, (hri_nvmctrl_addr_reg_t)(_NVM_USER_ROW_BASE + i * 16)); + hri_nvmctrl_write_CTRLB_reg(hw, NVMCTRL_CTRLB_CMD_WQW | NVMCTRL_CTRLB_CMDEX_KEY); + while (!hri_nvmctrl_get_STATUS_READY_bit(hw)) { + /* Wait until this module isn't busy */ + } + } + + /* Restore CTRLA */ + hri_nvmctrl_write_CTRLA_reg(NVMCTRL, ctrla); + + return ERR_NONE; +} + +int32_t _user_area_write(void *base, const uint32_t offset, const uint8_t *buf, const uint32_t size) +{ + uint32_t _row[NVMCTRL_PAGE_SIZE / 4]; /* Copy of user row. */ + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, offset)) { + return ERR_BAD_ADDRESS; + } else if (!_IN_NVM_USER_ROW(base, offset + size - 1)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + return ERR_DENIED; + } else { + return ERR_UNSUPPORTED_OP; + } + + memcpy(_row, base, NVMCTRL_PAGE_SIZE); /* Store previous data. */ + memcpy((uint8_t *)_row + offset, buf, size); /* Modify with buf data. */ + + return _user_row_write_exec(_row); +} + +int32_t _user_area_write_bits(void *base, const uint32_t bit_offset, const uint32_t bits, const uint8_t n_bits) +{ + uint32_t _row[NVMCTRL_PAGE_SIZE / 4]; /* Copy of user row. */ + uint32_t l_off, l_bits; + uint32_t r_off, r_bits; + + /** Parameter check. */ + if (_IS_NVM_USER_ROW(base)) { + if (!_IN_NVM_USER_ROW(base, bit_offset >> 3)) { + return ERR_BAD_ADDRESS; + } else if (!_IN_NVM_USER_ROW(base, (bit_offset + n_bits - 1) >> 3)) { + return ERR_INVALID_ARG; + } + } else if (_IS_NVM_SW_CALIB_AREA(base)) { + return ERR_DENIED; + } else { + return ERR_UNSUPPORTED_OP; + } + + /* Since the bitfield can cross 32-bits boundaries, + * left and right bits are splitted for 32-bit aligned address + * and then saved. */ + l_off = bit_offset & (~(32 - 1)); + r_off = l_off + 32; + l_bits = 32 - (bit_offset & (32 - 1)); + + if (n_bits > l_bits) { + r_bits = n_bits - l_bits; + } else { + l_bits = n_bits; + r_bits = 0; + } + + memcpy(_row, base, NVMCTRL_PAGE_SIZE); /* Store previous data. */ + + if (l_bits) { + uint32_t l_mask = ((1 << l_bits) - 1) << (bit_offset & (32 - 1)); + _row[bit_offset >> 5] &= ~l_mask; + _row[bit_offset >> 5] |= (bits << (bit_offset & (32 - 1))) & l_mask; + } + + if (r_bits) { + uint32_t r_mask = (1 << r_bits) - 1; + _row[r_off >> 5] &= ~r_mask; + _row[r_off >> 5] |= bits >> l_bits; + } + + return _user_row_write_exec(_row); +} -- To view, visit https://gerrit.osmocom.org/12501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5eccb37da64c7def7b99418773d09b6d98664432 Gerrit-Change-Number: 12501 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:17 +0000 Subject: Change in osmo-asf4-dfu[master]: add code to initialize flash In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12502 ) Change subject: add code to initialize flash ...................................................................... add code to initialize flash Change-Id: I2a208abb39a9da8796e2a4bcb803ce32686cb95f --- M driver_init.c M driver_init.h 2 files changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/driver_init.c b/driver_init.c index 920593a..b324be8 100644 --- a/driver_init.c +++ b/driver_init.c @@ -126,9 +126,23 @@ USB_DEVICE_INSTANCE_PORT_init(); } +struct flash_descriptor FLASH_0; + +void FLASH_0_CLOCK_init(void) +{ + hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK); +} + +void FLASH_0_init(void) +{ + FLASH_0_CLOCK_init(); + flash_init(&FLASH_0, NVMCTRL); +} + void system_init(void) { init_mcu(); USB_DEVICE_INSTANCE_init(); + FLASH_0_init(); } diff --git a/driver_init.h b/driver_init.h index 5c029a4..0d440d4 100644 --- a/driver_init.h +++ b/driver_init.h @@ -26,6 +26,13 @@ void USB_DEVICE_INSTANCE_CLOCK_init(void); void USB_DEVICE_INSTANCE_init(void); +#include + +extern struct flash_descriptor FLASH_0; + +void FLASH_0_init(void); +void FLASH_0_CLOCK_init(void); + /** * \brief Perform system initialization, initialize pins and clocks for * peripherals -- To view, visit https://gerrit.osmocom.org/12502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2a208abb39a9da8796e2a4bcb803ce32686cb95f Gerrit-Change-Number: 12502 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:17 +0000 Subject: Change in osmo-asf4-dfu[master]: add system LED initialisation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12503 ) Change subject: add system LED initialisation ...................................................................... add system LED initialisation Change-Id: I79f1b769fc9dd7e1a972bacf0928ff46988f0e36 --- M atmel_start_pins.h M driver_init.c 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/atmel_start_pins.h b/atmel_start_pins.h index dbf9891..23b8d33 100644 --- a/atmel_start_pins.h +++ b/atmel_start_pins.h @@ -27,6 +27,10 @@ #define GPIO_PIN_FUNCTION_M 12 #define GPIO_PIN_FUNCTION_N 13 +/** LED pin to indicate system state (pull low to switch on */ +#define LED_SYSTEM GPIO(GPIO_PORTC, 18) + +/** USB D+/D- pins */ #define PA24 GPIO(GPIO_PORTA, 24) #define PA25 GPIO(GPIO_PORTA, 25) diff --git a/driver_init.c b/driver_init.c index b324be8..0b07cc1 100644 --- a/driver_init.c +++ b/driver_init.c @@ -143,6 +143,11 @@ { init_mcu(); + // configure system LED + gpio_set_pin_level(LED_SYSTEM, true); // switch off LED + gpio_set_pin_direction(LED_SYSTEM, GPIO_DIRECTION_OUT); + gpio_set_pin_function(LED_SYSTEM, GPIO_PIN_FUNCTION_OFF); + USB_DEVICE_INSTANCE_init(); FLASH_0_init(); } -- To view, visit https://gerrit.osmocom.org/12503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I79f1b769fc9dd7e1a972bacf0928ff46988f0e36 Gerrit-Change-Number: 12503 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:18 +0000 Subject: Change in osmo-asf4-dfu[master]: declare variables so the main loop can read the data to be flashed pr... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12505 ) Change subject: declare variables so the main loop can read the data to be flashed provided by the USB stack ...................................................................... declare variables so the main loop can read the data to be flashed provided by the USB stack Change-Id: I092357aad95abef1a781be1ea77944f2ea523dab --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf.h 2 files changed, 25 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index f3286a1..15a89fc 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -34,8 +34,13 @@ static struct usbdf_driver _dfudf; static struct dfudf_func_data _dfudf_funcd; -static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU state */ -static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU status */ +enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_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_progress = 0; +bool dfu_manifestation_complete = false; /** * \brief Enable DFU Function diff --git a/usb/class/dfu/device/dfudf.h b/usb/class/dfu/device/dfudf.h index ba5cdd5..a19b569 100644 --- a/usb/class/dfu/device/dfudf.h +++ b/usb/class/dfu/device/dfudf.h @@ -35,6 +35,24 @@ #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; +/** Progress of the already downloaded data in bytes */ +extern size_t dfu_download_progress; +/** If manifestation (firmware flash and check) is complete */ +extern bool dfu_manifestation_complete; /** * \brief Initialize the USB DFU Function Driver -- To view, visit https://gerrit.osmocom.org/12505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I092357aad95abef1a781be1ea77944f2ea523dab Gerrit-Change-Number: 12505 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:19 +0000 Subject: Change in osmo-asf4-dfu[master]: make USB descriptor available for the two state machines In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12506 ) Change subject: make USB descriptor available for the two state machines ...................................................................... make USB descriptor available for the two state machines this is required to know the DFU bmAttributes since they affect the state machine Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf_desc.h M usb_start.c 3 files changed, 15 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 15a89fc..42b708b 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -22,8 +22,9 @@ #include "dfudf.h" #include "usb_protocol_dfu.h" +#include "dfudf_desc.h" -/** USB Device DFU Fucntion Specific Data */ +/** USB Device DFU Function Specific Data */ struct dfudf_func_data { /** DFU Interface information */ uint8_t func_iface; @@ -34,6 +35,10 @@ 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_DFU_IDLE; enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index 5590e16..cd6ba41 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -75,6 +75,11 @@ 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, \ @@ -83,10 +88,7 @@ USB_DFU_SUBCLASS, \ USB_DFU_PROTOCOL_DFU, \ CONF_USB_DFUD_IINTERFACE), \ - USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ - 0, /**< detaching makes only sense in run-time mode */ \ - 1024, /**< transfer size corresponds to page size for optimal flash writing */ \ - 0x0110 /**< DFU specification version 1.1 used */ ) + DFUD_IFACE_DESCB #define DFUD_STR_DESCES \ CONF_USB_DFUD_LANGID_DESC \ diff --git a/usb_start.c b/usb_start.c index 4f9f875..d911db4 100644 --- a/usb_start.c +++ b/usb_start.c @@ -39,6 +39,9 @@ #endif }; +/** 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; /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; -- To view, visit https://gerrit.osmocom.org/12506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e Gerrit-Change-Number: 12506 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:20 +0000 Subject: Change in osmo-asf4-dfu[master]: restructure and complete the USB-side DFU state machine In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12507 ) Change subject: restructure and complete the USB-side DFU state machine ...................................................................... restructure and complete the USB-side DFU state machine the USB control request are now handled in separate function depending on the direction (IN or OUT). download and manifestation are handled. numerous additional state machine fixes are included. Change-Id: I5237393c2789fdeddca2182da25ef417a2e71216 --- M usb/class/dfu/device/dfudf.c 1 file changed, 133 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 42b708b..aefcab4 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -140,9 +140,136 @@ } /** + * \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 + 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_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_progress = 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; + case USB_DFU_DNLOAD: // download firmware on flash + if (!(usb_dfu_func_desc->bmAttributes & USB_REQ_DFU_DNLOAD)) { // download is not enabled + 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 if (USB_DFU_STATE_DFU_IDLE != dfu_state && USB_DFU_STATE_DFU_DNLOAD_IDLE != dfu_state) { // wrong state to request download + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else if (USB_DFU_STATE_DFU_IDLE == dfu_state && (0 == req->wLength)) { // download request should not start empty + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else if (USB_DFU_STATE_DFU_DNLOAD_IDLE == dfu_state && (0 == req->wLength)) { // download completed + dfu_manifestation_complete = false; // clear manifestation status + dfu_state = USB_DFU_STATE_DFU_MANIFEST_SYNC; // prepare for manifestation phase + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + } else if (req->wLength > sizeof(dfu_download_data)) { // there is more data to be flash then our buffer (the USB control buffer size should be less or equal) + // warn about programming error + dfu_status = USB_DFU_STATUS_ERR_PROG; + dfu_state = USB_DFU_STATE_DFU_ERROR; + to_return = ERR_INVALID_ARG; // stall control pipe to indicate error + } else { // there is data to be flash + if (USB_SETUP_STAGE == stage) { // there will be data to be flash + to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data + //to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + } else { // now there is data to be flashed + dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash + dfu_download_length = 0; + //dfu_download_length = req->wLength; // remember the data size to be flash + dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state + to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data + // we let the main application flash the data because this can be long and would stall the USB ISR + } + } + 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) @@ -151,54 +278,16 @@ return ERR_NOT_FOUND; } - int32_t to_return = ERR_NONE; - uint8_t response[6]; // buffer for the response to this request if ((req->wIndex == _dfudf_funcd.func_iface)) { - // we don't verify the bmRequestType - switch (req->bRequest) { - case USB_DFU_GETSTATUS: // get status - response[0] = dfu_status; // set status - response[1] = 100; // 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) { - dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state - } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { - dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode - dfu_state = USB_DFU_STATE_APP_DETACH; - } - 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, true); // send ACK - 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; - case USB_DFU_ABORT: // abort current operation - dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) - to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK - //flash_pointer = (uint32_t)&__application_beginning; // reset download location - break; - case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode - case USB_DFU_UPLOAD: // upload firmware from flash not supported - case USB_DFU_DNLOAD: // download firmware on flash TODO implement - default: // all other DFU class request - dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request - to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) - break; + if (req->bmRequestType & USB_EP_DIR_IN) { + return dfudf_in_req(ep, req, stage); + } else { + return dfudf_out_req(ep, req, stage); } } else { - to_return = ERR_NOT_FOUND; + return ERR_NOT_FOUND; } - return to_return; + return ERR_NOT_FOUND; } /** USB Device DFU Handler Struct */ -- To view, visit https://gerrit.osmocom.org/12507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5237393c2789fdeddca2182da25ef417a2e71216 Gerrit-Change-Number: 12507 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:20 +0000 Subject: Change in osmo-asf4-dfu[master]: implement flashing-side of the DFU state machine In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12508 ) Change subject: implement flashing-side of the DFU state machine ...................................................................... implement flashing-side of the DFU state machine the USB-side state machine currently sets the length to 0, preventing the actual flashing to be tested Change-Id: I5ed9cc2a22ed5e41bb59a3ce3f21ab098cec48e7 --- M usb_start.c 1 file changed, 69 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb_start.c b/usb_start.c index d911db4..0ce8aba 100644 --- a/usb_start.c +++ b/usb_start.c @@ -45,15 +45,20 @@ /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; +/** Application address in the flash + ( + * It comes after the bootloader. + * The NVMCTRL allows to reserve space at the beginning of the flash for the bootloader, but only in multiples of 8192 bytes. + * The binary just with the USB stack already uses 8 kB, we reserve 16 kB for the bootloader (giving use a bit of margin for future fixes). + */ +#define APPLICATION_ADDR (8192*2) + /** * \brief USB DFU Init */ void usb_dfu_init(void) { - /* usb stack init */ usbdc_init(ctrl_buffer); - - /* usbdc_register_funcion inside */ dfudf_init(); usbdc_start(single_desc); @@ -61,27 +66,74 @@ } /** - * Example of using CDC ACM Function. - * \note - * In this example, we will use a PC as a USB host: - * - Connect the DEBUG USB on XPLAINED board to PC for program download. - * - Connect the TARGET USB on XPLAINED board to PC for running program. - * The application will behave as a virtual COM. - * - Open a HyperTerminal or other COM tools in PC side. - * - Send out a character or string and it will echo the content received. + * \brief reset device + */ +static void usb_dfu_reset(const enum usb_event ev, const uint32_t param) +{ + (void)param; // not used + switch (ev) { + case USB_EV_RESET: + usbdc_detach(); // make sure we are detached + NVIC_SystemReset(); // initiate a system reset + break; + default: + break; + } + +} + +/** + * \brief Enter USB DFU runtime */ void usb_dfu(void) { - while (!dfudf_is_enabled()) { - // wait DFU to be installed - }; - - while (1) { + 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 + 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 + if (dfu_download_length > 0) { // there is some data to be flashed + int32_t rc = flash_write(&FLASH_0, APPLICATION_ADDR + dfu_download_progress, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + if (ERR_NONE == rc) { + dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed + } else { // there has been a programming error + dfu_state = USB_DFU_STATE_DFU_ERROR; + if (ERR_BAD_ADDRESS == rc) { + dfu_status = USB_DFU_STATUS_ERR_ADDRESS; + } else if (ERR_DENIED == rc) { + dfu_status = USB_DFU_STATUS_ERR_WRITE; + } else { + dfu_status = USB_DFU_STATUS_ERR_PROG; + } + } + } else { // there was no data to flash + // 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 + } + 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 + // in practice most downloaded files are just the raw binary with DFU suffix + dfu_manifestation_complete = true; // we completed flashing and all checks + if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST_SYNC; + } else { + dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; + } + } + if (USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET == dfu_state) { + if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_WILL_DETACH) { + usb_dfu_reset(USB_EV_RESET, 0); // immediately reset + } else { // wait for USB reset + usb_d_register_callback(USB_D_CB_EVENT, (FUNC_PTR)usb_dfu_reset); // register new USB reset event handler + } + } } } void usb_init(void) { - usb_dfu_init(); } -- To view, visit https://gerrit.osmocom.org/12508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ed9cc2a22ed5e41bb59a3ce3f21ab098cec48e7 Gerrit-Change-Number: 12508 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:21 +0000 Subject: Change in osmo-asf4-dfu[master]: removed unused USB CDC stack In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12509 ) Change subject: removed unused USB CDC stack ...................................................................... removed unused USB CDC stack Change-Id: Ib1735ad4add9278be9a1fb730752377de99c4f4b --- D documentation/usb_cdc_echo.rst D documentation/usb_device_cdc.rst D usb/class/cdc/device/atmel_devices_cdc.cat D usb/class/cdc/device/atmel_devices_cdc.inf D usb/class/cdc/device/cdcdf_acm.c D usb/class/cdc/device/cdcdf_acm.h D usb/class/cdc/device/cdcdf_acm_desc.h D usb/class/cdc/usb_protocol_cdc.h 8 files changed, 0 insertions(+), 1,317 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/documentation/usb_cdc_echo.rst b/documentation/usb_cdc_echo.rst deleted file mode 100644 index 5e4100d..0000000 --- a/documentation/usb_cdc_echo.rst +++ /dev/null @@ -1,45 +0,0 @@ -============ -USB CDC ECHO -============ - -This demo behaves like a virtual COM port based on USD device CDC. It echoes -back bytes received from the console. - -Drivers -------- -* USB Device - -Supported Evaluation Kit ------------------------- -* SAM D21 Xplained Pro -* SAM DA1 Xplained Pro -* SAM R21 Xplained Pro -* SAM D11 Xplained Pro -* SAM L21 Xplained Pro -* SAM L22 Xplained Pro -* SAM V71 Xplained Ultra -* SAM E70 Xplained -* SAM G55 Xplained Pro -* SAM E54 Xplained Pro - -Interface Settings ------------------- -* No extra board or wire connection is needed. -* The enumerated serial port does not bridge to any specific USRT hardware but - simply loopback data, so whatever serial port setting works. - -Running the Demo ----------------- - -1. Download the selected example, or export the example to save the .atzip file. -2. Import .atzip file into Atmel Studio 7, File->Import->Atmel Start Project. -3. Build and flash into supported evaluation board. -4. Connect PC host and TARGET USB plug with a USB cable. -5. Press the RESET button. -6. The serial port is detected by host PC. On Linux the driver will be installed - automatically. On Windows The INF and CAT file required can be extracted from - .atzip or found in generated Atmel Studio 7 project folder, relatively at - ./usb/class/cdc/device. -7. Open the detected/enumerated serial port using a serial port monitor - (e.g., TeraTerm). -8. Whatever sent from the serial port monitor will be echoed back then. diff --git a/documentation/usb_device_cdc.rst b/documentation/usb_device_cdc.rst deleted file mode 100644 index 305ff8f..0000000 --- a/documentation/usb_device_cdc.rst +++ /dev/null @@ -1,46 +0,0 @@ -============== -USB Device CDC -============== - -USB Device CDC (Communication Device Class)is a part of the USB Device Stack library. -It provides support for Abstract Control Model, which is one of the USB PSTN Device -Models. The device uses both a Data Class interface and a Communication Class interface -for it. For more detailed definition and description about this model, user can refer to -the related chapter in - -Features --------- - -* Initialization/de-initialization. -* Data transfer. -* Callbacks management on: - - * Transmission done - * Reception done - * Setting a new Line coding - * Line state changing - -Applications ------------- - -* Used as a vritual serial. - - -Dependencies ------------- - -* USB Device Driver -* USB Device Stack Core -* USB Protocol CDC - - -Limitations ------------ - -* Only single instance can be supported, not applied for multiple case. -* The INF and CAT file would be packed in atzip file. User can extract - them from "./usb/class/cdc/device". -* If user wants to combine CDC with other classes into one device, USB - Device Stack Composite component should be added from the web page - rather than USB Device Stack CDC ACM. diff --git a/usb/class/cdc/device/atmel_devices_cdc.cat b/usb/class/cdc/device/atmel_devices_cdc.cat deleted file mode 100644 index 09a0673..0000000 --- a/usb/class/cdc/device/atmel_devices_cdc.cat +++ /dev/null Binary files differ diff --git a/usb/class/cdc/device/atmel_devices_cdc.inf b/usb/class/cdc/device/atmel_devices_cdc.inf deleted file mode 100644 index d2df608..0000000 --- a/usb/class/cdc/device/atmel_devices_cdc.inf +++ /dev/null @@ -1,182 +0,0 @@ -; Windows 2000, XP, Vista, 7 and 8 (x32 and x64) setup file for Atmel CDC Devices -; Copyright (c) 2000-2013 ATMEL, Inc. - -[Version] -Signature = "$Windows NT$" -Class = Ports -ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318} - -Provider = %Manufacturer% -LayoutFile = layout.inf -CatalogFile = atmel_devices_cdc.cat -DriverVer = 01/08/2013,6.0.0.0 - -;---------------------------------------------------------- -; Targets -;---------------------------------------------------------- -[Manufacturer] -%Manufacturer%=DeviceList, NTAMD64, NTIA64, NT - -[DeviceList] -%ATMEL_CDC_XPLAINED%=DriverInstall, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NTAMD64] -%ATMEL_CDC_XPLAINED%=DriverInstall.NTamd64, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NTamd64, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NTamd64, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NTamd64, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NTIA64] -%ATMEL_CDC_XPLAINED%=DriverInstall.NTamd64, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NTamd64, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NTamd64, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NTamd64, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NTamd64, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NTamd64, USB\VID_03EB&PID_2426&MI_0C - -[DeviceList.NT] -%ATMEL_CDC_XPLAINED%=DriverInstall.NT, USB\VID_03EB&PID_2122 -%ATMEL_CDC_USB_ZIGBIT_Sub%=DriverInstall.NT, USB\VID_03EB&PID_214B -%ATMEL_CDC_USB_ZIGBIT_2_4%=DriverInstall.NT, USB\VID_03EB&PID_214A -%ATMEL_CDC_SFW_EXAMPLE%=DriverInstall.NT, USB\VID_03EB&PID_2307 -%ATMEL_CDC_EVK1XXX%=DriverInstall.NT, USB\VID_03EB&PID_2310 -%ATMEL_CDC_ASF_EXAMPLE%=DriverInstall.NT, USB\VID_03EB&PID_2404 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2%=DriverInstall.NT, USB\VID_03EB&PID_2421&MI_00 -%ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4%=DriverInstall.NT, USB\VID_03EB&PID_2424&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM1%=DriverInstall.NT, USB\VID_03EB&PID_2425&MI_00 -%ATMEL_CDC_ASF_EXAMPLE2_COM2%=DriverInstall.NT, USB\VID_03EB&PID_2425&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM1%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_00 -%ATMEL_CDC_ASF_EXAMPLE3_COM2%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_02 -%ATMEL_CDC_ASF_EXAMPLE3_COM3%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_04 -%ATMEL_CDC_ASF_EXAMPLE3_COM4%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_06 -%ATMEL_CDC_ASF_EXAMPLE3_COM5%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_08 -%ATMEL_CDC_ASF_EXAMPLE3_COM6%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_0A -%ATMEL_CDC_ASF_EXAMPLE3_COM7%=DriverInstall.NT, USB\VID_03EB&PID_2426&MI_0C - -;---------------------------------------------------------- -; Windows 2000, XP, Vista, Windows 7, Windows 8 - 32bit -;---------------------------------------------------------- -[Reader_Install.NTx86] - - -[DestinationDirs] -DefaultDestDir=12 -DriverInstall.NT.Copy=12 - -[DriverInstall.NT] -include=mdmcpq.inf -CopyFiles=DriverInstall.NT.Copy -AddReg=DriverInstall.NT.AddReg - -[DriverInstall.NT.Copy] -usbser.sys - -[DriverInstall.NT.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.NT.Services] -AddService = usbser, 0x00000002, DriverService.NT - -[DriverService.NT] -DisplayName = %Serial.SvcDesc% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\usbser.sys -LoadOrderGroup = Base - -;---------------------------------------------------------- -; Windows XP, Vista, Windows 7, Windows 8 - 64bit -;---------------------------------------------------------- - -[DriverInstall.NTamd64] -include=mdmcpq.inf -CopyFiles=DriverCopyFiles.NTamd64 -AddReg=DriverInstall.NTamd64.AddReg - -[DriverCopyFiles.NTamd64] -usbser.sys,,,0x20 - -[DriverInstall.NTamd64.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.NTamd64.Services] -AddService=usbser, 0x00000002, DriverService.NTamd64 - -[DriverService.NTamd64] -DisplayName=%Serial.SvcDesc% -ServiceType=1 -StartType=3 -ErrorControl=1 -ServiceBinary=%12%\usbser.sys - -;---------------------------------------------------------- -; String -;---------------------------------------------------------- - -[Strings] -Manufacturer = "ATMEL, Inc." -ATMEL_CDC_XPLAINED = "XPLAINED Virtual Com Port" -ATMEL_CDC_USB_ZIGBIT_Sub = "ZigBit SubGHz USBstick Com Port" -ATMEL_CDC_USB_ZIGBIT_2_4 = "ZigBit 2.4GHz USBstick Com Port" -ATMEL_CDC_SFW_EXAMPLE = "Communication Device Class SFW example" -ATMEL_CDC_EVK1XXX = "EVK1XXX Virtual Com Port" -ATMEL_CDC_ASF_EXAMPLE = "Communication Device Class ASF example" -ATMEL_CDC_ASF_COMPOSITE_EXAMPLE2 = "Communication Device Class ASF composite example 2" -ATMEL_CDC_ASF_COMPOSITE_EXAMPLE4 = "Communication Device Class ASF composite example 4" -ATMEL_CDC_ASF_EXAMPLE2_COM1 = "Communication Device Class ASF example2, COM1" -ATMEL_CDC_ASF_EXAMPLE2_COM2 = "Communication Device Class ASF example2, COM2" -ATMEL_CDC_ASF_EXAMPLE3_COM1 = "Communication Device Class ASF example3, COM1" -ATMEL_CDC_ASF_EXAMPLE3_COM2 = "Communication Device Class ASF example3, COM2" -ATMEL_CDC_ASF_EXAMPLE3_COM3 = "Communication Device Class ASF example3, COM3" -ATMEL_CDC_ASF_EXAMPLE3_COM4 = "Communication Device Class ASF example3, COM4" -ATMEL_CDC_ASF_EXAMPLE3_COM5 = "Communication Device Class ASF example3, COM5" -ATMEL_CDC_ASF_EXAMPLE3_COM6 = "Communication Device Class ASF example3, COM6" -ATMEL_CDC_ASF_EXAMPLE3_COM7 = "Communication Device Class ASF example3, COM7" - -Serial.SvcDesc = "USB Serial emulation driver" - diff --git a/usb/class/cdc/device/cdcdf_acm.c b/usb/class/cdc/device/cdcdf_acm.c deleted file mode 100644 index 2691cc8..0000000 --- a/usb/class/cdc/device/cdcdf_acm.c +++ /dev/null @@ -1,379 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Implementation. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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 - * - */ - -#include "cdcdf_acm.h" - -#define CDCDF_ACM_VERSION 0x00000001u -#define CDCDF_ACM_COMM_EP_INDEX 0 -#define CDCDF_ACM_DATA_EP_INDEX 1 - -/** USB Device CDC ACM Fucntion Specific Data */ -struct cdcdf_acm_func_data { - /** CDC Device ACM Interface information */ - uint8_t func_iface[2]; - /** CDC Device ACM IN Endpoint */ - uint8_t func_ep_in[2]; - /** CDC Device ACM OUT Endpoint */ - uint8_t func_ep_out; - /** CDC Device ACM Enable Flag */ - bool enabled; -}; - -static struct usbdf_driver _cdcdf_acm; -static struct cdcdf_acm_func_data _cdcdf_acm_funcd; -static struct usb_cdc_line_coding usbd_cdc_line_coding; - -static cdcdf_acm_notify_state_t cdcdf_acm_notify_state = NULL; -static cdcdf_acm_set_line_coding_t cdcdf_acm_set_line_coding = NULL; - -/** - * \brief Enable CDC ACM Function - * \param[in] drv Pointer to USB device function driver - * \param[in] desc Pointer to USB interface descriptor - * \return Operation status. - */ -static int32_t cdcdf_acm_enable(struct usbdf_driver *drv, struct usbd_descriptors *desc) -{ - struct cdcdf_acm_func_data *func_data = (struct cdcdf_acm_func_data *)(drv->func_data); - - usb_ep_desc_t ep_desc; - usb_iface_desc_t ifc_desc; - uint8_t * ifc, *ep; - uint8_t i; - - ifc = desc->sod; - for (i = 0; i < 2; i++) { - if (NULL == ifc) { - return ERR_NOT_FOUND; - } - - ifc_desc.bInterfaceNumber = ifc[2]; - ifc_desc.bInterfaceClass = ifc[5]; - - if ((CDC_CLASS_COMM == ifc_desc.bInterfaceClass) || (CDC_CLASS_DATA == ifc_desc.bInterfaceClass)) { - if (func_data->func_iface[i] == ifc_desc.bInterfaceNumber) { // Initialized - return ERR_ALREADY_INITIALIZED; - } else if (func_data->func_iface[i] != 0xFF) { // Occupied - return ERR_NO_RESOURCE; - } else { - func_data->func_iface[i] = ifc_desc.bInterfaceNumber; - } - } else { // Not supported by this function driver - return ERR_NOT_FOUND; - } - - // Install endpoints - ep = usb_find_desc(ifc, desc->eod, USB_DT_ENDPOINT); - while (NULL != ep) { - ep_desc.bEndpointAddress = ep[2]; - ep_desc.bmAttributes = ep[3]; - ep_desc.wMaxPacketSize = usb_get_u16(ep + 4); - if (usb_d_ep_init(ep_desc.bEndpointAddress, ep_desc.bmAttributes, ep_desc.wMaxPacketSize)) { - return ERR_NOT_INITIALIZED; - } - if (ep_desc.bEndpointAddress & USB_EP_DIR_IN) { - func_data->func_ep_in[i] = ep_desc.bEndpointAddress; - usb_d_ep_enable(func_data->func_ep_in[i]); - } else { - func_data->func_ep_out = ep_desc.bEndpointAddress; - usb_d_ep_enable(func_data->func_ep_out); - } - desc->sod = ep; - ep = usb_find_ep_desc(usb_desc_next(desc->sod), desc->eod); - } - ifc = usb_find_desc(usb_desc_next(desc->sod), desc->eod, USB_DT_INTERFACE); - } - // Installed - _cdcdf_acm_funcd.enabled = true; - return ERR_NONE; -} - -/** - * \brief Disable CDC ACM Function - * \param[in] drv Pointer to USB device function driver - * \param[in] desc Pointer to USB device descriptor - * \return Operation status. - */ -static int32_t cdcdf_acm_disable(struct usbdf_driver *drv, struct usbd_descriptors *desc) -{ - struct cdcdf_acm_func_data *func_data = (struct cdcdf_acm_func_data *)(drv->func_data); - - usb_iface_desc_t ifc_desc; - uint8_t i; - - if (desc) { - ifc_desc.bInterfaceClass = desc->sod[5]; - // Check interface - if ((ifc_desc.bInterfaceClass != CDC_CLASS_COMM) && (ifc_desc.bInterfaceClass != CDC_CLASS_DATA)) { - return ERR_NOT_FOUND; - } - } - - for (i = 0; i < 2; i++) { - if (func_data->func_iface[i] == 0xFF) { - continue; - } else { - func_data->func_iface[i] = 0xFF; - if (func_data->func_ep_in[i] != 0xFF) { - usb_d_ep_deinit(func_data->func_ep_in[i]); - func_data->func_ep_in[i] = 0xFF; - } - } - } - - if (func_data->func_ep_out != 0xFF) { - usb_d_ep_deinit(func_data->func_ep_out); - func_data->func_ep_out = 0xFF; - } - - _cdcdf_acm_funcd.enabled = false; - return ERR_NONE; -} - -/** - * \brief CDC ACM 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 cdcdf_acm_ctrl(struct usbdf_driver *drv, enum usbdf_control ctrl, void *param) -{ - switch (ctrl) { - case USBDF_ENABLE: - return cdcdf_acm_enable(drv, (struct usbd_descriptors *)param); - - case USBDF_DISABLE: - return cdcdf_acm_disable(drv, (struct usbd_descriptors *)param); - - case USBDF_GET_IFACE: - return ERR_UNSUPPORTED_OP; - - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class set request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_set_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) -{ - struct usb_cdc_line_coding line_coding_tmp; - uint16_t len = req->wLength; - uint8_t * ctrl_buf = usbdc_get_ctrl_buffer(); - - switch (req->bRequest) { - case USB_REQ_CDC_SET_LINE_CODING: - if (sizeof(struct usb_cdc_line_coding) != len) { - return ERR_INVALID_DATA; - } - if (USB_SETUP_STAGE == stage) { - return usbdc_xfer(ep, ctrl_buf, len, false); - } else { - memcpy(&line_coding_tmp, ctrl_buf, sizeof(struct usb_cdc_line_coding)); - if ((NULL == cdcdf_acm_set_line_coding) || (true == cdcdf_acm_set_line_coding(&line_coding_tmp))) { - usbd_cdc_line_coding = line_coding_tmp; - } - return ERR_NONE; - } - case USB_REQ_CDC_SET_CONTROL_LINE_STATE: - usbdc_xfer(0, NULL, 0, 0); - if (NULL != cdcdf_acm_notify_state) { - cdcdf_acm_notify_state(req->wValue); - } - return ERR_NONE; - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class get request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_get_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) -{ - uint16_t len = req->wLength; - - if (USB_DATA_STAGE == stage) { - return ERR_NONE; - } - - switch (req->bRequest) { - case USB_REQ_CDC_GET_LINE_CODING: - if (sizeof(struct usb_cdc_line_coding) != len) { - return ERR_INVALID_DATA; - } - return usbdc_xfer(ep, (uint8_t *)&usbd_cdc_line_coding, len, false); - default: - return ERR_INVALID_ARG; - } -} - -/** - * \brief Process the CDC class request - * \param[in] ep Endpoint address. - * \param[in] req Pointer to the request. - * \return Operation status. - */ -static int32_t cdcdf_acm_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 == _cdcdf_acm_funcd.func_iface[0]) || (req->wIndex == _cdcdf_acm_funcd.func_iface[1])) { - if (req->bmRequestType & USB_EP_DIR_IN) { - return cdcdf_acm_get_req(ep, req, stage); - } else { - return cdcdf_acm_set_req(ep, req, stage); - } - } else { - return ERR_NOT_FOUND; - } -} - -/** USB Device CDC ACM Handler Struct */ -static struct usbdc_handler cdcdf_acm_req_h = {NULL, (FUNC_PTR)cdcdf_acm_req}; - -/** - * \brief Initialize the USB CDC ACM Function Driver - */ -int32_t cdcdf_acm_init(void) -{ - if (usbdc_get_state() > USBD_S_POWER) { - return ERR_DENIED; - } - - _cdcdf_acm.ctrl = cdcdf_acm_ctrl; - _cdcdf_acm.func_data = &_cdcdf_acm_funcd; - - usbdc_register_function(&_cdcdf_acm); - usbdc_register_handler(USBDC_HDL_REQ, &cdcdf_acm_req_h); - return ERR_NONE; -} - -/** - * \brief Deinitialize the USB CDC ACM Function Driver - */ -void cdcdf_acm_deinit(void) -{ - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_COMM_EP_INDEX]); - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX]); - usb_d_ep_deinit(_cdcdf_acm_funcd.func_ep_out); -} - -/** - * \brief USB CDC ACM Function Read Data - */ -int32_t cdcdf_acm_read(uint8_t *buf, uint32_t size) -{ - if (!cdcdf_acm_is_enabled()) { - return ERR_DENIED; - } - return usbdc_xfer(_cdcdf_acm_funcd.func_ep_out, buf, size, false); -} - -/** - * \brief USB CDC ACM Function Write Data - */ -int32_t cdcdf_acm_write(uint8_t *buf, uint32_t size) -{ - if (!cdcdf_acm_is_enabled()) { - return ERR_DENIED; - } - return usbdc_xfer(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX], buf, size, true); -} - -/** - * \brief USB CDC ACM Stop the data transfer - */ -void cdcdf_acm_stop_xfer(void) -{ - /* Stop transfer. */ - usb_d_ep_abort(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX]); - usb_d_ep_abort(_cdcdf_acm_funcd.func_ep_out); -} - -/** - * \brief USB CDC ACM Function Register Callback - */ -int32_t cdcdf_acm_register_callback(enum cdcdf_acm_cb_type cb_type, FUNC_PTR func) -{ - switch (cb_type) { - case CDCDF_ACM_CB_READ: - usb_d_ep_register_callback(_cdcdf_acm_funcd.func_ep_out, USB_D_EP_CB_XFER, func); - break; - case CDCDF_ACM_CB_WRITE: - usb_d_ep_register_callback(_cdcdf_acm_funcd.func_ep_in[CDCDF_ACM_DATA_EP_INDEX], USB_D_EP_CB_XFER, func); - break; - case CDCDF_ACM_CB_LINE_CODING_C: - cdcdf_acm_set_line_coding = (cdcdf_acm_set_line_coding_t)func; - break; - case CDCDF_ACM_CB_STATE_C: - cdcdf_acm_notify_state = (cdcdf_acm_notify_state_t)func; - break; - default: - return ERR_INVALID_ARG; - } - return ERR_NONE; -} - -/** - * \brief Check whether CDC ACM Function is enabled - */ -bool cdcdf_acm_is_enabled(void) -{ - return _cdcdf_acm_funcd.enabled; -} - -/** - * \brief Return the CDC ACM line coding structure start address - */ -const struct usb_cdc_line_coding *cdcdf_acm_get_line_coding(void) -{ - return (const struct usb_cdc_line_coding *)&usbd_cdc_line_coding; -} - -/** - * \brief Return version - */ -uint32_t cdcdf_acm_get_version(void) -{ - return CDCDF_ACM_VERSION; -} diff --git a/usb/class/cdc/device/cdcdf_acm.h b/usb/class/cdc/device/cdcdf_acm.h deleted file mode 100644 index ad060bc..0000000 --- a/usb/class/cdc/device/cdcdf_acm.h +++ /dev/null @@ -1,108 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Definition. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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_CDC_ACM_SER_H_ -#define USBDF_CDC_ACM_SER_H_ - -#include "usbdc.h" -#include "usb_protocol_cdc.h" - -/** CDC ACM Class Callback Type */ -enum cdcdf_acm_cb_type { CDCDF_ACM_CB_READ, CDCDF_ACM_CB_WRITE, CDCDF_ACM_CB_LINE_CODING_C, CDCDF_ACM_CB_STATE_C }; - -/** CDC ACM Notify Line State Callback. */ -typedef void (*cdcdf_acm_notify_state_t)(uint16_t); - -/** CDC ACM Set Line Coding Callback. */ -typedef bool (*cdcdf_acm_set_line_coding_t)(struct usb_cdc_line_coding *); - -/** - * \brief Initialize the USB CDC ACM Function Driver - * \return Operation status. - */ -int32_t cdcdf_acm_init(void); - -/** - * \brief Deinitialize the USB CDC ACM Function Driver - * \return Operation status. - */ -void cdcdf_acm_deinit(void); - -/** - * \brief USB CDC ACM Function Read Data - * \param[in] buf Pointer to the buffer which receives data - * \param[in] size the size of data to be received - * \return Operation status. - */ -int32_t cdcdf_acm_read(uint8_t *buf, uint32_t size); - -/** - * \brief USB CDC ACM Function Write Data - * \param[in] buf Pointer to the buffer which stores data - * \param[in] size the size of data to be sent - * \return Operation status. - */ -int32_t cdcdf_acm_write(uint8_t *buf, uint32_t size); - -/** - * \brief USB CDC ACM Stop the currnet data transfer - */ -void cdcdf_acm_stop_xfer(void); - -/** - * \brief USB CDC ACM Function Register Callback - * \param[in] cb_type Callback type of CDC ACM Function - * \param[in] func Pointer to callback function - * \return Operation status. - */ -int32_t cdcdf_acm_register_callback(enum cdcdf_acm_cb_type cb_type, FUNC_PTR func); - -/** - * \brief Check whether CDC ACM Function is enabled - * \return Operation status. - * \return true CDC ACM Function is enabled - * \return false CDC ACM Function is disabled - */ -bool cdcdf_acm_is_enabled(void); - -/** - * \brief Return the CDC ACM line coding structure start address - * \return Pointer to USB CDC ACM line coding data. - */ -const struct usb_cdc_line_coding *cdcdf_acm_get_line_coding(void); - -/** - * \brief Return version - */ -uint32_t cdcdf_acm_get_version(void); - -#endif /* USBDF_CDC_ACM_SER_H_ */ diff --git a/usb/class/cdc/device/cdcdf_acm_desc.h b/usb/class/cdc/device/cdcdf_acm_desc.h deleted file mode 100644 index ca29d33..0000000 --- a/usb/class/cdc/device/cdcdf_acm_desc.h +++ /dev/null @@ -1,131 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack CDC ACM Function Descriptor Setting. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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_CDC_ACM_DESC_H_ -#define USBDF_CDC_ACM_DESC_H_ - -#include "usb_protocol.h" -#include "usb_protocol_cdc.h" -#include "usbd_config.h" - -#define CDCD_ACM_DEV_DESC \ - USB_DEV_DESC_BYTES(CONF_USB_CDCD_ACM_BCDUSB, \ - 0x02, \ - 0x00, \ - 0x00, \ - CONF_USB_CDCD_ACM_BMAXPKSZ0, \ - CONF_USB_CDCD_ACM_IDVENDER, \ - CONF_USB_CDCD_ACM_IDPRODUCT, \ - CONF_USB_CDCD_ACM_BCDDEVICE, \ - CONF_USB_CDCD_ACM_IMANUFACT, \ - CONF_USB_CDCD_ACM_IPRODUCT, \ - CONF_USB_CDCD_ACM_ISERIALNUM, \ - CONF_USB_CDCD_ACM_BNUMCONFIG) - -#define CDCD_ACM_DEV_QUAL_DESC \ - USB_DEV_QUAL_DESC_BYTES( \ - CONF_USB_CDCD_ACM_BCDUSB, 0x02, 0x00, 0x00, CONF_USB_CDCD_ACM_BMAXPKSZ0, CONF_USB_CDCD_ACM_BNUMCONFIG) - -#define CDCD_ACM_CFG_DESC \ - USB_CONFIG_DESC_BYTES(67, \ - 2, \ - CONF_USB_CDCD_ACM_BCONFIGVAL, \ - CONF_USB_CDCD_ACM_ICONFIG, \ - CONF_USB_CDCD_ACM_BMATTRI, \ - CONF_USB_CDCD_ACM_BMAXPOWER) - -#define CDCD_ACM_OTH_SPD_CFG_DESC \ - USB_OTH_SPD_CFG_DESC_BYTES(67, \ - 2, \ - CONF_USB_CDCD_ACM_BCONFIGVAL, \ - CONF_USB_CDCD_ACM_ICONFIG, \ - CONF_USB_CDCD_ACM_BMATTRI, \ - CONF_USB_CDCD_ACM_BMAXPOWER) - -#define CDCD_ACM_COMM_IFACE_DESCES \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_BIFCNUM, \ - CONF_USB_CDCD_ACM_COMM_BALTSET, \ - 1, \ - 0x2, \ - 0x2, \ - 0x0, \ - CONF_USB_CDCD_ACM_COMM_IIFC), \ - USB_CDC_HDR_DESC_BYTES(0x1001), USB_CDC_CALL_MGMT_DESC_BYTES(0x01, 0x00), USB_CDC_ACM_DESC_BYTES(0x02), \ - USB_CDC_UNION_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_BIFCNUM, 0x01), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_COMM_INT_EPADDR, \ - 3, \ - CONF_USB_CDCD_ACM_COMM_INT_MAXPKSZ, \ - CONF_USB_CDCD_ACM_COMM_INT_INTERVAL) - -#define CDCD_ACM_DATA_IFACE_DESCES \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BIFCNUM, \ - CONF_USB_CDCD_ACM_DATA_BALTSET, \ - 2, \ - 0x0A, \ - 0x0, \ - 0x0, \ - CONF_USB_CDCD_ACM_DATA_IIFC), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ, 0), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ, 0) - -#define CDCD_ACM_DATA_IFACE_DESCES_HS \ - USB_IFACE_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BIFCNUM, \ - CONF_USB_CDCD_ACM_DATA_BALTSET, \ - 2, \ - 0x0A, \ - 0x0, \ - 0x0, \ - CONF_USB_CDCD_ACM_DATA_IIFC), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKOUT_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKOUT_MAXPKSZ_HS, 0), \ - USB_ENDP_DESC_BYTES(CONF_USB_CDCD_ACM_DATA_BULKIN_EPADDR, 2, CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ_HS, 0) - -#define CDCD_ACM_STR_DESCES \ - CONF_USB_CDCD_ACM_LANGID_DESC \ - CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \ - CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC \ - CONF_USB_CDCD_ACM_ISERIALNUM_STR_DESC \ - CONF_USB_CDCD_ACM_ICONFIG_STR_DESC - -/** USB Device descriptors and configuration descriptors */ -#define CDCD_ACM_DESCES_LS_FS \ - CDCD_ACM_DEV_DESC, CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES, CDCD_ACM_STR_DESCES - -#define CDCD_ACM_HS_DESCES_LS_FS \ - CDCD_ACM_DEV_DESC, CDCD_ACM_DEV_QUAL_DESC, CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, \ - CDCD_ACM_DATA_IFACE_DESCES, CDCD_ACM_OTH_SPD_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, \ - CDCD_ACM_DATA_IFACE_DESCES_HS, CDCD_ACM_STR_DESCES - -#define CDCD_ACM_HS_DESCES_HS \ - CDCD_ACM_CFG_DESC, CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES_HS, CDCD_ACM_OTH_SPD_CFG_DESC, \ - CDCD_ACM_COMM_IFACE_DESCES, CDCD_ACM_DATA_IFACE_DESCES - -#endif /* USBDF_CDC_ACM_DESC_H_ */ diff --git a/usb/class/cdc/usb_protocol_cdc.h b/usb/class/cdc/usb_protocol_cdc.h deleted file mode 100644 index 29d882a..0000000 --- a/usb/class/cdc/usb_protocol_cdc.h +++ /dev/null @@ -1,426 +0,0 @@ -/** - * \file - * - * \brief USB Communication Device Class (CDC) protocol definitions - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * - * \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 - * - */ -/* - * Support and FAQ: visit Microchip Support - */ -#ifndef _USB_PROTOCOL_CDC_H_ -#define _USB_PROTOCOL_CDC_H_ - -#include "usb_includes.h" - -/** - * \ingroup usb_protocol_group - * \defgroup cdc_protocol_group Communication Device Class Definitions - * @{ - */ - -/** - * \name Possible values of class - */ -//@{ -#define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class -#define CDC_CLASS_COMM 0x02 //!< CDC Communication Class Interface -#define CDC_CLASS_DATA 0x0A //!< CDC Data Class Interface -//@} - -//! \name USB CDC Subclass IDs -//@{ -#define CDC_SUBCLASS_DLCM 0x01 //!< Direct Line Control Model -#define CDC_SUBCLASS_ACM 0x02 //!< Abstract Control Model -#define CDC_SUBCLASS_TCM 0x03 //!< Telephone Control Model -#define CDC_SUBCLASS_MCCM 0x04 //!< Multi-Channel Control Model -#define CDC_SUBCLASS_CCM 0x05 //!< CAPI Control Model -#define CDC_SUBCLASS_ETH 0x06 //!< Ethernet Networking Control Model -#define CDC_SUBCLASS_ATM 0x07 //!< ATM Networking Control Model -//@} - -//! \name USB CDC Communication Interface Protocol IDs -//@{ -#define CDC_PROTOCOL_V25TER 0x01 //!< Common AT commands -//@} - -//! \name USB CDC Data Interface Protocol IDs -//@{ -#define CDC_PROTOCOL_I430 0x30 //!< ISDN BRI -#define CDC_PROTOCOL_HDLC 0x31 //!< HDLC -#define CDC_PROTOCOL_TRANS 0x32 //!< Transparent -#define CDC_PROTOCOL_Q921M 0x50 //!< Q.921 management protocol -#define CDC_PROTOCOL_Q921 0x51 //!< Q.931 [sic] Data link protocol -#define CDC_PROTOCOL_Q921TM 0x52 //!< Q.921 TEI-multiplexor -#define CDC_PROTOCOL_V42BIS 0x90 //!< Data compression procedures -#define CDC_PROTOCOL_Q931 0x91 //!< Euro-ISDN protocol control -#define CDC_PROTOCOL_V120 0x92 //!< V.24 rate adaption to ISDN -#define CDC_PROTOCOL_CAPI20 0x93 //!< CAPI Commands -#define CDC_PROTOCOL_HOST 0xFD //!< Host based driver -/** - * \brief Describes the Protocol Unit Functional Descriptors [sic] - * on Communication Class Interface - */ -#define CDC_PROTOCOL_PUFD 0xFE -//@} - -//! \name USB CDC Functional Descriptor Types -//@{ -#define CDC_CS_INTERFACE 0x24 //!< Interface Functional Descriptor -#define CDC_CS_ENDPOINT 0x25 //!< Endpoint Functional Descriptor -//@} - -//! \name USB CDC Functional Descriptor Subtypes -//@{ -#define CDC_SCS_HEADER 0x00 //!< Header Functional Descriptor -#define CDC_SCS_CALL_MGMT 0x01 //!< Call Management -#define CDC_SCS_ACM 0x02 //!< Abstract Control Management -#define CDC_SCS_UNION 0x06 //!< Union Functional Descriptor -//@} - -//! \name USB CDC Request IDs -//@{ -#define USB_REQ_CDC_SEND_ENCAPSULATED_COMMAND 0x00 -#define USB_REQ_CDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define USB_REQ_CDC_SET_COMM_FEATURE 0x02 -#define USB_REQ_CDC_GET_COMM_FEATURE 0x03 -#define USB_REQ_CDC_CLEAR_COMM_FEATURE 0x04 -#define USB_REQ_CDC_SET_AUX_LINE_STATE 0x10 -#define USB_REQ_CDC_SET_HOOK_STATE 0x11 -#define USB_REQ_CDC_PULSE_SETUP 0x12 -#define USB_REQ_CDC_SEND_PULSE 0x13 -#define USB_REQ_CDC_SET_PULSE_TIME 0x14 -#define USB_REQ_CDC_RING_AUX_JACK 0x15 -#define USB_REQ_CDC_SET_LINE_CODING 0x20 -#define USB_REQ_CDC_GET_LINE_CODING 0x21 -#define USB_REQ_CDC_SET_CONTROL_LINE_STATE 0x22 -#define USB_REQ_CDC_SEND_BREAK 0x23 -#define USB_REQ_CDC_SET_RINGER_PARMS 0x30 -#define USB_REQ_CDC_GET_RINGER_PARMS 0x31 -#define USB_REQ_CDC_SET_OPERATION_PARMS 0x32 -#define USB_REQ_CDC_GET_OPERATION_PARMS 0x33 -#define USB_REQ_CDC_SET_LINE_PARMS 0x34 -#define USB_REQ_CDC_GET_LINE_PARMS 0x35 -#define USB_REQ_CDC_DIAL_DIGITS 0x36 -#define USB_REQ_CDC_SET_UNIT_PARAMETER 0x37 -#define USB_REQ_CDC_GET_UNIT_PARAMETER 0x38 -#define USB_REQ_CDC_CLEAR_UNIT_PARAMETER 0x39 -#define USB_REQ_CDC_GET_PROFILE 0x3A -#define USB_REQ_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 -#define USB_REQ_CDC_SET_ETHERNET_POWER_MANAGEMENT_PATTERNFILTER 0x41 -#define USB_REQ_CDC_GET_ETHERNET_POWER_MANAGEMENT_PATTERNFILTER 0x42 -#define USB_REQ_CDC_SET_ETHERNET_PACKET_FILTER 0x43 -#define USB_REQ_CDC_GET_ETHERNET_STATISTIC 0x44 -#define USB_REQ_CDC_SET_ATM_DATA_FORMAT 0x50 -#define USB_REQ_CDC_GET_ATM_DEVICE_STATISTICS 0x51 -#define USB_REQ_CDC_SET_ATM_DEFAULT_VC 0x52 -#define USB_REQ_CDC_GET_ATM_VC_STATISTICS 0x53 -// Added bNotification codes according cdc spec 1.1 chapter 6.3 -#define USB_REQ_CDC_NOTIFY_RING_DETECT 0x09 -#define USB_REQ_CDC_NOTIFY_SERIAL_STATE 0x20 -#define USB_REQ_CDC_NOTIFY_CALL_STATE_CHANGE 0x28 -#define USB_REQ_CDC_NOTIFY_LINE_STATE_CHANGE 0x29 -//@} - -/* - * Need to pack structures tightly, or the compiler might insert padding - * and violate the spec-mandated layout. - */ -COMPILER_PACK_SET(1) - -//! \name USB CDC Descriptors -//@{ - -//! CDC Header Functional Descriptor -typedef struct usb_cdc_hdr_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - le16_t bcdCDC; -} usb_cdc_hdr_desc_t; - -#define USB_CDC_HDR_DESC_LEN 5 -#define USB_CDC_HDR_DESC_BYTES(bcdCDC) \ - USB_CDC_HDR_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_HEADER, /* bDescriptorSubtype */ \ - LE_BYTE0(bcdCDC), LE_BYTE1(bcdCDC) /* bcdCDC */ - -//! CDC Call Management Functional Descriptor -typedef struct usb_cdc_call_mgmt_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bmCapabilities; - uint8_t bDataInterface; -} usb_cdc_call_mgmt_desc_t; - -#define USB_CDC_CALL_MGMT_DESC_LEN 5 -#define USB_CDC_CALL_MGMT_DESC_BYTES(bmCapabilities, bDataInterface) \ - USB_CDC_CALL_MGMT_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_CALL_MGMT, /* bDescriptorSubtype */ \ - bmCapabilities, bDataInterface - -//! CDC ACM Functional Descriptor -typedef struct usb_cdc_acm_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bmCapabilities; -} usb_cdc_acm_desc_t; - -#define USB_CDC_ACM_DESC_LEN 4 -#define USB_CDC_ACM_DESC_BYTES(bmCapabilities) \ - USB_CDC_ACM_DESC_LEN, /* bFunctionLength */ \ - CDC_CS_INTERFACE, /* bDescriptorType */ \ - CDC_SCS_ACM, /* bDescriptorSubType */ \ - bmCapabilities - -//! CDC Union Functional Descriptor -typedef struct usb_cdc_union_desc { - uint8_t bFunctionLength; - uint8_t bDescriptorType; - uint8_t bDescriptorSubtype; - uint8_t bMasterInterface; - uint8_t bSlaveInterface0; -} usb_cdc_union_desc_t; - -#define USB_CDC_UNION_DESC_LEN 5 -#define USB_CDC_UNION_DESC_BYTES(bMasterInterface, bSlaveInterface) \ - USB_CDC_UNION_DESC_LEN, CDC_CS_INTERFACE, CDC_SCS_UNION, bMasterInterface, bSlaveInterface - -//! \name USB CDC Call Management Capabilities -//@{ -//! Device handles call management itself -#define CDC_CALL_MGMT_SUPPORTED (1 << 0) -//! Device can send/receive call management info over a Data Class interface -#define CDC_CALL_MGMT_OVER_DCI (1 << 1) -//@} - -//! \name USB CDC ACM Capabilities -//@{ -//! Device supports the request combination of -//! Set_Comm_Feature, Clear_Comm_Feature, and Get_Comm_Feature. -#define CDC_ACM_SUPPORT_FEATURE_REQUESTS (1 << 0) -//! Device supports the request combination of -//! Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, -//! and the notification Serial_State. -#define CDC_ACM_SUPPORT_LINE_REQUESTS (1 << 1) -//! Device supports the request Send_Break -#define CDC_ACM_SUPPORT_SENDBREAK_REQUESTS (1 << 2) -//! Device supports the notification Network_Connection. -#define CDC_ACM_SUPPORT_NOTIFY_REQUESTS (1 << 3) -//@} -//@} - -//! \name USB CDC line control -//@{ - -//! \name USB CDC line coding -//@{ - -//! Line Coding structure -typedef struct usb_cdc_line_coding { - le32_t dwDTERate; //!< Data rate, bits per second - uint8_t bCharFormat; //!< 0-1 Stop bit,1-1.5 Stop bits,2-2 Stop bits - uint8_t bParityType; //!< 0-None,1-Odd,2-Even,3-Mark,4-Space - uint8_t bDataBits; //!< 5,6,7,8 or 16 -} usb_cdc_line_coding_t; - -//! Possible values of bCharFormat -enum cdc_char_format { - CDC_STOP_BITS_1 = 0, //!< 1 stop bit - CDC_STOP_BITS_1_5 = 1, //!< 1.5 stop bits - CDC_STOP_BITS_2 = 2 //!< 2 stop bits -}; - -//! Possible values of bParityType -enum cdc_parity { - CDC_PAR_NONE = 0, //!< No parity - CDC_PAR_ODD = 1, //!< Odd parity - CDC_PAR_EVEN = 2, //!< Even parity - CDC_PAR_MARK = 3, //!< Parity forced to 1 (mark) - CDC_PAR_SPACE = 4 //!< Parity forced to 0 (space) -}; -//@} - -//! \name USB CDC control signals -//! spec 1.1 chapter 6.2.14 -//@{ - -//! Control signal structure -typedef struct usb_cdc_control_signal { - union { - le16_t value; - struct { - uint8_t dte_present; - uint8_t carrier_ctrl; - } modem; - struct { - uint8_t DTR : 1; //!< Data Terminal Ready - uint8_t RTS : 1; //!< Request To Send - } rs232; - struct { - uint8_t s108_2 : 1; //!< V.24 signal 108/2 - uint8_t s105 : 1; //!< V.24 signal 105 - } v24; - }; -} usb_cdc_control_signal_t; - -//! \name Possible values in usb_cdc_control_signal_t -//@{ -//! Carrier control for half duplex modems. -//! This signal corresponds to V.24 signal 105 and RS-232 signal RTS. -//! The device ignores the value of this bit -//! when operating in full duplex mode. -#define CDC_CTRL_SIGNAL_ACTIVATE_CARRIER (1 << 1) -//! Indicates to DCE if DTE is present or not. -//! This signal corresponds to V.24 signal 108/2 and RS-232 signal DTR. -#define CDC_CTRL_SIGNAL_DTE_PRESENT (1 << 0) -//@} -//@} - -//! \name USB CDC notification message -//@{ - -typedef struct usb_cdc_notify_msg { - uint8_t bmRequestType; - uint8_t bNotification; - union { - le16_t wValue; - struct { - uint8_t low; - uint8_t high; - } wValueBytes; - }; - union { - le16_t wIndex; - struct { - uint8_t low; - uint8_t high; - } wIndexBytes; - }; - union { - le16_t wLength; - struct { - uint8_t low; - uint8_t high; - } wLengthBytes; - }; -} usb_cdc_notify_msg_t; - -//! \name USB CDC serial state -//@{* - -//! UART State Bitmap (cdc spec 1.1 chapter 6.3.5) -typedef union usb_cdc_uart_state { - le16_t value; - struct { - uint8_t bRxCarrier : 1; - uint8_t bTxCarrier : 1; - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } bitmap; - struct { - uint8_t bDCD : 1; - uint8_t bDSR : 1; - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } rs232; - struct { - uint8_t bS109 : 1; //!< V.24 signal 109 - uint8_t bS106 : 1; //!< V.24 signal 106 - uint8_t bBreak : 1; - uint8_t bRingSignal : 1; - uint8_t bFraming : 1; - uint8_t bParity : 1; - uint8_t bOverRun; - } v24; -} usb_cdc_uart_state_t; - -//! Hardware handshake support (cdc spec 1.1 chapter 6.3.5) -typedef struct usb_cdc_notify_serial_state { - usb_cdc_notify_msg_t header; - union usb_cdc_uart_state state; -} usb_cdc_notify_serial_state_t; - -//! \name Possible values in usb_cdc_notify_serial_state_t -//@{ -#define CDC_SERIAL_STATE_DCD CPU_TO_LE16((1 << 0)) -#define CDC_SERIAL_STATE_DSR CPU_TO_LE16((1 << 1)) -#define CDC_SERIAL_STATE_BREAK CPU_TO_LE16((1 << 2)) -#define CDC_SERIAL_STATE_RING CPU_TO_LE16((1 << 3)) -#define CDC_SERIAL_STATE_FRAMING CPU_TO_LE16((1 << 4)) -#define CDC_SERIAL_STATE_PARITY CPU_TO_LE16((1 << 5)) -#define CDC_SERIAL_STATE_OVERRUN CPU_TO_LE16((1 << 6)) -//@} -//! @} - -//! @} - -COMPILER_PACK_RESET() - -//! @} - -/** - * \brief Fill a CDC SetLineCoding request - * \param[out] req Pointer to the request to fill - * \param[in] iface Interface Number - */ -static inline void usb_fill_SetLineCoding_req(struct usb_req *req, uint8_t iface) -{ - req->bmRequestType = 0x21; - req->bRequest = USB_REQ_CDC_SET_LINE_CODING; - req->wValue = 0; - req->wIndex = iface; - req->wLength = sizeof(usb_cdc_line_coding_t); -} - -/** - * \brief Fill a CDC SetControlLineState request - * \param[out] req Pointer to the request to fill - * \param[in] iface Interface Number - * \param[in] ctrl Control Signal Bitmap - */ -static inline void usb_fill_SetControlLineState_req(struct usb_req *req, uint8_t iface, uint16_t ctrl) -{ - req->bmRequestType = 0x21; - req->bRequest = USB_REQ_CDC_SET_CONTROL_LINE_STATE; - req->wValue = ctrl; - req->wIndex = iface; - req->wLength = 0; -} - -#endif // _USB_PROTOCOL_CDC_H_ -- To view, visit https://gerrit.osmocom.org/12509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1735ad4add9278be9a1fb730752377de99c4f4b Gerrit-Change-Number: 12509 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:21 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused ARMCC Makefile In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12510 ) Change subject: remove unused ARMCC Makefile ...................................................................... remove unused ARMCC Makefile Change-Id: I232502798d71c97d0e7b4adf6bb6af3fa0940bd1 --- D armcc/Makefile D armcc/arm_addon/armcc/arm/startup_same54.s D armcc/arm_addon/armcc/system_same54.c 3 files changed, 0 insertions(+), 884 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/armcc/Makefile b/armcc/Makefile deleted file mode 100644 index a131e45..0000000 --- a/armcc/Makefile +++ /dev/null @@ -1,226 +0,0 @@ - -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -ifdef SystemRoot - SHELL = cmd.exe - MK_DIR = mkdir -else - ifeq ($(shell uname), Linux) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), CYGWIN) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW32) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW64) - MK_DIR = mkdir -p - endif -endif - -# List the subdirectories for creating object files -SUB_DIRS += \ - \ -hpl/pm \ -hpl/osc32kctrl \ -hpl/ramecc \ -hpl/dmac \ -usb/class/cdc/device \ -hal/src \ -hpl/mclk \ -usb \ -armcc/arm_addon/armcc/arm \ -hal/utils/src \ -armcc/arm_addon/armcc \ -examples \ -hpl/gclk \ -usb/device \ -hpl/oscctrl \ -hpl/usb \ -hpl/core \ -hpl/cmcc - -# List the object files -OBJS += \ -hal/src/hal_io.o \ -armcc/arm_addon/armcc/system_same54.o \ -hpl/core/hpl_core_m4.o \ -usb/class/cdc/device/cdcdf_acm.o \ -hpl/dmac/hpl_dmac.o \ -hpl/usb/hpl_usb.o \ -hal/src/hal_delay.o \ -hpl/pm/hpl_pm.o \ -hpl/core/hpl_init.o \ -hpl/gclk/hpl_gclk.o \ -hal/utils/src/utils_list.o \ -hal/utils/src/utils_assert.o \ -usb_start.o \ -hpl/oscctrl/hpl_oscctrl.o \ -hpl/mclk/hpl_mclk.o \ -hpl/ramecc/hpl_ramecc.o \ -usb/usb_protocol.o \ -hal/src/hal_init.o \ -hal/src/hal_usb_device.o \ -hpl/osc32kctrl/hpl_osc32kctrl.o \ -examples/driver_examples.o \ -driver_init.o \ -hal/src/hal_gpio.o \ -hal/utils/src/utils_event.o \ -hal/src/hal_sleep.o \ -hal/src/hal_cache.o \ -hpl/cmcc/hpl_cmcc.o \ -atmel_start.o \ -usb_cdc_echo_main.o \ -usb/device/usbdc.o \ -hal/src/hal_atomic.o \ -armcc/arm_addon/armcc/arm/startup_same54.o - -OBJS_AS_ARGS += \ -"hal/src/hal_io.o" \ -"armcc/arm_addon/armcc/system_same54.o" \ -"hpl/core/hpl_core_m4.o" \ -"usb/class/cdc/device/cdcdf_acm.o" \ -"hpl/dmac/hpl_dmac.o" \ -"hpl/usb/hpl_usb.o" \ -"hal/src/hal_delay.o" \ -"hpl/pm/hpl_pm.o" \ -"hpl/core/hpl_init.o" \ -"hpl/gclk/hpl_gclk.o" \ -"hal/utils/src/utils_list.o" \ -"hal/utils/src/utils_assert.o" \ -"usb_start.o" \ -"hpl/oscctrl/hpl_oscctrl.o" \ -"hpl/mclk/hpl_mclk.o" \ -"hpl/ramecc/hpl_ramecc.o" \ -"usb/usb_protocol.o" \ -"hal/src/hal_init.o" \ -"hal/src/hal_usb_device.o" \ -"hpl/osc32kctrl/hpl_osc32kctrl.o" \ -"examples/driver_examples.o" \ -"driver_init.o" \ -"hal/src/hal_gpio.o" \ -"hal/utils/src/utils_event.o" \ -"hal/src/hal_sleep.o" \ -"hal/src/hal_cache.o" \ -"hpl/cmcc/hpl_cmcc.o" \ -"atmel_start.o" \ -"usb_cdc_echo_main.o" \ -"usb/device/usbdc.o" \ -"hal/src/hal_atomic.o" \ -"armcc/arm_addon/armcc/arm/startup_same54.o" - -# List the dependency files -DEPS := $(OBJS:%.o=%.d) - -DEPS_AS_ARGS += \ -"hal/utils/src/utils_event.d" \ -"hal/src/hal_io.d" \ -"armcc/arm_addon/armcc/system_same54.d" \ -"hpl/ramecc/hpl_ramecc.d" \ -"hpl/core/hpl_core_m4.d" \ -"usb/class/cdc/device/cdcdf_acm.d" \ -"hpl/usb/hpl_usb.d" \ -"hal/utils/src/utils_list.d" \ -"hpl/cmcc/hpl_cmcc.d" \ -"usb_start.d" \ -"hal/utils/src/utils_assert.d" \ -"hal/src/hal_delay.d" \ -"hpl/core/hpl_init.d" \ -"hpl/pm/hpl_pm.d" \ -"usb/usb_protocol.d" \ -"hpl/gclk/hpl_gclk.d" \ -"hal/src/hal_usb_device.d" \ -"hpl/dmac/hpl_dmac.d" \ -"hal/src/hal_init.d" \ -"usb_cdc_echo_main.d" \ -"hpl/mclk/hpl_mclk.d" \ -"driver_init.d" \ -"hpl/osc32kctrl/hpl_osc32kctrl.d" \ -"examples/driver_examples.d" \ -"hal/src/hal_cache.d" \ -"hal/src/hal_sleep.d" \ -"hal/src/hal_gpio.d" \ -"hal/src/hal_atomic.d" \ -"usb/device/usbdc.d" \ -"hpl/oscctrl/hpl_oscctrl.d" \ -"armcc/arm_addon/armcc/arm/startup_same54.d" \ -"atmel_start.d" - -OUTPUT_FILE_NAME :=AtmelStart -QUOTE := " -OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf -OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf - -vpath %.c ../ -vpath %.s ../ -vpath %.S ../ - -# All Target -all: $(SUB_DIRS) $(OUTPUT_FILE_PATH) - -# Linker target - -$(OUTPUT_FILE_PATH): $(OBJS) - @echo Building target: $@ - @echo Invoking: ARMCC Linker - $(QUOTE)armlink$(QUOTE) --ro-base 0x00000000 --entry 0x00000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors \ ---strict --summary_stderr --info summarysizes --map --xref --callgraph --symbols \ ---info sizes --info totals --info unused --info veneers --list $(OUTPUT_FILE_NAME).map \ --o $(OUTPUT_FILE_NAME).elf --cpu Cortex-M4 \ -$(OBJS_AS_ARGS) - - @echo Finished building target: $@ - -# Compiler target(s) - - - - -%.o: %.c - @echo Building file: $< - @echo ARMCC Compiler - $(QUOTE)armcc$(QUOTE) --c99 -c -DDEBUG -O1 -g --apcs=interwork --split_sections --cpu Cortex-M4 -D__SAME54P20A__ \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$@" -o "$@" "$<" - - @echo Finished building: $< - -%.o: %.s - @echo Building file: $< - @echo ARMCC Assembler - $(QUOTE)armasm$(QUOTE) -g --apcs=interwork --cpu Cortex-M4 --pd "D__SAME54P20A__ SETA 1" \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$(@:%.o=%.d)" -o "$@" "$<" - - @echo Finished building: $< - -%.o: %.S - @echo Building file: $< - @echo ARMCC Preprocessing Assembler - $(QUOTE)armcc$(QUOTE) --c99 -c -DDEBUG -O1 -g --apcs=interwork --split_sections --cpu Cortex-M4 -D__SAME54P20A__ \ --I"../" -I"../config" -I"../examples" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -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/cdc" -I"../usb/class/cdc/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ ---depend "$@" -o "$@" "$<" - - @echo Finished building: $< - -# Detect changes in the dependent files and recompile the respective object files. -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(DEPS)),) --include $(DEPS) -endif -endif - -$(SUB_DIRS): - $(MK_DIR) "$@" - -clean: - rm -f $(OBJS_AS_ARGS) - rm -f $(OUTPUT_FILE_PATH) - rm -f $(DEPS_AS_ARGS) - rm -f $(OUTPUT_FILE_NAME).map $(OUTPUT_FILE_NAME).elf diff --git a/armcc/arm_addon/armcc/arm/startup_same54.s b/armcc/arm_addon/armcc/arm/startup_same54.s deleted file mode 100644 index 3cd00bc..0000000 --- a/armcc/arm_addon/armcc/arm/startup_same54.s +++ /dev/null @@ -1,588 +0,0 @@ -;/***************************************************************************** -; * @file startup_SAME54.s -; * @brief CMSIS Cortex-M4 Core Device Startup File for -; * Atmel SAME54 Device Series -; * @version V1.0.0 -; * @date 16. January 2017 -; * -; * @note -; * Copyright (C) 2017 ARM Limited. All rights reserved. -; * -; * @par -; * ARM Limited (ARM) is supplying this software for use with Cortex-M -; * processor based microcontrollers. This file can be freely distributed -; * within development tools that are supporting such ARM based processors. -; * -; * @par -; * THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -; * OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -; * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -; * ARM SHALL NOT, IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR -; * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. -; * -; ******************************************************************************/ -;/* -;//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------ -;*/ - - -; Stack Configuration -; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Stack_Size EQU 0x00000200 - - AREA STACK, NOINIT, READWRITE, ALIGN=3 -Stack_Mem SPACE Stack_Size -__initial_sp - - -; Heap Configuration -; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Heap_Size EQU 0x00000000 - - AREA HEAP, NOINIT, READWRITE, ALIGN=3 -__heap_base -Heap_Mem SPACE Heap_Size -__heap_limit - - - PRESERVE8 - THUMB - - -; Vector Table Mapped to Address 0 at Reset - - AREA RESET, DATA, READONLY - EXPORT __Vectors - EXPORT __Vectors_End - EXPORT __Vectors_Size - -__Vectors DCD __initial_sp ; Top of Stack - DCD Reset_Handler ; Reset Handler - DCD NMI_Handler ; NMI Handler - DCD HardFault_Handler ; Hard Fault Handler - DCD MemManage_Handler ; MPU Fault Handler - DCD BusFault_Handler ; Bus Fault Handler - DCD UsageFault_Handler ; Usage Fault Handler - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler - DCD DebugMon_Handler ; Debug Monitor Handler - DCD 0 ; Reserved - DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler - - ; External Interrupts - DCD PM_Handler ; 0 Power Manager - DCD MCLK_Handler ; 1 Main Clock - DCD OSCCTRL_0_Handler ; 2 OSCCTRL_XOSCFAIL_0, OSCCTRL_XOSCRDY_0 - DCD OSCCTRL_1_Handler ; 3 OSCCTRL_XOSCFAIL_1, OSCCTRL_XOSCRDY_1 - DCD OSCCTRL_2_Handler ; 4 OSCCTRL_DFLLLOCKC, OSCCTRL_DFLLLOCKF, OSCCTRL_DFLLOOB, OSCCTRL_DFLLRCS, OSCCTRL_DFLLRDY - DCD OSCCTRL_3_Handler ; 5 OSCCTRL_DPLLLCKF_0, OSCCTRL_DPLLLCKR_0, OSCCTRL_DPLLLDRTO_0, OSCCTRL_DPLLLTO_0 - DCD OSCCTRL_4_Handler ; 6 OSCCTRL_DPLLLCKF_1, OSCCTRL_DPLLLCKR_1, OSCCTRL_DPLLLDRTO_1, OSCCTRL_DPLLLTO_1 - DCD OSC32KCTRL_Handler ; 7 32kHz Oscillators Control - DCD SUPC_0_Handler ; 8 SUPC_B12SRDY, SUPC_B33SRDY, SUPC_BOD12RDY, SUPC_BOD33RDY, SUPC_VCORERDY, SUPC_VREGRDY - DCD SUPC_1_Handler ; 9 SUPC_BOD12DET, SUPC_BOD33DET - DCD WDT_Handler ; 10 Watchdog Timer - DCD RTC_Handler ; 11 Real-Time Counter - DCD EIC_0_Handler ; 12 EIC_EXTINT_0 - DCD EIC_1_Handler ; 13 EIC_EXTINT_1 - DCD EIC_2_Handler ; 14 EIC_EXTINT_2 - DCD EIC_3_Handler ; 15 EIC_EXTINT_3 - DCD EIC_4_Handler ; 16 EIC_EXTINT_4 - DCD EIC_5_Handler ; 17 EIC_EXTINT_5 - DCD EIC_6_Handler ; 18 EIC_EXTINT_6 - DCD EIC_7_Handler ; 19 EIC_EXTINT_7 - DCD EIC_8_Handler ; 20 EIC_EXTINT_8 - DCD EIC_9_Handler ; 21 EIC_EXTINT_9 - DCD EIC_10_Handler ; 22 EIC_EXTINT_10 - DCD EIC_11_Handler ; 23 EIC_EXTINT_11 - DCD EIC_12_Handler ; 24 EIC_EXTINT_12 - DCD EIC_13_Handler ; 25 EIC_EXTINT_13 - DCD EIC_14_Handler ; 26 EIC_EXTINT_14 - DCD EIC_15_Handler ; 27 EIC_EXTINT_15 - DCD FREQM_Handler ; 28 Frequency Meter - DCD NVMCTRL_0_Handler ; 29 NVMCTRL_0, NVMCTRL_1, NVMCTRL_2, NVMCTRL_3, NVMCTRL_4, NVMCTRL_5, NVMCTRL_6, NVMCTRL_7 - DCD NVMCTRL_1_Handler ; 30 NVMCTRL_10, NVMCTRL_8, NVMCTRL_9 - DCD DMAC_0_Handler ; 31 DMAC_SUSP_0, DMAC_TCMPL_0, DMAC_TERR_0 - DCD DMAC_1_Handler ; 32 DMAC_SUSP_1, DMAC_TCMPL_1, DMAC_TERR_1 - DCD DMAC_2_Handler ; 33 DMAC_SUSP_2, DMAC_TCMPL_2, DMAC_TERR_2 - DCD DMAC_3_Handler ; 34 DMAC_SUSP_3, DMAC_TCMPL_3, DMAC_TERR_3 - DCD DMAC_4_Handler ; 35 DMAC_SUSP_10, DMAC_SUSP_11, DMAC_SUSP_12, DMAC_SUSP_13, DMAC_SUSP_14, DMAC_SUSP_15, DMAC_SUSP_16, DMAC_SUSP_17, DMAC_SUSP_18, DMAC_SUSP_19, DMAC_SUSP_20, DMAC_SUSP_21, DMAC_SUSP_22, DMAC_SUSP_23, DMAC_SUSP_24, DMAC_SUSP_25, DMAC_SUSP_26, DMAC_SUSP_27, DMAC_SUSP_28, DMAC_SUSP_29, DMAC_SUSP_30, DMAC_SUSP_31, DMAC_SUSP_4, DMAC_SUSP_5, DMAC_SUSP_6, DMAC_SUSP_7, DMAC_SUSP_8, DMAC_SUSP_9, DMAC_TCMPL_10, DMAC_TCMPL_11, DMAC_TCMPL_12, DMAC_TCMPL_13, DMAC_TCMPL_14, DMAC_TCMPL_15, DMAC_TCMPL_16, DMAC_TCMPL_17, DMAC_TCMPL_18, DMAC_TCMPL_19, DMAC_TCMPL_20, DMAC_TCMPL_21, DMAC_TCMPL_22, DMAC_TCMPL_23, DMAC_TCMPL_24, DMAC_TCMPL_25, DMAC_TCMPL_26, DMAC_TCMPL_27, DMAC_TCMPL_28, DMAC_TCMPL_29, DMAC_TCMPL_30, DMAC_TCMPL_31, DMAC_TCMPL_4, DMAC_TCMPL_5, DMAC_TCMPL_6, DMAC_TCMPL_7, DMAC_TCMPL_8, DMAC_TCMPL_9, DMAC_TERR_10, DMAC_TERR_11, DMAC_TERR_12, DMAC_TERR_13, DMAC_TERR_14, DMAC_TERR_15, DMAC_TERR_16, DMAC_TERR_17, DMAC_TERR_18, DMAC_TERR_19, DMAC_TERR_20, DMAC_TERR_21, DMAC_TERR_22, DMAC_TERR_23, DMAC_TERR_24, DMAC_TERR_25, DMAC_TERR_26, DMAC_TERR_27, DMAC_TERR_28, DMAC_TERR_29, DMAC_TERR_30, DMAC_TERR_31, DMAC_TERR_4, DMAC_TERR_5, DMAC_TERR_6, DMAC_TERR_7, DMAC_TERR_8, DMAC_TERR_9 - DCD EVSYS_0_Handler ; 36 EVSYS_EVD_0, EVSYS_OVR_0 - DCD EVSYS_1_Handler ; 37 EVSYS_EVD_1, EVSYS_OVR_1 - DCD EVSYS_2_Handler ; 38 EVSYS_EVD_2, EVSYS_OVR_2 - DCD EVSYS_3_Handler ; 39 EVSYS_EVD_3, EVSYS_OVR_3 - DCD EVSYS_4_Handler ; 40 EVSYS_EVD_10, EVSYS_EVD_11, EVSYS_EVD_4, EVSYS_EVD_5, EVSYS_EVD_6, EVSYS_EVD_7, EVSYS_EVD_8, EVSYS_EVD_9, EVSYS_OVR_10, EVSYS_OVR_11, EVSYS_OVR_4, EVSYS_OVR_5, EVSYS_OVR_6, EVSYS_OVR_7, EVSYS_OVR_8, EVSYS_OVR_9 - DCD PAC_Handler ; 41 Peripheral Access Controller - DCD TAL_0_Handler ; 42 TAL_BRK - DCD TAL_1_Handler ; 43 TAL_IPS_0, TAL_IPS_1 - DCD 0 ; 44 Reserved - DCD RAMECC_Handler ; 45 RAM ECC - DCD SERCOM0_0_Handler ; 46 SERCOM0_0 - DCD SERCOM0_1_Handler ; 47 SERCOM0_1 - DCD SERCOM0_2_Handler ; 48 SERCOM0_2 - DCD SERCOM0_3_Handler ; 49 SERCOM0_3, SERCOM0_4, SERCOM0_5, SERCOM0_6 - DCD SERCOM1_0_Handler ; 50 SERCOM1_0 - DCD SERCOM1_1_Handler ; 51 SERCOM1_1 - DCD SERCOM1_2_Handler ; 52 SERCOM1_2 - DCD SERCOM1_3_Handler ; 53 SERCOM1_3, SERCOM1_4, SERCOM1_5, SERCOM1_6 - DCD SERCOM2_0_Handler ; 54 SERCOM2_0 - DCD SERCOM2_1_Handler ; 55 SERCOM2_1 - DCD SERCOM2_2_Handler ; 56 SERCOM2_2 - DCD SERCOM2_3_Handler ; 57 SERCOM2_3, SERCOM2_4, SERCOM2_5, SERCOM2_6 - DCD SERCOM3_0_Handler ; 58 SERCOM3_0 - DCD SERCOM3_1_Handler ; 59 SERCOM3_1 - DCD SERCOM3_2_Handler ; 60 SERCOM3_2 - DCD SERCOM3_3_Handler ; 61 SERCOM3_3, SERCOM3_4, SERCOM3_5, SERCOM3_6 - DCD SERCOM4_0_Handler ; 62 SERCOM4_0 - DCD SERCOM4_1_Handler ; 63 SERCOM4_1 - DCD SERCOM4_2_Handler ; 64 SERCOM4_2 - DCD SERCOM4_3_Handler ; 65 SERCOM4_3, SERCOM4_4, SERCOM4_5, SERCOM4_6 - DCD SERCOM5_0_Handler ; 66 SERCOM5_0 - DCD SERCOM5_1_Handler ; 67 SERCOM5_1 - DCD SERCOM5_2_Handler ; 68 SERCOM5_2 - DCD SERCOM5_3_Handler ; 69 SERCOM5_3, SERCOM5_4, SERCOM5_5, SERCOM5_6 - DCD SERCOM6_0_Handler ; 70 SERCOM6_0 - DCD SERCOM6_1_Handler ; 71 SERCOM6_1 - DCD SERCOM6_2_Handler ; 72 SERCOM6_2 - DCD SERCOM6_3_Handler ; 73 SERCOM6_3, SERCOM6_4, SERCOM6_5, SERCOM6_6 - DCD SERCOM7_0_Handler ; 74 SERCOM7_0 - DCD SERCOM7_1_Handler ; 75 SERCOM7_1 - DCD SERCOM7_2_Handler ; 76 SERCOM7_2 - DCD SERCOM7_3_Handler ; 77 SERCOM7_3, SERCOM7_4, SERCOM7_5, SERCOM7_6 - DCD CAN0_Handler ; 78 Control Area Network 0 - DCD CAN1_Handler ; 79 Control Area Network 1 - DCD USB_0_Handler ; 80 USB_EORSM_DNRSM, USB_EORST_RST, USB_LPMSUSP_DDISC, USB_LPM_DCONN, USB_MSOF, USB_RAMACER, USB_RXSTP_TXSTP_0, USB_RXSTP_TXSTP_1, USB_RXSTP_TXSTP_2, USB_RXSTP_TXSTP_3, USB_RXSTP_TXSTP_4, USB_RXSTP_TXSTP_5, USB_RXSTP_TXSTP_6, USB_RXSTP_TXSTP_7, USB_STALL0_STALL_0, USB_STALL0_STALL_1, USB_STALL0_STALL_2, USB_STALL0_STALL_3, USB_STALL0_STALL_4, USB_STALL0_STALL_5, USB_STALL0_STALL_6, USB_STALL0_STALL_7, USB_STALL1_0, USB_STALL1_1, USB_STALL1_2, USB_STALL1_3, USB_STALL1_4, USB_STALL1_5, USB_STALL1_6, USB_STALL1_7, USB_SUSPEND, USB_TRFAIL0_TRFAIL_0, USB_TRFAIL0_TRFAIL_1, USB_TRFAIL0_TRFAIL_2, USB_TRFAIL0_TRFAIL_3, USB_TRFAIL0_TRFAIL_4, USB_TRFAIL0_TRFAIL_5, USB_TRFAIL0_TRFAIL_6, USB_TRFAIL0_TRFAIL_7, USB_TRFAIL1_PERR_0, USB_TRFAIL1_PERR_1, USB_TRFAIL1_PERR_2, USB_TRFAIL1_PERR_3, USB_TRFAIL1_PERR_4, USB_TRFAIL1_PERR_5, USB_TRFAIL1_PERR_6, USB_TRFAIL1_PERR_7, USB_UPRSM, USB_WAKEUP - DCD USB_1_Handler ; 81 USB_SOF_HSOF - DCD USB_2_Handler ; 82 USB_TRCPT0_0, USB_TRCPT0_1, USB_TRCPT0_2, USB_TRCPT0_3, USB_TRCPT0_4, USB_TRCPT0_5, USB_TRCPT0_6, USB_TRCPT0_7 - DCD USB_3_Handler ; 83 USB_TRCPT1_0, USB_TRCPT1_1, USB_TRCPT1_2, USB_TRCPT1_3, USB_TRCPT1_4, USB_TRCPT1_5, USB_TRCPT1_6, USB_TRCPT1_7 - DCD GMAC_Handler ; 84 Ethernet MAC - DCD TCC0_0_Handler ; 85 TCC0_CNT_A, TCC0_DFS_A, TCC0_ERR_A, TCC0_FAULT0_A, TCC0_FAULT1_A, TCC0_FAULTA_A, TCC0_FAULTB_A, TCC0_OVF, TCC0_TRG, TCC0_UFS_A - DCD TCC0_1_Handler ; 86 TCC0_MC_0 - DCD TCC0_2_Handler ; 87 TCC0_MC_1 - DCD TCC0_3_Handler ; 88 TCC0_MC_2 - DCD TCC0_4_Handler ; 89 TCC0_MC_3 - DCD TCC0_5_Handler ; 90 TCC0_MC_4 - DCD TCC0_6_Handler ; 91 TCC0_MC_5 - DCD TCC1_0_Handler ; 92 TCC1_CNT_A, TCC1_DFS_A, TCC1_ERR_A, TCC1_FAULT0_A, TCC1_FAULT1_A, TCC1_FAULTA_A, TCC1_FAULTB_A, TCC1_OVF, TCC1_TRG, TCC1_UFS_A - DCD TCC1_1_Handler ; 93 TCC1_MC_0 - DCD TCC1_2_Handler ; 94 TCC1_MC_1 - DCD TCC1_3_Handler ; 95 TCC1_MC_2 - DCD TCC1_4_Handler ; 96 TCC1_MC_3 - DCD TCC2_0_Handler ; 97 TCC2_CNT_A, TCC2_DFS_A, TCC2_ERR_A, TCC2_FAULT0_A, TCC2_FAULT1_A, TCC2_FAULTA_A, TCC2_FAULTB_A, TCC2_OVF, TCC2_TRG, TCC2_UFS_A - DCD TCC2_1_Handler ; 98 TCC2_MC_0 - DCD TCC2_2_Handler ; 99 TCC2_MC_1 - DCD TCC2_3_Handler ; 100 TCC2_MC_2 - DCD TCC3_0_Handler ; 101 TCC3_CNT_A, TCC3_DFS_A, TCC3_ERR_A, TCC3_FAULT0_A, TCC3_FAULT1_A, TCC3_FAULTA_A, TCC3_FAULTB_A, TCC3_OVF, TCC3_TRG, TCC3_UFS_A - DCD TCC3_1_Handler ; 102 TCC3_MC_0 - DCD TCC3_2_Handler ; 103 TCC3_MC_1 - DCD TCC4_0_Handler ; 104 TCC4_CNT_A, TCC4_DFS_A, TCC4_ERR_A, TCC4_FAULT0_A, TCC4_FAULT1_A, TCC4_FAULTA_A, TCC4_FAULTB_A, TCC4_OVF, TCC4_TRG, TCC4_UFS_A - DCD TCC4_1_Handler ; 105 TCC4_MC_0 - DCD TCC4_2_Handler ; 106 TCC4_MC_1 - DCD TC0_Handler ; 107 Basic Timer Counter 0 - DCD TC1_Handler ; 108 Basic Timer Counter 1 - DCD TC2_Handler ; 109 Basic Timer Counter 2 - DCD TC3_Handler ; 110 Basic Timer Counter 3 - DCD TC4_Handler ; 111 Basic Timer Counter 4 - DCD TC5_Handler ; 112 Basic Timer Counter 5 - DCD TC6_Handler ; 113 Basic Timer Counter 6 - DCD TC7_Handler ; 114 Basic Timer Counter 7 - DCD PDEC_0_Handler ; 115 PDEC_DIR_A, PDEC_ERR_A, PDEC_OVF, PDEC_VLC_A - DCD PDEC_1_Handler ; 116 PDEC_MC_0 - DCD PDEC_2_Handler ; 117 PDEC_MC_1 - DCD ADC0_0_Handler ; 118 ADC0_OVERRUN, ADC0_WINMON - DCD ADC0_1_Handler ; 119 ADC0_RESRDY - DCD ADC1_0_Handler ; 120 ADC1_OVERRUN, ADC1_WINMON - DCD ADC1_1_Handler ; 121 ADC1_RESRDY - DCD AC_Handler ; 122 Analog Comparators - DCD DAC_0_Handler ; 123 DAC_OVERRUN_A_0, DAC_OVERRUN_A_1, DAC_UNDERRUN_A_0, DAC_UNDERRUN_A_1 - DCD DAC_1_Handler ; 124 DAC_EMPTY_0 - DCD DAC_2_Handler ; 125 DAC_EMPTY_1 - DCD DAC_3_Handler ; 126 DAC_RESRDY_0 - DCD DAC_4_Handler ; 127 DAC_RESRDY_1 - DCD I2S_Handler ; 128 Inter-IC Sound Interface - DCD PCC_Handler ; 129 Parallel Capture Controller - DCD AES_Handler ; 130 Advanced Encryption Standard - DCD TRNG_Handler ; 131 True Random Generator - DCD ICM_Handler ; 132 Integrity Check Monitor - DCD PUKCC_Handler ; 133 PUblic-Key Cryptography Controller - DCD QSPI_Handler ; 134 Quad SPI interface - DCD SDHC0_Handler ; 135 SD/MMC Host Controller 0 - DCD SDHC1_Handler ; 136 SD/MMC Host Controller 1 -__Vectors_End - -__Vectors_Size EQU __Vectors_End - __Vectors - - AREA |.text|, CODE, READONLY - - -; Reset Handler - -Reset_Handler PROC - EXPORT Reset_Handler [WEAK] - IMPORT SystemInit - IMPORT __main - LDR R0, =SystemInit - BLX R0 - LDR R0, =__main - BX R0 - ENDP - - -; Dummy Exception Handlers (infinite loops which can be modified) - -NMI_Handler PROC - EXPORT NMI_Handler [WEAK] - B . - ENDP -HardFault_Handler\ - PROC - EXPORT HardFault_Handler [WEAK] - B . - ENDP -MemManage_Handler\ - PROC - EXPORT MemManage_Handler [WEAK] - B . - ENDP -BusFault_Handler\ - PROC - EXPORT BusFault_Handler [WEAK] - B . - ENDP -UsageFault_Handler\ - PROC - EXPORT UsageFault_Handler [WEAK] - B . - ENDP -SVC_Handler PROC - EXPORT SVC_Handler [WEAK] - B . - ENDP -DebugMon_Handler\ - PROC - EXPORT DebugMon_Handler [WEAK] - B . - ENDP -PendSV_Handler PROC - EXPORT PendSV_Handler [WEAK] - B . - ENDP -SysTick_Handler PROC - EXPORT SysTick_Handler [WEAK] - B . - ENDP - -Default_Handler PROC - EXPORT PM_Handler [WEAK] - EXPORT MCLK_Handler [WEAK] - EXPORT OSCCTRL_0_Handler [WEAK] - EXPORT OSCCTRL_1_Handler [WEAK] - EXPORT OSCCTRL_2_Handler [WEAK] - EXPORT OSCCTRL_3_Handler [WEAK] - EXPORT OSCCTRL_4_Handler [WEAK] - EXPORT OSC32KCTRL_Handler [WEAK] - EXPORT SUPC_0_Handler [WEAK] - EXPORT SUPC_1_Handler [WEAK] - EXPORT WDT_Handler [WEAK] - EXPORT RTC_Handler [WEAK] - EXPORT EIC_0_Handler [WEAK] - EXPORT EIC_1_Handler [WEAK] - EXPORT EIC_2_Handler [WEAK] - EXPORT EIC_3_Handler [WEAK] - EXPORT EIC_4_Handler [WEAK] - EXPORT EIC_5_Handler [WEAK] - EXPORT EIC_6_Handler [WEAK] - EXPORT EIC_7_Handler [WEAK] - EXPORT EIC_8_Handler [WEAK] - EXPORT EIC_9_Handler [WEAK] - EXPORT EIC_10_Handler [WEAK] - EXPORT EIC_11_Handler [WEAK] - EXPORT EIC_12_Handler [WEAK] - EXPORT EIC_13_Handler [WEAK] - EXPORT EIC_14_Handler [WEAK] - EXPORT EIC_15_Handler [WEAK] - EXPORT FREQM_Handler [WEAK] - EXPORT NVMCTRL_0_Handler [WEAK] - EXPORT NVMCTRL_1_Handler [WEAK] - EXPORT DMAC_0_Handler [WEAK] - EXPORT DMAC_1_Handler [WEAK] - EXPORT DMAC_2_Handler [WEAK] - EXPORT DMAC_3_Handler [WEAK] - EXPORT DMAC_4_Handler [WEAK] - EXPORT EVSYS_0_Handler [WEAK] - EXPORT EVSYS_1_Handler [WEAK] - EXPORT EVSYS_2_Handler [WEAK] - EXPORT EVSYS_3_Handler [WEAK] - EXPORT EVSYS_4_Handler [WEAK] - EXPORT PAC_Handler [WEAK] - EXPORT TAL_0_Handler [WEAK] - EXPORT TAL_1_Handler [WEAK] - EXPORT RAMECC_Handler [WEAK] - EXPORT SERCOM0_0_Handler [WEAK] - EXPORT SERCOM0_1_Handler [WEAK] - EXPORT SERCOM0_2_Handler [WEAK] - EXPORT SERCOM0_3_Handler [WEAK] - EXPORT SERCOM1_0_Handler [WEAK] - EXPORT SERCOM1_1_Handler [WEAK] - EXPORT SERCOM1_2_Handler [WEAK] - EXPORT SERCOM1_3_Handler [WEAK] - EXPORT SERCOM2_0_Handler [WEAK] - EXPORT SERCOM2_1_Handler [WEAK] - EXPORT SERCOM2_2_Handler [WEAK] - EXPORT SERCOM2_3_Handler [WEAK] - EXPORT SERCOM3_0_Handler [WEAK] - EXPORT SERCOM3_1_Handler [WEAK] - EXPORT SERCOM3_2_Handler [WEAK] - EXPORT SERCOM3_3_Handler [WEAK] - EXPORT SERCOM4_0_Handler [WEAK] - EXPORT SERCOM4_1_Handler [WEAK] - EXPORT SERCOM4_2_Handler [WEAK] - EXPORT SERCOM4_3_Handler [WEAK] - EXPORT SERCOM5_0_Handler [WEAK] - EXPORT SERCOM5_1_Handler [WEAK] - EXPORT SERCOM5_2_Handler [WEAK] - EXPORT SERCOM5_3_Handler [WEAK] - EXPORT SERCOM6_0_Handler [WEAK] - EXPORT SERCOM6_1_Handler [WEAK] - EXPORT SERCOM6_2_Handler [WEAK] - EXPORT SERCOM6_3_Handler [WEAK] - EXPORT SERCOM7_0_Handler [WEAK] - EXPORT SERCOM7_1_Handler [WEAK] - EXPORT SERCOM7_2_Handler [WEAK] - EXPORT SERCOM7_3_Handler [WEAK] - EXPORT CAN0_Handler [WEAK] - EXPORT CAN1_Handler [WEAK] - EXPORT USB_0_Handler [WEAK] - EXPORT USB_1_Handler [WEAK] - EXPORT USB_2_Handler [WEAK] - EXPORT USB_3_Handler [WEAK] - EXPORT GMAC_Handler [WEAK] - EXPORT TCC0_0_Handler [WEAK] - EXPORT TCC0_1_Handler [WEAK] - EXPORT TCC0_2_Handler [WEAK] - EXPORT TCC0_3_Handler [WEAK] - EXPORT TCC0_4_Handler [WEAK] - EXPORT TCC0_5_Handler [WEAK] - EXPORT TCC0_6_Handler [WEAK] - EXPORT TCC1_0_Handler [WEAK] - EXPORT TCC1_1_Handler [WEAK] - EXPORT TCC1_2_Handler [WEAK] - EXPORT TCC1_3_Handler [WEAK] - EXPORT TCC1_4_Handler [WEAK] - EXPORT TCC2_0_Handler [WEAK] - EXPORT TCC2_1_Handler [WEAK] - EXPORT TCC2_2_Handler [WEAK] - EXPORT TCC2_3_Handler [WEAK] - EXPORT TCC3_0_Handler [WEAK] - EXPORT TCC3_1_Handler [WEAK] - EXPORT TCC3_2_Handler [WEAK] - EXPORT TCC4_0_Handler [WEAK] - EXPORT TCC4_1_Handler [WEAK] - EXPORT TCC4_2_Handler [WEAK] - EXPORT TC0_Handler [WEAK] - EXPORT TC1_Handler [WEAK] - EXPORT TC2_Handler [WEAK] - EXPORT TC3_Handler [WEAK] - EXPORT TC4_Handler [WEAK] - EXPORT TC5_Handler [WEAK] - EXPORT TC6_Handler [WEAK] - EXPORT TC7_Handler [WEAK] - EXPORT PDEC_0_Handler [WEAK] - EXPORT PDEC_1_Handler [WEAK] - EXPORT PDEC_2_Handler [WEAK] - EXPORT ADC0_0_Handler [WEAK] - EXPORT ADC0_1_Handler [WEAK] - EXPORT ADC1_0_Handler [WEAK] - EXPORT ADC1_1_Handler [WEAK] - EXPORT AC_Handler [WEAK] - EXPORT DAC_0_Handler [WEAK] - EXPORT DAC_1_Handler [WEAK] - EXPORT DAC_2_Handler [WEAK] - EXPORT DAC_3_Handler [WEAK] - EXPORT DAC_4_Handler [WEAK] - EXPORT I2S_Handler [WEAK] - EXPORT PCC_Handler [WEAK] - EXPORT AES_Handler [WEAK] - EXPORT TRNG_Handler [WEAK] - EXPORT ICM_Handler [WEAK] - EXPORT PUKCC_Handler [WEAK] - EXPORT QSPI_Handler [WEAK] - EXPORT SDHC0_Handler [WEAK] - EXPORT SDHC1_Handler [WEAK] - -PM_Handler -MCLK_Handler -OSCCTRL_0_Handler -OSCCTRL_1_Handler -OSCCTRL_2_Handler -OSCCTRL_3_Handler -OSCCTRL_4_Handler -OSC32KCTRL_Handler -SUPC_0_Handler -SUPC_1_Handler -WDT_Handler -RTC_Handler -EIC_0_Handler -EIC_1_Handler -EIC_2_Handler -EIC_3_Handler -EIC_4_Handler -EIC_5_Handler -EIC_6_Handler -EIC_7_Handler -EIC_8_Handler -EIC_9_Handler -EIC_10_Handler -EIC_11_Handler -EIC_12_Handler -EIC_13_Handler -EIC_14_Handler -EIC_15_Handler -FREQM_Handler -NVMCTRL_0_Handler -NVMCTRL_1_Handler -DMAC_0_Handler -DMAC_1_Handler -DMAC_2_Handler -DMAC_3_Handler -DMAC_4_Handler -EVSYS_0_Handler -EVSYS_1_Handler -EVSYS_2_Handler -EVSYS_3_Handler -EVSYS_4_Handler -PAC_Handler -TAL_0_Handler -TAL_1_Handler -RAMECC_Handler -SERCOM0_0_Handler -SERCOM0_1_Handler -SERCOM0_2_Handler -SERCOM0_3_Handler -SERCOM1_0_Handler -SERCOM1_1_Handler -SERCOM1_2_Handler -SERCOM1_3_Handler -SERCOM2_0_Handler -SERCOM2_1_Handler -SERCOM2_2_Handler -SERCOM2_3_Handler -SERCOM3_0_Handler -SERCOM3_1_Handler -SERCOM3_2_Handler -SERCOM3_3_Handler -SERCOM4_0_Handler -SERCOM4_1_Handler -SERCOM4_2_Handler -SERCOM4_3_Handler -SERCOM5_0_Handler -SERCOM5_1_Handler -SERCOM5_2_Handler -SERCOM5_3_Handler -SERCOM6_0_Handler -SERCOM6_1_Handler -SERCOM6_2_Handler -SERCOM6_3_Handler -SERCOM7_0_Handler -SERCOM7_1_Handler -SERCOM7_2_Handler -SERCOM7_3_Handler -CAN0_Handler -CAN1_Handler -USB_0_Handler -USB_1_Handler -USB_2_Handler -USB_3_Handler -GMAC_Handler -TCC0_0_Handler -TCC0_1_Handler -TCC0_2_Handler -TCC0_3_Handler -TCC0_4_Handler -TCC0_5_Handler -TCC0_6_Handler -TCC1_0_Handler -TCC1_1_Handler -TCC1_2_Handler -TCC1_3_Handler -TCC1_4_Handler -TCC2_0_Handler -TCC2_1_Handler -TCC2_2_Handler -TCC2_3_Handler -TCC3_0_Handler -TCC3_1_Handler -TCC3_2_Handler -TCC4_0_Handler -TCC4_1_Handler -TCC4_2_Handler -TC0_Handler -TC1_Handler -TC2_Handler -TC3_Handler -TC4_Handler -TC5_Handler -TC6_Handler -TC7_Handler -PDEC_0_Handler -PDEC_1_Handler -PDEC_2_Handler -ADC0_0_Handler -ADC0_1_Handler -ADC1_0_Handler -ADC1_1_Handler -AC_Handler -DAC_0_Handler -DAC_1_Handler -DAC_2_Handler -DAC_3_Handler -DAC_4_Handler -I2S_Handler -PCC_Handler -AES_Handler -TRNG_Handler -ICM_Handler -PUKCC_Handler -QSPI_Handler -SDHC0_Handler -SDHC1_Handler - B . - ENDP - - - ALIGN - - -; User Initial Stack & Heap - - IF :DEF:__MICROLIB - - EXPORT __initial_sp - EXPORT __heap_base - EXPORT __heap_limit - - ELSE - - IMPORT __use_two_region_memory - EXPORT __user_initial_stackheap -__user_initial_stackheap - - LDR R0, = Heap_Mem - LDR R1, =(Stack_Mem + Stack_Size) - LDR R2, = (Heap_Mem + Heap_Size) - LDR R3, = Stack_Mem - BX LR - - ALIGN - - ENDIF - - - END diff --git a/armcc/arm_addon/armcc/system_same54.c b/armcc/arm_addon/armcc/system_same54.c deleted file mode 100644 index 95d3036..0000000 --- a/armcc/arm_addon/armcc/system_same54.c +++ /dev/null @@ -1,70 +0,0 @@ -/** - * \file - * - * \brief Low-level initialization functions called upon chip startup. - * - * Copyright (c) 2016 Atmel Corporation, - * a wholly owned subsidiary of Microchip Technology Inc. - * - * \asf_license_start - * - * \page License - * - * 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 - * - */ - -#include "same54.h" - -/** - * Initial system clock frequency. The System RC Oscillator (RCSYS) provides - * the source for the main clock at chip startup. - */ -#define __SYSTEM_CLOCK (48000000) - -uint32_t SystemCoreClock = __SYSTEM_CLOCK; /*!< System Clock Frequency (Core Clock)*/ - -/** - * Initialize the system - * - * @brief Setup the microcontroller system. - * Initialize the System and update the SystemCoreClock variable. - */ -void SystemInit(void) -{ -#if __FPU_USED - /* Enable FPU */ - SCB->CPACR |= (0xFu << 20); - __DSB(); - __ISB(); -#endif - - // Keep the default device state after reset - SystemCoreClock = __SYSTEM_CLOCK; - return; -} - -/** - * Update SystemCoreClock variable - * - * @brief Updates the SystemCoreClock with current core Clock - * retrieved from cpu registers. - */ -void SystemCoreClockUpdate(void) -{ - // Not implemented - SystemCoreClock = __SYSTEM_CLOCK; - return; -} -- To view, visit https://gerrit.osmocom.org/12510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I232502798d71c97d0e7b4adf6bb6af3fa0940bd1 Gerrit-Change-Number: 12510 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:22 +0000 Subject: Change in osmo-asf4-dfu[master]: remove unused example code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12511 ) Change subject: remove unused example code ...................................................................... remove unused example code Change-Id: I205cd02f0c9a55d22bb78e84a88a29afe31224b0 --- D examples/driver_examples.c D examples/driver_examples.h M gcc/Makefile 3 files changed, 3 insertions(+), 36 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/examples/driver_examples.c b/examples/driver_examples.c deleted file mode 100644 index 69d50de..0000000 --- a/examples/driver_examples.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Code generated from Atmel Start. - * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file - * to avoid losing it when reconfiguring. - */ - -#include "driver_examples.h" -#include "driver_init.h" -#include "utils.h" diff --git a/examples/driver_examples.h b/examples/driver_examples.h deleted file mode 100644 index ef1c619..0000000 --- a/examples/driver_examples.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Code generated from Atmel Start. - * - * This file will be overwritten when reconfiguring your Atmel Start project. - * Please copy examples or other code you want to keep to a separate file - * to avoid losing it when reconfiguring. - */ -#ifndef DRIVER_EXAMPLES_H_INCLUDED -#define DRIVER_EXAMPLES_H_INCLUDED - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif -#endif // DRIVER_EXAMPLES_H_INCLUDED diff --git a/gcc/Makefile b/gcc/Makefile index f7c5b65..16c7858 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -36,7 +36,6 @@ hpl/mclk \ usb \ hal/utils/src \ -examples \ hpl/gclk \ usb/device \ hpl/oscctrl \ @@ -72,7 +71,6 @@ gcc/gcc/startup_same54.o \ hal/src/hal_usb_device.o \ hpl/osc32kctrl/hpl_osc32kctrl.o \ -examples/driver_examples.o \ driver_init.o \ hal/src/hal_gpio.o \ hal/utils/src/utils_event.o \ @@ -110,7 +108,6 @@ "gcc/gcc/startup_same54.o" \ "hal/src/hal_usb_device.o" \ "hpl/osc32kctrl/hpl_osc32kctrl.o" \ -"examples/driver_examples.o" \ "driver_init.o" \ "hal/src/hal_gpio.o" \ "hal/utils/src/utils_event.o" \ @@ -152,7 +149,6 @@ "hpl/mclk/hpl_mclk.d" \ "driver_init.d" \ "hpl/osc32kctrl/hpl_osc32kctrl.d" \ -"examples/driver_examples.d" \ "hal/src/hal_cache.d" \ "hal/src/hal_sleep.d" \ "hal/src/hal_gpio.d" \ @@ -207,7 +203,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< @@ -216,7 +212,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< @@ -225,7 +221,7 @@ @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 \ --I"../" -I"../config" -I"../examples" -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" \ +-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: $< -- To view, visit https://gerrit.osmocom.org/12511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I205cd02f0c9a55d22bb78e84a88a29afe31224b0 Gerrit-Change-Number: 12511 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:23 +0000 Subject: Change in osmo-asf4-dfu[master]: add license file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12512 ) Change subject: add license file ...................................................................... add license file this include the LGPL v2.1 for the DFU stack, ASF for the ASFv4 library, and Apache 2.0 for the CMSIS. Change-Id: If7b127ddd23bd8c5d158a731d58d425cdf6330f4 --- A LICENSE 1 file changed, 666 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d14c365 --- /dev/null +++ b/LICENSE @@ -0,0 +1,666 @@ +The USB DFU stack is under the LGPLv2.1 license. +This stack uses the Microchip ASFv4 library under the ASF license. +The CMSIS definitions are under the Apache-2.0 license +The header of each file indicates under which the includes source code is. +You can find the complete text of both licenses below. + += LGPLv2.1 + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + += ASF + +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. + += Apache-2.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS -- To view, visit https://gerrit.osmocom.org/12512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If7b127ddd23bd8c5d158a731d58d425cdf6330f4 Gerrit-Change-Number: 12512 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:24 +0000 Subject: Change in osmo-asf4-dfu[master]: set USB string to osmocom osmo-ASF4-DFU In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12513 ) Change subject: set USB string to osmocom osmo-ASF4-DFU ...................................................................... set USB string to osmocom osmo-ASF4-DFU Change-Id: I001a7b6f54b3aaab04d55e84cd9ada0daa423805 --- M config/usbd_config.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/config/usbd_config.h b/config/usbd_config.h index e33f4ba..96b3320 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -107,11 +107,11 @@ // Unicode string of iManufact // usb_dufd_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR -#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "osmocom" #endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC -#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 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif // @@ -130,11 +130,11 @@ // Unicode string of iProduct // usb_dufd_iproduct_str #ifndef CONF_USB_DFUD_IPRODUCT_STR -#define CONF_USB_DFUD_IPRODUCT_STR "sysmoOCTSIM" +#define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU" #endif #ifndef CONF_USB_DFUD_IPRODUCT_STR_DESC -#define CONF_USB_DFUD_IPRODUCT_STR_DESC 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', 0x00, 'M', 0x00, +#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 // -- To view, visit https://gerrit.osmocom.org/12513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I001a7b6f54b3aaab04d55e84cd9ada0daa423805 Gerrit-Change-Number: 12513 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:25 +0000 Subject: Change in osmo-asf4-dfu[master]: enable flashing by providing real downloaded data length In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12514 ) Change subject: enable flashing by providing real downloaded data length ...................................................................... enable flashing by providing real downloaded data length Change-Id: I6f16170a4b41a70d89954e2c4a841efc67a26786 --- M usb/class/dfu/device/dfudf.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index aefcab4..41e235b 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -245,11 +245,9 @@ } else { // there is data to be flash if (USB_SETUP_STAGE == stage) { // there will be data to be flash to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data - //to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK } else { // now there is data to be flashed dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash - dfu_download_length = 0; - //dfu_download_length = req->wLength; // remember the data size to be flash + dfu_download_length = req->wLength; // remember the data size to be flash dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data // we let the main application flash the data because this can be long and would stall the USB ISR -- To view, visit https://gerrit.osmocom.org/12514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f16170a4b41a70d89954e2c4a841efc67a26786 Gerrit-Change-Number: 12514 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:08:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:08:25 +0000 Subject: Change in osmo-asf4-dfu[master]: use reserved bootloader get application start In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12515 ) Change subject: use reserved bootloader get application start ...................................................................... use reserved bootloader get application start the reserved bootloader size is set in the NVM user configuration and allows to know the application start address (e.g. after the bootloader) Change-Id: I9dda27d6401caabb4a6470aa3fe9691f63097136 --- M usb/class/dfu/device/dfudf.c M usb/class/dfu/device/dfudf.h M usb_start.c 3 files changed, 18 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 41e235b..8232979 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -44,7 +44,7 @@ uint8_t dfu_download_data[512]; uint16_t dfu_download_length = 0; -size_t dfu_download_progress = 0; +size_t dfu_download_offset = 0; bool dfu_manifestation_complete = false; /** @@ -215,7 +215,7 @@ to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK break; case USB_DFU_ABORT: // abort current operation - dfu_download_progress = 0; // reset download progress + 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; @@ -246,7 +246,7 @@ if (USB_SETUP_STAGE == stage) { // there will be data to be flash to_return = usbdc_xfer(ep, dfu_download_data, req->wLength, false); // send ack to the setup request to get the data } else { // now there is data to be flashed - dfu_download_progress = req->wValue * sizeof(dfu_download_data); // remember which block to flash + dfu_download_offset = req->wValue * sizeof(dfu_download_data); // remember which block to flash dfu_download_length = req->wLength; // remember the data size to be flash dfu_state = USB_DFU_STATE_DFU_DNLOAD_SYNC; // go to sync state to_return = usbdc_xfer(ep, NULL, 0, false); // ACK the data diff --git a/usb/class/dfu/device/dfudf.h b/usb/class/dfu/device/dfudf.h index a19b569..cee5845 100644 --- a/usb/class/dfu/device/dfudf.h +++ b/usb/class/dfu/device/dfudf.h @@ -49,8 +49,8 @@ extern uint8_t dfu_download_data[512]; /** Length of downloaded data in bytes */ extern uint16_t dfu_download_length; -/** Progress of the already downloaded data in bytes */ -extern size_t dfu_download_progress; +/** 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; diff --git a/usb_start.c b/usb_start.c index 0ce8aba..7503094 100644 --- a/usb_start.c +++ b/usb_start.c @@ -45,14 +45,6 @@ /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; -/** Application address in the flash - ( - * It comes after the bootloader. - * The NVMCTRL allows to reserve space at the beginning of the flash for the bootloader, but only in multiples of 8192 bytes. - * The binary just with the USB stack already uses 8 kB, we reserve 16 kB for the bootloader (giving use a bit of margin for future fixes). - */ -#define APPLICATION_ADDR (8192*2) - /** * \brief USB DFU Init */ @@ -89,12 +81,24 @@ { 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 + + uint32_t application_start = hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw); // read BOOTPROT setting to get the bootloader size + ASSERT(application_start <= 15); + application_start = (15 - application_start) * 8192; // calculate bootloader size to know where we should write the application firmware + while (0 == application_start) { // no space has been reserved for the bootloader + // blink the LED to tell the user we don't know where the application starts + gpio_set_pin_level(LED_SYSTEM, false); + delay_ms(500); + gpio_set_pin_level(LED_SYSTEM, true); + delay_ms(500); + } + 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 if (dfu_download_length > 0) { // there is some data to be flashed - int32_t rc = flash_write(&FLASH_0, APPLICATION_ADDR + dfu_download_progress, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + int32_t rc = flash_write(&FLASH_0, application_start + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash if (ERR_NONE == rc) { dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed } else { // there has been a programming error -- To view, visit https://gerrit.osmocom.org/12515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9dda27d6401caabb4a6470aa3fe9691f63097136 Gerrit-Change-Number: 12515 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:11:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:11:01 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12516 ) Change subject: add README file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Thu, 17 Jan 2019 12:11:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:11:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:11:23 +0000 Subject: Change in osmo-asf4-dfu[master]: start application if valid at boot In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12592 ) Change subject: start application if valid at boot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I323f2b3a1828d3e40a02c7fc755d07009fb43a85 Gerrit-Change-Number: 12592 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:11:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:11:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:11:38 +0000 Subject: Change in osmo-asf4-dfu[master]: add button to force DFU bootloader In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12593 ) Change subject: add button to force DFU bootloader ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I163ab2de0fcbe13532c1992f6b78d49f4cda2d88 Gerrit-Change-Number: 12593 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:11:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:11:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:11:49 +0000 Subject: Change in osmo-asf4-dfu[master]: reduce number of endpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12594 ) Change subject: reduce number of endpoints ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52a5d2d3c3d09ca7dfa165535ccc295bf190841b Gerrit-Change-Number: 12594 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:11:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:14:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:14:29 +0000 Subject: Change in osmo-asf4-dfu[master]: add README file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12516 ) Change subject: add README file ...................................................................... add README file this describes the project, how to compile, and how to flash the USB DFU bootloader Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf --- A README.md 1 file changed, 50 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/README.md b/README.md new file mode 100644 index 0000000..031bc27 --- /dev/null +++ b/README.md @@ -0,0 +1,50 @@ +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. +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. + +USB DFU +======= + +This implementation support the following USB DFU capabilities: + +* can download: allowing to download the code over USB on the device (enabled per default) +* manifestation tolerant: allowing to download after a previous download (disabled per default) +* will detach: forcing the device the reset after a download, else it wit for a USB reset (enable per default) + +Set the corresponding attributes in the 'DFUD_IFACE_DESCB' macro definition in the 'usb/class/dfu/device/dfudf_desc.h' file. + +Compiling +========= + +Use the 'Makefile' script to compile the source code using the ARM none EABI GCC cross-cimpilig toolchain: +``` +cd gcc +make +``` + +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. +We need to reserve as least 2 pages of 8192 bytes for the bootloader since it is a bit larger than 10 KB (e.g. over 8 KB). +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 +---- + +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` -- To view, visit https://gerrit.osmocom.org/12516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If884bca373aab10fe74d16f42b79dd6685eeabcf Gerrit-Change-Number: 12516 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:14:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:14:30 +0000 Subject: Change in osmo-asf4-dfu[master]: start application if valid at boot In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12592 ) Change subject: start application if valid at boot ...................................................................... start application if valid at boot if the application is not valid, check and start the bootloader Change-Id: I323f2b3a1828d3e40a02c7fc755d07009fb43a85 --- M usb_dfu_main.c M usb_start.c 2 files changed, 85 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 2535475..91748a5 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -1,45 +1,95 @@ /** * \file + * \brief USB DFU bootloader implementation (DFU mode) * - * \brief Application implement + * Copyright (c) 2018-2019 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * 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. * - * \asf_license_start + * 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. * - * \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 - * - */ -/* - * Support and FAQ: visit Microchip Support + * 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 "atmel_start.h" #include "atmel_start_pins.h" +/** Start address of the application in flash + * \remark must be initialized by check_bootloader + */ +static uint32_t* application_start_address; + +/** Check if the bootloader is valid + * \return true if the bootloader is valid and can be run + * \remark initializes application_start_address + */ +static bool check_bootloader(void) +{ + if (hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw) > 15) { // ensure BOOTPROT setting is valid + return false; + } + application_start_address = (uint32_t*)((15 - hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw)) * 8192); // calculate bootloader size to know start address of the application (e.g. after the bootloader) + if (0 == application_start_address) { // no space has been reserved for the bootloader + return false; + } + return true; +} + +/** Check if starting the bootloader is forced + * \return true of the DFU bootloader should be started + */ +static bool check_force_dfu(void) +{ +} + +/** Check if the application is valid + * \return true if the application is valid and can be started + * \warning application_start_address must be initialized + */ +static bool check_application(void) +{ + /* the application starts with the vector table + * the first entry in the vector table is the initial stack pointer (SP) address + * the stack will be placed in RAM which begins at 0x2000 0000, and there is up to 256 KB of RAM (0x40000). + * 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)); +} + +/** Start the application + * \warning application_start_address must be initialized + */ +static void start_application(void) +{ + __set_MSP(*application_start_address); // re-base the Stack Pointer + 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 */ +} + int main(void) { - atmel_start_init(); - usb_dfu(); + atmel_start_init(); // initialise system + if (!check_bootloader()) { // check bootloader + // blink the LED to tell the user we don't know where the application starts + while (true) { + gpio_set_pin_level(LED_SYSTEM, false); + delay_ms(500); + gpio_set_pin_level(LED_SYSTEM, true); + delay_ms(500); + } + } + if (check_application()) { // application is valid + start_application(); // start application + } else { + usb_dfu(); // start DFU bootloader + } } diff --git a/usb_start.c b/usb_start.c index 7503094..ad91840 100644 --- a/usb_start.c +++ b/usb_start.c @@ -82,23 +82,16 @@ 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 - uint32_t application_start = hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw); // read BOOTPROT setting to get the bootloader size - ASSERT(application_start <= 15); - application_start = (15 - application_start) * 8192; // calculate bootloader size to know where we should write the application firmware - while (0 == application_start) { // no space has been reserved for the bootloader - // blink the LED to tell the user we don't know where the application starts - gpio_set_pin_level(LED_SYSTEM, false); - delay_ms(500); - gpio_set_pin_level(LED_SYSTEM, true); - delay_ms(500); - } + 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 + ASSERT(application_start_address > 0); 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 if (dfu_download_length > 0) { // there is some data to be flashed - int32_t rc = flash_write(&FLASH_0, application_start + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash + 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) { dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing this block has been completed } else { // there has been a programming error -- To view, visit https://gerrit.osmocom.org/12592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I323f2b3a1828d3e40a02c7fc755d07009fb43a85 Gerrit-Change-Number: 12592 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:14:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:14:30 +0000 Subject: Change in osmo-asf4-dfu[master]: add button to force DFU bootloader In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12593 ) Change subject: add button to force DFU bootloader ...................................................................... add button to force DFU bootloader Change-Id: I163ab2de0fcbe13532c1992f6b78d49f4cda2d88 --- M atmel_start_pins.h M driver_init.c M usb_dfu_main.c 3 files changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/atmel_start_pins.h b/atmel_start_pins.h index 23b8d33..86e1dfb 100644 --- a/atmel_start_pins.h +++ b/atmel_start_pins.h @@ -27,9 +27,12 @@ #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 (pull low to switch on) */ #define LED_SYSTEM GPIO(GPIO_PORTC, 18) +/** User button to force DFu bootloader (connected to ground when pressed) */ +#define BUTTON_FORCE_DFU GPIO(GPIO_PORTB, 31) + /** USB D+/D- pins */ #define PA24 GPIO(GPIO_PORTA, 24) #define PA25 GPIO(GPIO_PORTA, 25) diff --git a/driver_init.c b/driver_init.c index 0b07cc1..a91b0eb 100644 --- a/driver_init.c +++ b/driver_init.c @@ -148,6 +148,11 @@ 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); + gpio_set_pin_function(BUTTON_FORCE_DFU, GPIO_PIN_FUNCTION_OFF); + USB_DEVICE_INSTANCE_init(); FLASH_0_init(); } diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 91748a5..449b311 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -48,6 +48,8 @@ */ 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 } /** Check if the application is valid @@ -87,7 +89,7 @@ delay_ms(500); } } - if (check_application()) { // application is valid + if (!check_force_dfu() && check_application()) { // application is valid start_application(); // start application } else { usb_dfu(); // start DFU bootloader -- To view, visit https://gerrit.osmocom.org/12593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I163ab2de0fcbe13532c1992f6b78d49f4cda2d88 Gerrit-Change-Number: 12593 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:14:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:14:31 +0000 Subject: Change in osmo-asf4-dfu[master]: reduce number of endpoints In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12594 ) Change subject: reduce number of endpoints ...................................................................... reduce number of endpoints only endpoint 0 is used, thus there is no need to define more. this also saves RAM. Change-Id: I52a5d2d3c3d09ca7dfa165535ccc295bf190841b --- M config/hpl_usb_config.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/config/hpl_usb_config.h b/config/hpl_usb_config.h index 02439a3..4445de5 100644 --- a/config/hpl_usb_config.h +++ b/config/hpl_usb_config.h @@ -39,7 +39,7 @@ // Max possible (by "Max Endpoint Number" config) // usbd_num_ep_sp #ifndef CONF_USB_D_NUM_EP_SP -#define CONF_USB_D_NUM_EP_SP CONF_USB_D_N_EP_MAX +#define CONF_USB_D_NUM_EP_SP CONF_USB_N_1 #endif // @@ -60,7 +60,7 @@ // The number of physical endpoints - 1 // usbd_arch_max_ep_n #ifndef CONF_USB_D_MAX_EP_N -#define CONF_USB_D_MAX_EP_N CONF_USB_N_2 +#define CONF_USB_D_MAX_EP_N CONF_USB_N_0 #endif // USB Speed Limit -- To view, visit https://gerrit.osmocom.org/12594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52a5d2d3c3d09ca7dfa165535ccc295bf190841b Gerrit-Change-Number: 12594 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:15:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:15:22 +0000 Subject: Change in osmo-asf4-dfu[master]: avoid mutli-packet USB transfer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12595 ) Change subject: avoid mutli-packet USB transfer ...................................................................... Patch Set 1: I'm not sure if we really want to mege this. The USB stack will also be used later on, and for sure with CCID we will have APDUs/TPDUs larger than the endpoint size, and we will support this. Or is this behavior only visible on the control endpoint? -- To view, visit https://gerrit.osmocom.org/12595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb4c5f4bc06095f5f962152b8d8247054ef6a520 Gerrit-Change-Number: 12595 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:15:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:16:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:16:21 +0000 Subject: Change in openbsc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12601 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Patch Set 1: I'm happy to merge this, but in general we should first merge such changes to the maintained software (e.g. osmo-msc in this case) and then back-port it to openbsc to avoid too much feature divergence. -- To view, visit https://gerrit.osmocom.org/12601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 Gerrit-Change-Number: 12601 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:16:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:16:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:16:49 +0000 Subject: Change in openbsc[master]: Don't deliver alert notification to ESME not bound for RX In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12602 ) Change subject: Don't deliver alert notification to ESME not bound for RX ...................................................................... Patch Set 1: good patch, but similarly, we should always work "mainline first" and then back-port to openbsc.git. Thanks! -- To view, visit https://gerrit.osmocom.org/12602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf Gerrit-Change-Number: 12602 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:16:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:17:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:17:18 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12603 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Patch Set 1: good patch, but similarly, we should always work "mainline first" and then back-port to openbsc.git. Thanks! -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:17:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:17:53 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 12:17:53 +0000 Subject: Change in osmo-msc[master]: SMS: remove code duplication in transaction init In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12578 ) Change subject: SMS: remove code duplication in transaction init ...................................................................... SMS: remove code duplication in transaction init Move code which allocates transaction for SMS and initializes corresponding FSM into separate function (shared by MT and MO code paths) to avoid code duplication and simplify further modifications. Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 --- M src/libmsc/gsm_04_11.c 1 file changed, 28 insertions(+), 25 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, but someone else must approve osmith: 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 8ef26a7..4dc07bd 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1007,6 +1007,27 @@ return rc; } +static struct gsm_trans *gsm411_trans_init(struct gsm_network *net, struct vlr_subscr *vsub, struct ran_conn *conn, + uint8_t tid) +{ + /* Allocate a new transaction */ + struct gsm_trans *trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); + if (!trans) { + LOGP(DLSMS, LOGL_ERROR, "No memory for transaction\n"); + return NULL; + } + + /* Init both SMC and SMR state machines */ + gsm411_smc_init(&trans->sms.smc_inst, 0, 1, gsm411_mn_recv, gsm411_mm_send); + gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send); + + /* Associate transaction with connection */ + if (conn) + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); + + return trans; +} + static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net, struct vlr_subscr *vsub) { @@ -1023,24 +1044,15 @@ return NULL; } - /* Allocate a new transaction */ - trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); - if (!trans) { - LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); - return NULL; - } - - /* Init both SMC and SMR state machines */ - gsm411_smc_init(&trans->sms.smc_inst, 0, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, 0, 1, - gsm411_rl_recv, gsm411_mn_send); - /* Attempt to find an existing connection */ conn = connection_for_subscr(vsub); + + /* Allocate a new transaction */ + trans = gsm411_trans_init(net, vsub, conn, tid); + if (!trans) + return NULL; + if (conn) { - /* Associate transaction with connection */ - trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* Generate unique RP Message Reference */ trans->sms.sm_rp_mr = conn->next_rp_ref++; } @@ -1192,21 +1204,12 @@ } if (!trans) { - DEBUGP(DLSMS, " -> (new transaction)\n"); - trans = trans_alloc(conn->network, conn->vsub, - GSM48_PDISC_SMS, - transaction_id, new_callref++); + trans = gsm411_trans_init(conn->network, conn->vsub, conn, transaction_id); if (!trans) { - DEBUGP(DLSMS, " -> No memory for trans\n"); /* FIXME: send some error message */ return -ENOMEM; } - gsm411_smc_init(&trans->sms.smc_inst, 0, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, 0, 1, - gsm411_rl_recv, gsm411_mn_send); - trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ new_trans = 1; -- To view, visit https://gerrit.osmocom.org/12578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 Gerrit-Change-Number: 12578 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:17:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:17:55 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12603 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Patch Set 1: Code-Review+2 forget my earlier comments, I now saw the MSC changes. Thanks! -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 12:17:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:23:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:23:12 +0000 Subject: Change in openbsc[master]: Don't deliver alert notification to ESME not bound for RX In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12602 ) Change subject: Don't deliver alert notification to ESME not bound for RX ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12602/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12602/1//COMMIT_MSG at 7 PS1, Line 7: bound for RX Why is that? I would argue there are many applications where you may want to transmit a SMS from ESME to the MS in response to an activity report. In that case, IIRC, the ESME would only be bound for TX but still want notifications? Basically, I think to avoid constraining use cases we should send notifications to any ESME that is bound to any of RX/TX/TRX. -- To view, visit https://gerrit.osmocom.org/12602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf Gerrit-Change-Number: 12602 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:23:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:23:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:23:15 +0000 Subject: Change in openbsc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12601 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 Gerrit-Change-Number: 12601 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:23:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:23:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:23:24 +0000 Subject: Change in osmo-msc[master]: Don't send Alert Notifications to ESME not bound for RX In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12599 ) Change subject: Don't send Alert Notifications to ESME not bound for RX ...................................................................... Patch Set 2: Why is that? I would argue there are many applications where you may want to transmit a SMS from ESME to the MS in response to an activity report. In that case, IIRC, the ESME would only be bound for TX but still want notifications? Basically, I think to avoid constraining use cases we should send notifications to any ESME that is bound to any of RX/TX/TRX. -- To view, visit https://gerrit.osmocom.org/12599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df Gerrit-Change-Number: 12599 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:23:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:24:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:24:00 +0000 Subject: Change in osmo-msc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12597 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 Gerrit-Change-Number: 12597 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:24:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:24:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:24:08 +0000 Subject: Change in osmo-msc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12600 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3fa3f26c333bf445590fd75ad7a08be68fed3e2 Gerrit-Change-Number: 12600 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:24:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:24:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:24:32 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: use bool in sched_trx_reset() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12580 ) Change subject: trxcon/sched_trx.c: use bool in sched_trx_reset() ...................................................................... trxcon/sched_trx.c: use bool in sched_trx_reset() Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h M src/host/trxcon/trxcon.c 4 files changed, 8 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 02aa3fa..a2ced46 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -345,7 +345,7 @@ band_arfcn &~ ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ - sched_trx_reset(l1l->trx, 1); + sched_trx_reset(l1l->trx, true); /* Configure a single timeslot */ sched_trx_configure_ts(l1l->trx, 0, ch_config); @@ -431,7 +431,7 @@ /* Fall through */ case L1CTL_RES_T_SCHED: - sched_trx_reset(l1l->trx, 1); + sched_trx_reset(l1l->trx, true); break; default: LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n"); @@ -674,7 +674,7 @@ "switching back to CCCH\n"); /* Reset scheduler */ - sched_trx_reset(l1l->trx, 0); + sched_trx_reset(l1l->trx, false); msgb_free(msg); return 0; diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 19d1fe8..18516d3 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -2,7 +2,7 @@ * OsmocomBB <-> SDR connection bridge * TDMA scheduler: GSM PHY routines * - * (C) 2017 by Vadim Yanitskiy + * (C) 2017-2019 by Vadim Yanitskiy * * All Rights Reserved * @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -160,7 +161,7 @@ return 0; } -int sched_trx_reset(struct trx_instance *trx, int reset_clock) +int sched_trx_reset(struct trx_instance *trx, bool reset_clock) { int i; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index b7236d5..f914eee 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -263,7 +263,7 @@ /* Scheduler management functions */ int sched_trx_init(struct trx_instance *trx, uint32_t fn_advance); -int sched_trx_reset(struct trx_instance *trx, int reset_clock); +int sched_trx_reset(struct trx_instance *trx, bool reset_clock); int sched_trx_shutdown(struct trx_instance *trx); /* Timeslot management functions */ diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 251321d..874f893 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -93,7 +93,7 @@ if (app_data.trx->fsm->state != TRX_STATE_OFFLINE) { /* Reset scheduler and clock counter */ - sched_trx_reset(app_data.trx, 1); + sched_trx_reset(app_data.trx, true); /* TODO: implement trx_if_reset() */ trx_if_cmd_poweroff(app_data.trx); -- To view, visit https://gerrit.osmocom.org/12580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc Gerrit-Change-Number: 12580 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:25:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:25:24 +0000 Subject: Change in osmocom-bb[master]: trxcon: register both l1ctl_fsm and trx_fsm on DSO load In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12586 ) Change subject: trxcon: register both l1ctl_fsm and trx_fsm on DSO load ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 Gerrit-Change-Number: 12586 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:25:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:25:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:25:42 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12587 ) Change subject: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 Gerrit-Change-Number: 12587 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:25:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:25:48 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:25:48 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: check if trx_fsm allocation failed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12588 ) Change subject: trxcon/trx_if.c: check if trx_fsm allocation failed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a Gerrit-Change-Number: 12588 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:25:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:26:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:26:01 +0000 Subject: Change in osmocom-bb[master]: trxcon: do not include trxcon.h everywhere In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12581 ) Change subject: trxcon: do not include trxcon.h everywhere ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia78bd6dac7ab12970838e0b1a2929a106b898d9d Gerrit-Change-Number: 12581 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:26:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:26:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:26:25 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if: refactor trx_if_open() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12582 ) Change subject: trxcon/trx_if: refactor trx_if_open() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c Gerrit-Change-Number: 12582 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:26:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:26:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:26:43 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: refactor l1ctl_link_init() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12583 ) Change subject: trxcon/l1ctl_link.c: refactor l1ctl_link_init() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b Gerrit-Change-Number: 12583 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:26:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:27:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:27:16 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12584 ) Change subject: trxcon/trxcon.h: do not expose tall_trx_ctx ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12584/2/src/host/trxcon/trxcon.c File src/host/trxcon/trxcon.c: https://gerrit.osmocom.org/#/c/12584/2/src/host/trxcon/trxcon.c at 77 PS2, Line 77: void *tall_trxcon_ctx = NULL; can you even make it static to this file? -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:27:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:28:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:28:15 +0000 Subject: Change in osmocom-bb[master]: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12589 ) Change subject: trxcon: make trxcon_fsm parent for both l1ctl_fsm and trx_fsm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6262726f2b6e23abe543d6d67edfd634eece1b71 Gerrit-Change-Number: 12589 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:28:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:28:27 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:28:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12584 ) Change subject: trxcon/trxcon.h: do not expose tall_trx_ctx ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12584/2/src/host/trxcon/trxcon.c File src/host/trxcon/trxcon.c: https://gerrit.osmocom.org/#/c/12584/2/src/host/trxcon/trxcon.c at 77 PS2, Line 77: void *tall_trxcon_ctx = NULL; > can you even make it static to this file? Sure, thanks! -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:28:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:28:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:28:29 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12590 ) Change subject: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37812573a33e090e6edb45713d3132cb43bd4ffb Gerrit-Change-Number: 12590 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:28:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:29:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:29:10 +0000 Subject: Change in osmo-bsc[master]: Log MDCX ACK for established lchan In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12596 ) Change subject: Log MDCX ACK for established lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Gerrit-Change-Number: 12596 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 12:29:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:29:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:29:13 +0000 Subject: Change in osmo-bsc[master]: Log MDCX ACK for established lchan In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12596 ) Change subject: Log MDCX ACK for established lchan ...................................................................... Log MDCX ACK for established lchan Previously LCHAN_RTP_EV_IPACC_MDCX_ACK was not permitted for LCHAN_RTP_ST_ESTABLISHED state in lchan FSM. However this message is normal in case of LCLS loop closed via IPA (as opposed to MGCP). Let's permit this message and log it to make debug output easier to read. Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Related: OS#2487 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 84cc287..2d15bf2 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -565,13 +565,19 @@ static void lchan_rtp_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + switch (event) { case LCHAN_RTP_EV_RELEASE: case LCHAN_RTP_EV_ROLLBACK: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0); return; - + case LCHAN_RTP_EV_IPACC_MDCX_ACK: + LOG_LCHAN_RTP(lchan, LOGL_NOTICE, + "Received MDCX ACK on established lchan's RTP port: %s\n", + mgwep_ci_name(lchan->mgw_endpoint_ci_bts)); + return; default: OSMO_ASSERT(false); } @@ -689,6 +695,7 @@ .in_event_mask = 0 | S(LCHAN_RTP_EV_RELEASE) | S(LCHAN_RTP_EV_ROLLBACK) + | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) , }, [LCHAN_RTP_ST_ROLLBACK] = { -- To view, visit https://gerrit.osmocom.org/12596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib642df799f3405c4d707eb57b2ebc84386d7f03f Gerrit-Change-Number: 12596 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:29:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 12:29:38 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12608 Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Handle LCLS-NOTIFICATION message from BSS Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Related: OS#2487 --- M src/libmsc/a_iface_bssap.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/12608/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 41af93c..12a7af6 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -585,6 +585,30 @@ return 0; } +/* Handle incoming LCLS-NOTIFICATION BSSMAP message: 3GPP TS 48.008 ?3.2.1.93 */ +static int bssmap_rx_lcls_notif(const struct ran_conn *conn, const struct msgb *msg, const struct tlv_parsed *tp) +{ + /* Either ?3.2.2.119 LCLS-BSS-Status (GSM0808_LCLS_STS*) or ?3.2.2.120 LCLS-Break-Request shall be present */ + if (TLVP_PRESENT(tp, GSM0808_IE_LCLS_BSS_STATUS) && TLVP_PRESENT(tp, GSM0808_IE_LCLS_BREAK_REQ)) { + LOGPCONN(conn, LOGL_ERROR, "Ignoring broken LCLS Notification message\n"); + } + + if (TLVP_PRESENT(tp, GSM0808_IE_LCLS_BSS_STATUS)) { + uint8_t *status = TLVP_VAL(tp, GSM0808_IE_LCLS_BSS_STATUS); + LOGPCONN(conn, LOGL_NOTICE, "Received LCLS Status %s\n", gsm0808_lcls_status_name(*status)); + return 0; + } + + if (TLVP_PRESENT(tp, GSM0808_IE_LCLS_BREAK_REQ)) { + LOGPCONN(conn, LOGL_NOTICE, "Received LCLS Break Request\n"); + return 0; + } + + LOGPCONN(conn, LOGL_ERROR, "Received empty LCLS Notification\n"); + + return 0; +} + /* Handle incoming connection oriented BSSMAP messages */ static int rx_bssmap(struct osmo_sccp_user *scu, const struct a_conn_info *a_conn_info, struct msgb *msg) { @@ -646,6 +670,8 @@ return bssmap_rx_sapi_n_rej(conn, msg, &tp); case BSS_MAP_MSG_ASSIGMENT_COMPLETE: return bssmap_rx_ass_compl(conn, msg, &tp); + case BSS_MAP_MSG_LCLS_NOTIFICATION: + return bssmap_rx_lcls_notif(conn, msg, &tp); default: LOGPCONN(conn, LOGL_ERROR, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg_type)); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:31:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:31:17 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc at 298 PS2, Line 298: Supplementary Services; textual dialog between subscriber and core : network, e.g. '*#100#' -> 'Your extension is 1234' actually, your example is USSD, which is only one part of non-call-related SS, which again are only a part of SS. Supplementary services are also used for 3-party calls, hold/retrieve, advice-of-charge, call deflection, ... -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:31:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:31:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:31:47 +0000 Subject: Change in osmo-hlr[master]: docs: running: same argument order as osmo-hlr -h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12605 ) Change subject: docs: running: same argument order as osmo-hlr -h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If866124e9cfb43c6986d458712961713541e03b6 Gerrit-Change-Number: 12605 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 Jan 2019 12:31:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:31:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:31:53 +0000 Subject: Change in osmo-hlr[master]: docs: running: s/OsmoBTS/OsmoHLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12607 ) Change subject: docs: running: s/OsmoBTS/OsmoHLR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 Gerrit-Change-Number: 12607 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:31:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:31:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:31:56 +0000 Subject: Change in osmo-hlr[master]: docs: running: same argument order as osmo-hlr -h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12605 ) Change subject: docs: running: same argument order as osmo-hlr -h ...................................................................... docs: running: same argument order as osmo-hlr -h Change the Synopsis and Options sections of the Running OsmoHLR chapter to list the arguments in the same order as osmo-hlr. This makes it easier to compare, which options are already documented, and which ones are missing. A follow-up commit will document the missing -U/--db-upgrade option. Change-Id: If866124e9cfb43c6986d458712961713541e03b6 --- M doc/manuals/chapters/running.adoc 1 file changed, 12 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5f24746..d20c907 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,24 +5,27 @@ === SYNOPSIS -*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] === OPTIONS +// Keep the order the same as in osmo-hlr --help! + *-h, --help*:: Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-hlr.cfg` in the current + working directory. +*-l, --database 'DATABASE'*:: + Specify the file name of the SQLite3 database to use as HLR/AUC + storage *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, see <> for further information. *-D, --daemonize*:: Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-hlr.cfg` in the current - working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> @@ -35,9 +38,8 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as HLR/AUC - storage +*-V, --version*:: + Print the compile-time version number of the OsmoBTS program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If866124e9cfb43c6986d458712961713541e03b6 Gerrit-Change-Number: 12605 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:31:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:31:56 +0000 Subject: Change in osmo-hlr[master]: docs: running: s/OsmoBTS/OsmoHLR In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12607 ) Change subject: docs: running: s/OsmoBTS/OsmoHLR ...................................................................... docs: running: s/OsmoBTS/OsmoHLR Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d20c907..ad89974 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -39,7 +39,7 @@ been deprecated by VTY based logging configuration, see <> for more information. *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the OsmoHLR program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 Gerrit-Change-Number: 12607 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:32:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 12:32:14 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 Jan 2019 12:32:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:39:37 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 17 Jan 2019 12:39:37 +0000 Subject: Change in osmo-asf4-dfu[master]: remove OCTSIM in USB ID Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12609 Change subject: remove OCTSIM in USB ID ...................................................................... remove OCTSIM in USB ID this bootloader is initiated and meant for the sysmo-OCTSIM, but it can be applied for other SAM E5x/D5x boards. Thus we remove the OCTSIM name an just use the more generic bootloader name. Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 --- M config/usbd_config.h M usb/class/dfu/device/dfudf_desc.h 2 files changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/09/12609/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index 96b3320..c20dfb2 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -23,7 +23,7 @@ #endif // Language IDs // Language IDs in c format, split by comma (E.g., 0x0409 ...) -// usb_dufd_langid +// usb_dfud_langid #ifndef CONF_USB_DFUD_LANGID #define CONF_USB_DFUD_LANGID "0x0409" #endif @@ -69,33 +69,33 @@ // <0x0010=> 16 bytes // <0x0020=> 32 bytes // <0x0040=> 64 bytes -// usb_dufd_bmaxpksz0 +// usb_dfud_bmaxpksz0 #ifndef CONF_USB_DFUD_BMAXPKSZ0 #define CONF_USB_DFUD_BMAXPKSZ0 0x40 #endif // idVendor <0x0000-0xFFFF> // <0x1d50=> OpenMoko -// usb_octsim_idvendor -#ifndef CONF_USB_OCTSIM_IDVENDOR -#define CONF_USB_OCTSIM_IDVENDOR 0x1d50 +// usb_dfud_idvendor +#ifndef CONF_USB_OPENMOKO_IDVENDOR +#define CONF_USB_OPENMOKO_IDVENDOR 0x1d50 #endif // idProduct <0x0000-0xFFFF> -// <0x6140=> sysmoOCTSIM -// usb_dufd_idproduct -#ifndef CONF_USB_OCTSIM_IDPRODUCT -#define CONF_USB_OCTSIM_IDPRODUCT 0x6140 +// <0x6140=> osmo-ASF4-DFU +// usb_dfud_idproduct +#ifndef CONF_USB_OSMOASF4DFU_IDPRODUCT +#define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6140 #endif // bcdDevice <0x0000-0xFFFF> -// usb_dufd_bcddevice +// usb_dfud_bcddevice #ifndef CONF_USB_DFUD_BCDDEVICE #define CONF_USB_DFUD_BCDDEVICE 0x000 #endif // Enable string descriptor of iManufact -// usb_dufd_imanufact_en +// usb_dfud_imanufact_en #ifndef CONF_USB_DFUD_IMANUFACT_EN #define CONF_USB_DFUD_IMANUFACT_EN 1 #endif @@ -105,7 +105,7 @@ #endif // Unicode string of iManufact -// usb_dufd_imanufact_str +// usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR #define CONF_USB_DFUD_IMANUFACT_STR "osmocom" #endif @@ -117,7 +117,7 @@ // // Enable string descriptor of iProduct -// usb_dufd_iproduct_en +// usb_dfud_iproduct_en #ifndef CONF_USB_DFUD_IPRODUCT_EN #define CONF_USB_DFUD_IPRODUCT_EN 1 #endif @@ -128,7 +128,7 @@ #endif // Unicode string of iProduct -// usb_dufd_iproduct_str +// usb_dfud_iproduct_str #ifndef CONF_USB_DFUD_IPRODUCT_STR #define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU" #endif @@ -140,7 +140,7 @@ // // Enable string descriptor of iSerialNum -// usb_dufd_iserialnum_en +// usb_dfud_iserialnum_en #ifndef CONF_USB_DFUD_ISERIALNUM_EN #define CONF_USB_DFUD_ISERIALNUM_EN 0 #endif @@ -152,7 +152,7 @@ #endif // Unicode string of iSerialNum -// usb_dufd_iserialnum_str +// usb_dfud_iserialnum_str #ifndef CONF_USB_DFUD_ISERIALNUM_STR #define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF" #endif @@ -164,7 +164,7 @@ // // bNumConfigurations <0x01-0xFF> -// usb_dufd_bnumconfig +// usb_dfud_bnumconfig #ifndef CONF_USB_DFUD_BNUMCONFIG #define CONF_USB_DFUD_BNUMCONFIG 0x1 #endif @@ -174,25 +174,25 @@ // DFU Configuration Descriptor // wTotalLength <0x01-0xFF> -// usb_dufd_wtotallength +// usb_dfud_wtotallength #ifndef CONF_USB_DFUD_WTOTALLENGTH #define CONF_USB_DFUD_WTOTALLENGTH 27 #endif // bNumInterfaces <0x01-0xFF> -// usb_dufd_bnuminterfaces +// usb_dfud_bnuminterfaces #ifndef CONF_USB_DFUD_BNUMINTERFACES #define CONF_USB_DFUD_BNUMINTERFACES 1 #endif // bConfigurationValue <0x01-0xFF> -// usb_dufd_bconfigval +// usb_dfud_bconfigval #ifndef CONF_USB_DFUD_BCONFIGVAL #define CONF_USB_DFUD_BCONFIGVAL 0x1 #endif // Enable string descriptor of iConfig -// usb_dufd_iconfig_en +// usb_dfud_iconfig_en #ifndef CONF_USB_DFUD_ICONFIG_EN #define CONF_USB_DFUD_ICONFIG_EN 0 #endif @@ -205,7 +205,7 @@ #endif // Unicode string of iConfig -// usb_dufd_iconfig_str +// usb_dfud_iconfig_str #ifndef CONF_USB_DFUD_ICONFIG_STR #define CONF_USB_DFUD_ICONFIG_STR "" #endif @@ -221,13 +221,13 @@ // <0xA0=> Bus power supply, support for remote wakeup // <0xC0=> Self powered, not support for remote wakeup // <0xE0=> Self powered, support for remote wakeup -// usb_dufd_bmattri +// usb_dfud_bmattri #ifndef CONF_USB_DFUD_BMATTRI #define CONF_USB_DFUD_BMATTRI 0x80 #endif // bMaxPower <0x00-0xFF> -// usb_dufd_bmaxpower +// usb_dfud_bmaxpower #ifndef CONF_USB_DFUD_BMAXPOWER #define CONF_USB_DFUD_BMAXPOWER 0x32 #endif @@ -236,25 +236,25 @@ // DFU Interface Descriptor // bInterfaceNumber <0x00-0xFF> -// usb_dufd_bifcnum +// usb_dfud_bifcnum #ifndef CONF_USB_DFUD_BIFCNUM #define CONF_USB_DFUD_BIFCNUM 0x0 #endif // bAlternateSetting <0x00-0xFF> -// usb_dufd_baltset +// usb_dfud_baltset #ifndef CONF_USB_DFUD_BALTSET #define CONF_USB_DFUD_BALTSET 0x0 #endif // bNumEndpoints <0x00-0xFF> -// usb_dufd_bnumep +// usb_dfud_bnumep #ifndef CONF_USB_DFUD_BNUMEP #define CONF_USB_DFUD_BNUMEP 0x0 #endif // Enable string descriptor of iInterface -// usb_dufd_iinterface_en +// usb_dfud_iinterface_en #ifndef CONF_USB_DFUD_IINTERFACE_EN #define CONF_USB_DFUD_IINTERFACE_EN 1 #endif @@ -267,7 +267,7 @@ #endif // Unicode string of iInterface -// usb_dufd_iinterface_str +// usb_dfud_iinterface_str #ifndef CONF_USB_DFUD_IINTERFAGE_STR #define CONF_USB_DFUD_IINTERFACE_STR "SAM D5x/E5x DFU bootloader (DFU mode)" #endif diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index 68880c7..97bff4c 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -44,8 +44,8 @@ CONF_USB_DFUD_BDEVICESUBCLASS, \ CONF_USB_DFUD_BDEVICEPROTOCOL, \ CONF_USB_DFUD_BMAXPKSZ0, \ - CONF_USB_OCTSIM_IDVENDOR, \ - CONF_USB_OCTSIM_IDPRODUCT, \ + CONF_USB_OPENMOKO_IDVENDOR, \ + CONF_USB_OSMOASF4DFU_IDPRODUCT, \ CONF_USB_DFUD_BCDDEVICE, \ CONF_USB_DFUD_IMANUFACT, \ CONF_USB_DFUD_IPRODUCT, \ -- To view, visit https://gerrit.osmocom.org/12609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 Gerrit-Change-Number: 12609 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:13 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:13 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: pass trxcon_inst pointer to RX handlers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12612 Change subject: trxcon/l1ctl.c: pass trxcon_inst pointer to RX handlers ...................................................................... trxcon/l1ctl.c: pass trxcon_inst pointer to RX handlers Change-Id: I4e59f547a165b30aa9538ae8f9d6bd822067315b --- M src/host/trxcon/l1ctl.c M src/host/trxcon/l1ctl.h M src/host/trxcon/trxcon_fsm.c 3 files changed, 79 insertions(+), 76 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/12/12612/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 0b6d75a..8f0be48 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -42,6 +42,7 @@ #include "l1ctl_link.h" #include "l1ctl_proto.h" +#include "trxcon.h" #include "trx_if.h" #include "sched_trx.h" @@ -288,7 +289,7 @@ /* FBSB expire timer */ static void fbsb_timer_cb(void *data) { - struct l1ctl_link *l1l = (struct l1ctl_link *) data; + struct trxcon_inst *trxcon = (struct trxcon_inst *) data; struct l1ctl_fbsb_conf *conf; struct l1ctl_info_dl *dl; struct msgb *msg; @@ -306,7 +307,7 @@ memset(dl, 0x00, len); /* Fill in current ARFCN */ - dl->band_arfcn = htons(l1l->trx->band_arfcn); + dl->band_arfcn = htons(trxcon->trx->band_arfcn); /* Fill in FBSB payload: BSIC and sync result */ conf = (struct l1ctl_fbsb_conf *) msgb_put(msg, sizeof(*conf)); @@ -314,12 +315,12 @@ conf->bsic = 0; /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ - l1l->fbsb_conf_sent = 1; + trxcon->l1l->fbsb_conf_sent = 1; - l1ctl_link_send(l1l, msg); + l1ctl_link_send(trxcon->l1l, msg); } -static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_fbsb_req(struct trxcon_inst *trxcon, struct msgb *msg) { enum gsm_phys_chan_config ch_config; struct l1ctl_fbsb_req *fbsb; @@ -344,38 +345,38 @@ band_arfcn &~ ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ - sched_trx_reset(l1l->trx, true); + sched_trx_reset(trxcon->trx, true); /* Configure a single timeslot */ - sched_trx_configure_ts(l1l->trx, 0, ch_config); + sched_trx_configure_ts(trxcon->trx, 0, ch_config); /* Ask SCH handler to send L1CTL_FBSB_CONF */ - l1l->fbsb_conf_sent = 0; + trxcon->l1l->fbsb_conf_sent = 0; /* Only if current ARFCN differs */ - if (l1l->trx->band_arfcn != band_arfcn) { + if (trxcon->trx->band_arfcn != band_arfcn) { /* Update current ARFCN */ - l1l->trx->band_arfcn = band_arfcn; + trxcon->trx->band_arfcn = band_arfcn; /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(l1l->trx, band_arfcn); - trx_if_cmd_txtune(l1l->trx, band_arfcn); + trx_if_cmd_rxtune(trxcon->trx, band_arfcn); + trx_if_cmd_txtune(trxcon->trx, band_arfcn); } - trx_if_cmd_poweron(l1l->trx); + trx_if_cmd_poweron(trxcon->trx); /* Start FBSB expire timer */ - l1l->fbsb_timer.data = l1l; - l1l->fbsb_timer.cb = fbsb_timer_cb; - osmo_timer_schedule(&l1l->fbsb_timer, 0, - timeout * FRAME_DURATION_uS); + trxcon->l1l->fbsb_timer.data = trxcon; + trxcon->l1l->fbsb_timer.cb = fbsb_timer_cb; + osmo_timer_schedule(&trxcon->l1l->fbsb_timer, + 0, timeout * FRAME_DURATION_uS); exit: msgb_free(msg); return rc; } -static int l1ctl_rx_pm_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_pm_req(struct trxcon_inst *trxcon, struct msgb *msg) { uint16_t band_arfcn_start, band_arfcn_stop; struct l1ctl_pm_req *pmr; @@ -399,14 +400,15 @@ band_arfcn_stop &~ ARFCN_FLAG_MASK); /* Send measurement request to transceiver */ - rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop); + rc = trx_if_cmd_measure(trxcon->trx, + band_arfcn_start, band_arfcn_stop); exit: msgb_free(msg); return rc; } -static int l1ctl_rx_reset_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_reset_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_reset *res; int rc = 0; @@ -425,12 +427,12 @@ switch (res->type) { case L1CTL_RES_T_FULL: /* TODO: implement trx_if_reset() */ - trx_if_cmd_poweroff(l1l->trx); - trx_if_cmd_echo(l1l->trx); + trx_if_cmd_poweroff(trxcon->trx); + trx_if_cmd_echo(trxcon->trx); /* Fall through */ case L1CTL_RES_T_SCHED: - sched_trx_reset(l1l->trx, true); + sched_trx_reset(trxcon->trx, true); break; default: LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n"); @@ -438,14 +440,14 @@ } /* Confirm */ - rc = l1ctl_tx_reset_conf(l1l, res->type); + rc = l1ctl_tx_reset_conf(trxcon->l1l, res->type); exit: msgb_free(msg); return rc; } -static int l1ctl_rx_echo_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_echo_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_hdr *l1h; @@ -457,10 +459,10 @@ l1h->msg_type = L1CTL_ECHO_CONF; msg->data = msg->l1h; - return l1ctl_link_send(l1l, msg); + return l1ctl_link_send(trxcon->l1l, msg); } -static int l1ctl_rx_ccch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_ccch_mode_req(struct trxcon_inst *trxcon, struct msgb *msg) { enum gsm_phys_chan_config ch_config; struct l1ctl_ccch_mode_req *req; @@ -479,7 +481,7 @@ req->ccch_mode); /* TODO: add value-string for ccch_mode */ /* Make sure that TS0 is allocated and configured */ - ts = l1l->trx->ts_list[0]; + ts = trxcon->trx->ts_list[0]; if (ts == NULL || ts->mf_layout == NULL) { LOGP(DL1C, LOGL_ERROR, "TS0 is not configured"); rc = -EINVAL; @@ -491,18 +493,18 @@ /* Do nothing if the current mode matches required */ if (ts->mf_layout->chan_config != ch_config) - rc = sched_trx_configure_ts(l1l->trx, 0, ch_config); + rc = sched_trx_configure_ts(trxcon->trx, 0, ch_config); /* Confirm reconfiguration */ if (!rc) - rc = l1ctl_tx_ccch_mode_conf(l1l, req->ccch_mode); + rc = l1ctl_tx_ccch_mode_conf(trxcon->l1l, req->ccch_mode); exit: msgb_free(msg); return rc; } -static int l1ctl_rx_rach_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_rach_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_rach_req *req; struct l1ctl_info_ul *ul; @@ -529,7 +531,7 @@ "(offset=%u ra=0x%02x)\n", req->offset, req->ra); /* Init a new primitive */ - rc = sched_prim_init(l1l->trx, &prim, len, chan_nr, link_id); + rc = sched_prim_init(trxcon->trx, &prim, len, chan_nr, link_id); if (rc) goto exit; @@ -539,7 +541,7 @@ * FIXME: what if requested TS is not configured? * Or what if one (such as TCH) has no TRXC_RACH slots? */ - rc = sched_prim_push(l1l->trx, prim, chan_nr); + rc = sched_prim_push(trxcon->trx, prim, chan_nr); if (rc) { talloc_free(prim); goto exit; @@ -553,7 +555,7 @@ return rc; } -static int l1ctl_proc_est_req_h0(struct trx_instance *trx, struct l1ctl_h0 *h) +static int l1ctl_proc_est_req_h0(struct trxcon_inst *trxcon, struct l1ctl_h0 *h) { uint16_t band_arfcn; int rc = 0; @@ -564,22 +566,22 @@ "ARFCN=%u channel\n", band_arfcn &~ ARFCN_FLAG_MASK); /* Do we need to retune? */ - if (trx->band_arfcn == band_arfcn) + if (trxcon->trx->band_arfcn == band_arfcn) return 0; /* Tune transceiver to required ARFCN */ - rc |= trx_if_cmd_rxtune(trx, band_arfcn); - rc |= trx_if_cmd_txtune(trx, band_arfcn); + rc |= trx_if_cmd_rxtune(trxcon->trx, band_arfcn); + rc |= trx_if_cmd_txtune(trxcon->trx, band_arfcn); if (rc) return rc; /* Update current ARFCN */ - trx->band_arfcn = band_arfcn; + trxcon->trx->band_arfcn = band_arfcn; return 0; } -static int l1ctl_proc_est_req_h1(struct trx_instance *trx, struct l1ctl_h1 *h) +static int l1ctl_proc_est_req_h1(struct trxcon_inst *trxcon, struct l1ctl_h1 *h) { int rc; @@ -594,7 +596,7 @@ } /* Forward hopping parameters to TRX */ - rc = trx_if_cmd_setfh(trx, h->hsn, h->maio, h->ma, h->n); + rc = trx_if_cmd_setfh(trxcon->trx, h->hsn, h->maio, h->ma, h->n); if (rc) return rc; @@ -605,7 +607,7 @@ return 0; } -static int l1ctl_rx_dm_est_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_dm_est_req(struct trxcon_inst *trxcon, struct msgb *msg) { enum gsm_phys_chan_config config; struct l1ctl_dm_est_req *est_req; @@ -626,14 +628,14 @@ /* Frequency hopping? */ if (est_req->h) - rc = l1ctl_proc_est_req_h1(l1l->trx, &est_req->h1); + rc = l1ctl_proc_est_req_h1(trxcon, &est_req->h1); else /* Single ARFCN */ - rc = l1ctl_proc_est_req_h0(l1l->trx, &est_req->h0); + rc = l1ctl_proc_est_req_h0(trxcon, &est_req->h0); if (rc) goto exit; /* Update TSC (Training Sequence Code) */ - l1l->trx->tsc = est_req->tsc; + trxcon->trx->tsc = est_req->tsc; /* Determine channel config */ config = sched_trx_chan_nr2pchan_config(chan_nr); @@ -644,8 +646,8 @@ } /* Configure requested TS */ - rc = sched_trx_configure_ts(l1l->trx, tn, config); - ts = l1l->trx->ts_list[tn]; + rc = sched_trx_configure_ts(trxcon->trx, tn, config); + ts = trxcon->trx->ts_list[tn]; if (rc) { rc = -EINVAL; goto exit; @@ -667,13 +669,13 @@ return rc; } -static int l1ctl_rx_dm_rel_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_dm_rel_req(struct trxcon_inst *trxcon, struct msgb *msg) { LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ, " "switching back to CCCH\n"); /* Reset scheduler */ - sched_trx_reset(l1l->trx, false); + sched_trx_reset(trxcon->trx, false); msgb_free(msg); return 0; @@ -682,7 +684,7 @@ /** * Handles both L1CTL_DATA_REQ and L1CTL_TRAFFIC_REQ. */ -static int l1ctl_rx_dt_req(struct l1ctl_link *l1l, +static int l1ctl_rx_dt_req(struct trxcon_inst *trxcon, struct msgb *msg, bool traffic) { struct l1ctl_info_ul *ul; @@ -707,13 +709,13 @@ chan_nr, link_id, payload_len); /* Init a new primitive */ - rc = sched_prim_init(l1l->trx, &prim, payload_len, + rc = sched_prim_init(trxcon->trx, &prim, payload_len, chan_nr, link_id); if (rc) goto exit; /* Push this primitive to transmit queue */ - rc = sched_prim_push(l1l->trx, prim, chan_nr); + rc = sched_prim_push(trxcon->trx, prim, chan_nr); if (rc) { talloc_free(prim); goto exit; @@ -727,7 +729,7 @@ return rc; } -static int l1ctl_rx_param_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_param_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_par_req *par_req; struct l1ctl_info_ul *ul; @@ -739,18 +741,18 @@ "(ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); /* Instruct TRX to use new TA value */ - if (l1l->trx->ta != par_req->ta) { - trx_if_cmd_setta(l1l->trx, par_req->ta); - l1l->trx->ta = par_req->ta; + if (trxcon->trx->ta != par_req->ta) { + trx_if_cmd_setta(trxcon->trx, par_req->ta); + trxcon->trx->ta = par_req->ta; } - l1l->trx->tx_power = par_req->tx_power; + trxcon->trx->tx_power = par_req->tx_power; msgb_free(msg); return 0; } -static int l1ctl_rx_tch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_tch_mode_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_tch_mode_req *req; struct trx_lchan_state *lchan; @@ -765,7 +767,7 @@ /* Iterate over timeslot list */ for (i = 0; i < TRX_TS_COUNT; i++) { /* Timeslot is not allocated */ - ts = l1l->trx->ts_list[i]; + ts = trxcon->trx->ts_list[i]; if (ts == NULL) continue; @@ -790,7 +792,7 @@ return 0; } -static int l1ctl_rx_crypto_req(struct l1ctl_link *l1l, struct msgb *msg) +static int l1ctl_rx_crypto_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_crypto_req *req; struct l1ctl_info_ul *ul; @@ -808,7 +810,7 @@ tn = ul->chan_nr & 0x7; /* Make sure that required TS is allocated and configured */ - ts = l1l->trx->ts_list[tn]; + ts = trxcon->trx->ts_list[tn]; if (ts == NULL || ts->mf_layout == NULL) { LOGP(DL1C, LOGL_ERROR, "TS %u is not configured\n", tn); rc = -EINVAL; @@ -828,7 +830,7 @@ return rc; } -int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg) +int l1ctl_rx_cb(struct trxcon_inst *trxcon, struct msgb *msg) { struct l1ctl_hdr *l1h; @@ -837,31 +839,31 @@ switch (l1h->msg_type) { case L1CTL_FBSB_REQ: - return l1ctl_rx_fbsb_req(l1l, msg); + return l1ctl_rx_fbsb_req(trxcon, msg); case L1CTL_PM_REQ: - return l1ctl_rx_pm_req(l1l, msg); + return l1ctl_rx_pm_req(trxcon, msg); case L1CTL_RESET_REQ: - return l1ctl_rx_reset_req(l1l, msg); + return l1ctl_rx_reset_req(trxcon, msg); case L1CTL_ECHO_REQ: - return l1ctl_rx_echo_req(l1l, msg); + return l1ctl_rx_echo_req(trxcon, msg); case L1CTL_CCCH_MODE_REQ: - return l1ctl_rx_ccch_mode_req(l1l, msg); + return l1ctl_rx_ccch_mode_req(trxcon, msg); case L1CTL_RACH_REQ: - return l1ctl_rx_rach_req(l1l, msg); + return l1ctl_rx_rach_req(trxcon, msg); case L1CTL_DM_EST_REQ: - return l1ctl_rx_dm_est_req(l1l, msg); + return l1ctl_rx_dm_est_req(trxcon, msg); case L1CTL_DM_REL_REQ: - return l1ctl_rx_dm_rel_req(l1l, msg); + return l1ctl_rx_dm_rel_req(trxcon, msg); case L1CTL_DATA_REQ: - return l1ctl_rx_dt_req(l1l, msg, false); + return l1ctl_rx_dt_req(trxcon, msg, false); case L1CTL_TRAFFIC_REQ: - return l1ctl_rx_dt_req(l1l, msg, true); + return l1ctl_rx_dt_req(trxcon, msg, true); case L1CTL_PARAM_REQ: - return l1ctl_rx_param_req(l1l, msg); + return l1ctl_rx_param_req(trxcon, msg); case L1CTL_TCH_MODE_REQ: - return l1ctl_rx_tch_mode_req(l1l, msg); + return l1ctl_rx_tch_mode_req(trxcon, msg); case L1CTL_CRYPTO_REQ: - return l1ctl_rx_crypto_req(l1l, msg); + return l1ctl_rx_crypto_req(trxcon, msg); /* Not (yet) handled messages */ case L1CTL_NEIGH_PM_REQ: diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/l1ctl.h index ca8c0be..76b49e3 100644 --- a/src/host/trxcon/l1ctl.h +++ b/src/host/trxcon/l1ctl.h @@ -3,11 +3,12 @@ #include #include +#include "trxcon.h" #include "l1ctl_link.h" #include "l1ctl_proto.h" /* Event handlers */ -int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg); +int l1ctl_rx_cb(struct trxcon_inst *trxcon, struct msgb *msg); void l1ctl_shutdown_cb(struct l1ctl_link *l1l); int l1ctl_tx_fbsb_conf(struct l1ctl_link *l1l, uint8_t result, diff --git a/src/host/trxcon/trxcon_fsm.c b/src/host/trxcon/trxcon_fsm.c index f90f88b..4e9473d 100644 --- a/src/host/trxcon/trxcon_fsm.c +++ b/src/host/trxcon/trxcon_fsm.c @@ -58,7 +58,7 @@ break; case TRXCON_EV_L1CTL_REQ: OSMO_ASSERT(data != NULL); - l1ctl_rx_cb(trxcon->l1l, (struct msgb *) data); + l1ctl_rx_cb(trxcon, (struct msgb *) data); break; default: LOGPFSML(fi, LOGL_ERROR, "Unhandled event '%s'\n", -- To view, visit https://gerrit.osmocom.org/12612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e59f547a165b30aa9538ae8f9d6bd822067315b Gerrit-Change-Number: 12612 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:08 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12590 to look at the new patch set (#3). Change subject: trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance ...................................................................... trxcon/trxcon.h: do not expose pointer to trxcon_fsm instance Change-Id: I37812573a33e090e6edb45713d3132cb43bd4ffb --- M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/12590/3 -- To view, visit https://gerrit.osmocom.org/12590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I37812573a33e090e6edb45713d3132cb43bd4ffb Gerrit-Change-Number: 12590 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:12 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: use TRXCON_EV_L1CTL_REQ event Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12611 Change subject: trxcon/l1ctl_link.c: use TRXCON_EV_L1CTL_REQ event ...................................................................... trxcon/l1ctl_link.c: use TRXCON_EV_L1CTL_REQ event Change-Id: I9ad19c158397f73ab1b6639a34ce20fc7a7431b3 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/trxcon_fsm.c 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/12611/1 diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 5a22c7e..aea23bd 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -113,8 +113,13 @@ LOGP(DL1D, LOGL_DEBUG, "RX: '%s'\n", osmo_hexdump(msg->data, msg->len)); - /* Call L1CTL handler */ - l1ctl_rx_cb(l1l, msg); + /* Pass a message to the parent FSM */ + rc = osmo_fsm_inst_dispatch(l1l->fsm->proc.parent, + TRXCON_EV_L1CTL_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } return 0; } diff --git a/src/host/trxcon/trxcon_fsm.c b/src/host/trxcon/trxcon_fsm.c index 69a2da1..f90f88b 100644 --- a/src/host/trxcon/trxcon_fsm.c +++ b/src/host/trxcon/trxcon_fsm.c @@ -27,6 +27,7 @@ #include #include +#include static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -44,6 +45,8 @@ static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct trxcon_inst *trxcon = (struct trxcon_inst *) fi->priv; + switch ((enum trxcon_event_type) event) { case TRXCON_EV_L1CTL_DISCONNECT: /* TODO: reset TRX interface */ @@ -53,6 +56,10 @@ /* TODO: notify L1CTL interface */ osmo_fsm_inst_state_chg(fi, TRXCON_ST_IDLE, 0, 0); break; + case TRXCON_EV_L1CTL_REQ: + OSMO_ASSERT(data != NULL); + l1ctl_rx_cb(trxcon->l1l, (struct msgb *) data); + break; default: LOGPFSML(fi, LOGL_ERROR, "Unhandled event '%s'\n", osmo_fsm_event_name(&trxcon_fsm_def, event)); -- To view, visit https://gerrit.osmocom.org/12611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad19c158397f73ab1b6639a34ce20fc7a7431b3 Gerrit-Change-Number: 12611 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:08 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.c: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12584 to look at the new patch set (#3). Change subject: trxcon/trxcon.c: do not expose tall_trx_ctx ...................................................................... trxcon/trxcon.c: do not expose tall_trx_ctx Both l1ctl_link_init() and trx_if_open() do accept 'tall_ctx' now, so there is no need to expose the root context anymore. For logging initialization, we can just pass a pointer. Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 --- M src/host/trxcon/logging.c M src/host/trxcon/logging.h M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 4 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/12584/3 -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:12 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.h: introduce and use struct 'trxcon_inst' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12610 Change subject: trxcon/trxcon.h: introduce and use struct 'trxcon_inst' ...................................................................... trxcon/trxcon.h: introduce and use struct 'trxcon_inst' Change-Id: Id868dac54693be9a67527dba06a2b80c0ecb7bd4 --- M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 2 files changed, 48 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/12610/1 diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 6b4c989..ab29412 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -63,11 +63,9 @@ int quit; /* L1CTL specific */ - struct l1ctl_link *l1l; const char *bind_socket; /* TRX specific */ - struct trx_instance *trx; const char *trx_bind_ip; const char *trx_remote_ip; uint16_t trx_base_port; @@ -184,7 +182,7 @@ int main(int argc, char **argv) { - struct osmo_fsm_inst *trxcon_fsm; + struct trxcon_inst *trxcon = NULL; int rc = 0; printf("%s", COPYRIGHT); @@ -207,31 +205,41 @@ /* Init logging system */ trx_log_init(tall_trxcon_ctx, app_data.debug_mask); - /* Allocate a trxcon state machine */ - trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, - tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); - if (trxcon_fsm == NULL) + /* Allocate a single trxcon instance */ + trxcon = talloc_zero(tall_trxcon_ctx, struct trxcon_inst); + if (trxcon == NULL) { + LOGP(DAPP, LOGL_ERROR, "Failed to allocate a trxcon instance\n"); goto exit; + } + + /* Allocate an associated trxcon state machine */ + trxcon->fi = osmo_fsm_inst_alloc(&trxcon_fsm_def, + tall_trxcon_ctx, trxcon, LOGL_DEBUG, "main"); + if (trxcon->fi == NULL) { + LOGP(DAPP, LOGL_ERROR, "Failed to allocate trxcon FSM\n"); + goto exit; + } /* Init L1CTL server */ - app_data.l1l = l1ctl_link_init(trxcon_fsm, + trxcon->l1l = l1ctl_link_init(trxcon->fi, app_data.bind_socket); - if (app_data.l1l == NULL) + if (trxcon->l1l == NULL) goto exit; /* Init transceiver interface */ - app_data.trx = trx_if_open(trxcon_fsm, + trxcon->trx = trx_if_open(trxcon->fi, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); - if (!app_data.trx) + if (trxcon->trx == NULL) goto exit; - /* Bind L1CTL with TRX and vice versa */ - app_data.l1l->trx = app_data.trx; - app_data.trx->l1l = app_data.l1l; + /* Bind L1CTL with TRX and vice versa + * TODO: get rid of this, they should be abstracted */ + trxcon->l1l->trx = trxcon->trx; + trxcon->trx->l1l = trxcon->l1l; /* Init scheduler */ - rc = sched_trx_init(app_data.trx, app_data.trx_fn_advance); + rc = sched_trx_init(trxcon->trx, app_data.trx_fn_advance); if (rc) goto exit; @@ -252,14 +260,21 @@ osmo_select_main(0); exit: - /* Close active connections */ - l1ctl_link_shutdown(app_data.l1l); - sched_trx_shutdown(app_data.trx); - trx_if_close(app_data.trx); + if (trxcon != NULL) { + /* Shutdown scheduler */ + sched_trx_shutdown(trxcon->trx); - /* Shutdown main state machine */ - if (trxcon_fsm != NULL) - osmo_fsm_inst_free(trxcon_fsm); + /* Close active connections */ + l1ctl_link_shutdown(trxcon->l1l); + trx_if_close(trxcon->trx); + + /* Shutdown main state machine */ + if (trxcon->fi != NULL) + osmo_fsm_inst_free(trxcon->fi); + + /* Release trxcon instance */ + talloc_free(trxcon); + } /* Deinitialize logging */ log_fini(); diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index 2259931..fa48d0b 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -32,3 +32,14 @@ TRXCON_EV_SCHED_DL_TF_IND, /*!< DL Traffic Frame INDication */ TRXCON_EV_SCHED_UL_TF_CONF, /*!< UL Traffic Frame CONFirmation */ }; + +/* Represents a single L1CTL <-> TRX connection */ +struct trxcon_inst { + /* Associated instance of trxcon_fsm */ + struct osmo_fsm_inst *fi; + + /* Connection with transceiver */ + struct trx_instance *trx; + /* L1CTL server */ + struct l1ctl_link *l1l; +}; -- To view, visit https://gerrit.osmocom.org/12610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id868dac54693be9a67527dba06a2b80c0ecb7bd4 Gerrit-Change-Number: 12610 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:15 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:15 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.h: get rid of pointer to a trx_instance Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12614 Change subject: trxcon/l1ctl_link.h: get rid of pointer to a trx_instance ...................................................................... trxcon/l1ctl_link.h: get rid of pointer to a trx_instance Change-Id: Ie154a9d25dd0e8828fa2c278c98f9d8ba8c037e3 --- M src/host/trxcon/l1ctl_link.h M src/host/trxcon/trxcon.c 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/12614/1 diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/l1ctl_link.h index ceeaa30..bf482b6 100644 --- a/src/host/trxcon/l1ctl_link.h +++ b/src/host/trxcon/l1ctl_link.h @@ -30,9 +30,6 @@ struct osmo_fd listen_bfd; struct osmo_wqueue wq; - /* Bind TRX instance */ - struct trx_instance *trx; - /* L1CTL handlers specific */ struct osmo_timer_list fbsb_timer; uint8_t fbsb_conf_sent; diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index ab29412..11668a9 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -235,7 +235,6 @@ /* Bind L1CTL with TRX and vice versa * TODO: get rid of this, they should be abstracted */ - trxcon->l1l->trx = trxcon->trx; trxcon->trx->l1l = trxcon->l1l; /* Init scheduler */ -- To view, visit https://gerrit.osmocom.org/12614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie154a9d25dd0e8828fa2c278c98f9d8ba8c037e3 Gerrit-Change-Number: 12614 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:40:14 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:40:14 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: accept band_arfcn as a parameter Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12613 Change subject: trxcon/l1ctl.c: accept band_arfcn as a parameter ...................................................................... trxcon/l1ctl.c: accept band_arfcn as a parameter Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/l1ctl.h M src/host/trxcon/sched_lchan_rach.c 3 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/12613/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 8f0be48..40c5171 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -222,7 +222,8 @@ return l1ctl_link_send(l1l, msg); } -int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn) +int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, + uint16_t band_arfcn, uint32_t fn) { struct l1ctl_info_dl *dl; struct msgb *msg; @@ -236,7 +237,7 @@ dl = (struct l1ctl_info_dl *) msgb_put(msg, len); memset(dl, 0x00, len); - dl->band_arfcn = htons(l1l->trx->band_arfcn); + dl->band_arfcn = htons(band_arfcn); dl->frame_nr = htonl(fn); return l1ctl_link_send(l1l, msg); diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/l1ctl.h index 76b49e3..ebf9b2d 100644 --- a/src/host/trxcon/l1ctl.h +++ b/src/host/trxcon/l1ctl.h @@ -23,4 +23,5 @@ uint8_t *l2, size_t l2_len, bool traffic); int l1ctl_tx_dt_conf(struct l1ctl_link *l1l, struct l1ctl_info_dl *data, bool traffic); -int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn); +int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, + uint16_t band_arfcn, uint32_t fn); diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index ecf5df8..ee5faa0 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -113,7 +113,7 @@ } /* Confirm RACH request */ - l1ctl_tx_rach_conf(trx->l1l, fn); + l1ctl_tx_rach_conf(trx->l1l, trx->band_arfcn, fn); /* Forget processed primitive */ sched_prim_drop(lchan); -- To view, visit https://gerrit.osmocom.org/12613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7 Gerrit-Change-Number: 12613 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:41:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 12:41:38 +0000 Subject: Change in osmo-msc[master]: Log transaction allocation errors as such Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12615 Change subject: Log transaction allocation errors as such ...................................................................... Log transaction allocation errors as such While at it, use proper subsystem to log missing VLR subscriber. Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 --- M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12615/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 7172184..0119e7b 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1931,7 +1931,7 @@ /* Create transaction */ trans = trans_alloc(net, vsub, GSM48_PDISC_CC, 0xff, data->callref); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); vlr_subscr_put(vsub); /* Ressource unavailable */ mncc_release_ind(net, NULL, data->callref, @@ -2129,7 +2129,7 @@ GSM48_PDISC_CC, transaction_id, new_callref++); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); rc = gsm48_tx_simple(conn, GSM48_PDISC_CC | (transaction_id << 4), GSM48_MT_CC_RELEASE_COMPL); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 12bec9d..608d4ff 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -101,7 +101,7 @@ trans = trans_alloc(conn->network, conn->vsub, GSM48_PDISC_NC_SS, tid, new_callref++); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); gsm48_tx_simple(conn, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); @@ -298,7 +298,7 @@ trans = trans_alloc(net, vsub, GSM48_PDISC_NC_SS, 0xff, gsup_msg->session_id); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); return NULL; } diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index df770ed..17f8e96 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -109,7 +109,7 @@ /* a valid subscriber is indispensable */ if (vsub == NULL) { - LOGP(DCC, LOGL_NOTICE, + LOGP(DVLR, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:46:39 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:46:39 +0000 Subject: Change in osmo-msc[master]: Log transaction allocation errors as such In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Log transaction allocation errors as such ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Fine, excluding changing the logging category. Otherwise I would CR+2. https://gerrit.osmocom.org/#/c/12615/1/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12615/1/src/libmsc/transaction.c at 112 PS1, Line 112: DVLR Why changing this? And why DVLR? Rather do this in a separate change please. -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 17 Jan 2019 12:46:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:36 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:36 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.c: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12584 ) Change subject: trxcon/trxcon.c: do not expose tall_trx_ctx ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 12:48:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:44 +0000 Subject: Change in osmocom-bb[master]: trxcon: register both l1ctl_fsm and trx_fsm on DSO load In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12586 ) Change subject: trxcon: register both l1ctl_fsm and trx_fsm on DSO load ...................................................................... trxcon: register both l1ctl_fsm and trx_fsm on DSO load Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/trx_if.c 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 20cb70c..23019fd 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -269,7 +269,6 @@ l1l_new->wq.bfd.fd = -1; /* Allocate a new dedicated state machine */ - osmo_fsm_register(&l1ctl_fsm); l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new, NULL, LOGL_DEBUG, "l1ctl_link"); @@ -308,3 +307,8 @@ osmo_fsm_inst_free(l1l->fsm); talloc_free(l1l); } + +static __attribute__((constructor)) void on_dso_load(void) +{ + OSMO_ASSERT(osmo_fsm_register(&l1ctl_fsm) == 0); +} diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 982fb40..91b87a2 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -660,7 +660,6 @@ goto error; /* Allocate a new dedicated state machine */ - osmo_fsm_register(&trx_fsm); trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new, NULL, LOGL_DEBUG, "trx_interface"); @@ -710,3 +709,8 @@ osmo_fsm_inst_free(trx->fsm); talloc_free(trx); } + +static __attribute__((constructor)) void on_dso_load(void) +{ + OSMO_ASSERT(osmo_fsm_register(&trx_fsm) == 0); +} -- To view, visit https://gerrit.osmocom.org/12586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 Gerrit-Change-Number: 12586 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:45 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12587 ) Change subject: trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed ...................................................................... trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 --- M src/host/trxcon/l1ctl_link.c 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 23019fd..1350c3c 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -243,6 +243,16 @@ return -ENOMEM; } + /* Allocate a new dedicated state machine */ + l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new, + NULL, LOGL_DEBUG, "l1ctl_link"); + if (l1l_new->fsm == NULL) { + LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " + "of FSM '%s'\n", l1ctl_fsm.name); + talloc_free(l1l_new); + return -ENOMEM; + } + /* Create a socket and bind handlers */ bfd = &l1l_new->listen_bfd; rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path, @@ -250,6 +260,7 @@ if (rc < 0) { LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n", strerror(errno)); + osmo_fsm_inst_free(l1l_new->fsm); talloc_free(l1l_new); return rc; } @@ -268,10 +279,6 @@ */ l1l_new->wq.bfd.fd = -1; - /* Allocate a new dedicated state machine */ - l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new, - NULL, LOGL_DEBUG, "l1ctl_link"); - *l1l = l1l_new; return 0; -- To view, visit https://gerrit.osmocom.org/12587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 Gerrit-Change-Number: 12587 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:45 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: check if trx_fsm allocation failed In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12588 ) Change subject: trxcon/trx_if.c: check if trx_fsm allocation failed ...................................................................... trxcon/trx_if.c: check if trx_fsm allocation failed Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a --- M src/host/trxcon/trx_if.c 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 91b87a2..bff73cc 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -645,6 +645,16 @@ return -ENOMEM; } + /* Allocate a new dedicated state machine */ + trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new, + NULL, LOGL_DEBUG, "trx_interface"); + if (trx_new->fsm == NULL) { + LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " + "of FSM '%s'\n", trx_fsm.name); + talloc_free(trx_new); + return -ENOMEM; + } + /* Initialize CTRL queue */ INIT_LLIST_HEAD(&trx_new->trx_ctrl_list); @@ -659,16 +669,13 @@ if (rc < 0) goto error; - /* Allocate a new dedicated state machine */ - trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new, - NULL, LOGL_DEBUG, "trx_interface"); - *trx = trx_new; return 0; error: LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); + osmo_fsm_inst_free(trx_new->fsm); talloc_free(trx_new); return rc; } -- To view, visit https://gerrit.osmocom.org/12588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I31c9f2a651182b258d0a4d4504365b778529715a Gerrit-Change-Number: 12588 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:46 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:46 +0000 Subject: Change in osmocom-bb[master]: trxcon: do not include trxcon.h everywhere In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12581 ) Change subject: trxcon: do not include trxcon.h everywhere ...................................................................... trxcon: do not include trxcon.h everywhere Change-Id: Ia78bd6dac7ab12970838e0b1a2929a106b898d9d --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_lchan_rach.c M src/host/trxcon/sched_lchan_sch.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_lchan_xcch.c 9 files changed, 0 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index a2ced46..0b6d75a 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -38,7 +38,6 @@ #include #include -#include "trxcon.h" #include "logging.h" #include "l1ctl_link.h" #include "l1ctl_proto.h" diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index d4054c9..66477b2 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -41,7 +41,6 @@ #include "scheduler.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 540a57f..921c466 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -42,7 +42,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */ diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c index 1a8987b..aa9cb6a 100644 --- a/src/host/trxcon/sched_lchan_pdtch.c +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index a255efb..ecf5df8 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" /** diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c index 1b241a0..e1977e1 100644 --- a/src/host/trxcon/sched_lchan_sch.c +++ b/src/host/trxcon/sched_lchan_sch.c @@ -40,7 +40,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info) diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index 09d504f..5bebe49 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -40,7 +40,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c index 7fb2809..5b7daa3 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -43,7 +43,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" static const uint8_t tch_h0_traffic_block_map[3][4] = { diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index b31f727..825fc58 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -38,7 +38,6 @@ #include "sched_trx.h" #include "logging.h" #include "trx_if.h" -#include "trxcon.h" #include "l1ctl.h" int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, -- To view, visit https://gerrit.osmocom.org/12581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia78bd6dac7ab12970838e0b1a2929a106b898d9d Gerrit-Change-Number: 12581 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:46 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:46 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if: refactor trx_if_open() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12582 ) Change subject: trxcon/trx_if: refactor trx_if_open() ...................................................................... trxcon/trx_if: refactor trx_if_open() The main changes are: - return pointer to the allocated trx_instance or NULL, - extend debug message with TRX address and base port, - accept the talloc context as 'tall_ctx' argument, - rename goto label 'error' to 'udp_error', - rename argument 'port' to 'base_port'. Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h M src/host/trxcon/trxcon.c 3 files changed, 32 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index bff73cc..4c10da6 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -626,58 +626,55 @@ return 0; } -/* - * Open/close OsmoTRX connection - */ - -int trx_if_open(struct trx_instance **trx, const char *local_host, - const char *remote_host, uint16_t port) +/* Init TRX interface (TRXC, TRXD sockets and FSM) */ +struct trx_instance *trx_if_open(void *tall_ctx, + const char *local_host, const char *remote_host, + uint16_t base_port) { - struct trx_instance *trx_new; + struct trx_instance *trx; int rc; - LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface\n"); + LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface " + "(%s:%u)\n", remote_host, base_port); /* Try to allocate memory */ - trx_new = talloc_zero(tall_trx_ctx, struct trx_instance); - if (!trx_new) { + trx = talloc_zero(tall_ctx, struct trx_instance); + if (!trx) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate memory\n"); - return -ENOMEM; + return NULL; } /* Allocate a new dedicated state machine */ - trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new, + trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, NULL, LOGL_DEBUG, "trx_interface"); - if (trx_new->fsm == NULL) { + if (trx->fsm == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); - talloc_free(trx_new); - return -ENOMEM; + talloc_free(trx); + return NULL; } /* Initialize CTRL queue */ - INIT_LLIST_HEAD(&trx_new->trx_ctrl_list); + INIT_LLIST_HEAD(&trx->trx_ctrl_list); /* Open sockets */ - rc = trx_udp_open(trx_new, &trx_new->trx_ofd_ctrl, local_host, - port + 101, remote_host, port + 1, trx_ctrl_read_cb); + rc = trx_udp_open(trx, &trx->trx_ofd_ctrl, local_host, + base_port + 101, remote_host, base_port + 1, trx_ctrl_read_cb); if (rc < 0) - goto error; + goto udp_error; - rc = trx_udp_open(trx_new, &trx_new->trx_ofd_data, local_host, - port + 102, remote_host, port + 2, trx_data_rx_cb); + rc = trx_udp_open(trx, &trx->trx_ofd_data, local_host, + base_port + 102, remote_host, base_port + 2, trx_data_rx_cb); if (rc < 0) - goto error; + goto udp_error; - *trx = trx_new; + return trx; - return 0; - -error: +udp_error: LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); - osmo_fsm_inst_free(trx_new->fsm); - talloc_free(trx_new); - return rc; + osmo_fsm_inst_free(trx->fsm); + talloc_free(trx); + return NULL; } /* Flush pending control messages */ diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index d551252..0b3f36f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -52,8 +52,8 @@ int cmd_len; }; -int trx_if_open(struct trx_instance **trx, const char *local_host, - const char *remote_host, uint16_t port); +struct trx_instance *trx_if_open(void *tall_ctx, + const char *local_host, const char *remote_host, uint16_t port); void trx_if_flush_ctrl(struct trx_instance *trx); void trx_if_close(struct trx_instance *trx); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 874f893..501d0c7 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -284,9 +284,10 @@ goto exit; /* Init transceiver interface */ - rc = trx_if_open(&app_data.trx, - app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); - if (rc) + app_data.trx = trx_if_open(tall_trx_ctx, + app_data.trx_bind_ip, app_data.trx_remote_ip, + app_data.trx_base_port); + if (!app_data.trx) goto exit; /* Bind L1CTL with TRX and vice versa */ -- To view, visit https://gerrit.osmocom.org/12582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39b24afee2f09d6a6c500cfc26ac45f206589c5c Gerrit-Change-Number: 12582 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl_link.c: refactor l1ctl_link_init() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12583 ) Change subject: trxcon/l1ctl_link.c: refactor l1ctl_link_init() ...................................................................... trxcon/l1ctl_link.c: refactor l1ctl_link_init() The main changes are: - return pointer to the allocated l1ctl_link or NULL, - accept the talloc context as 'tall_ctx' argument. Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b --- M src/host/trxcon/l1ctl_link.c M src/host/trxcon/l1ctl_link.h M src/host/trxcon/trxcon.c 3 files changed, 20 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 1350c3c..b7ea262 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -229,59 +229,57 @@ return 0; } -int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path) +struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path) { - struct l1ctl_link *l1l_new; + struct l1ctl_link *l1l; struct osmo_fd *bfd; int rc; LOGP(DL1C, LOGL_NOTICE, "Init L1CTL link (%s)\n", sock_path); - l1l_new = talloc_zero(tall_trx_ctx, struct l1ctl_link); - if (!l1l_new) { + l1l = talloc_zero(tall_ctx, struct l1ctl_link); + if (!l1l) { LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory\n"); - return -ENOMEM; + return NULL; } /* Allocate a new dedicated state machine */ - l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new, + l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l, NULL, LOGL_DEBUG, "l1ctl_link"); - if (l1l_new->fsm == NULL) { + if (l1l->fsm == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", l1ctl_fsm.name); - talloc_free(l1l_new); - return -ENOMEM; + talloc_free(l1l); + return NULL; } /* Create a socket and bind handlers */ - bfd = &l1l_new->listen_bfd; + bfd = &l1l->listen_bfd; rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n", strerror(errno)); - osmo_fsm_inst_free(l1l_new->fsm); - talloc_free(l1l_new); - return rc; + osmo_fsm_inst_free(l1l->fsm); + talloc_free(l1l); + return NULL; } /* Bind shutdown handler */ - l1l_new->shutdown_cb = l1ctl_shutdown_cb; + l1l->shutdown_cb = l1ctl_shutdown_cb; /* Bind connection handler */ bfd->cb = l1ctl_link_accept; bfd->when = BSC_FD_READ; - bfd->data = l1l_new; + bfd->data = l1l; /** * To be able to accept first connection and * drop others, it should be set to -1 */ - l1l_new->wq.bfd.fd = -1; + l1l->wq.bfd.fd = -1; - *l1l = l1l_new; - - return 0; + return l1l; } void l1ctl_link_shutdown(struct l1ctl_link *l1l) diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/l1ctl_link.h index 01103dc..da64419 100644 --- a/src/host/trxcon/l1ctl_link.h +++ b/src/host/trxcon/l1ctl_link.h @@ -41,7 +41,7 @@ void (*shutdown_cb)(struct l1ctl_link *l1l); }; -int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path); +struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path); void l1ctl_link_shutdown(struct l1ctl_link *l1l); int l1ctl_link_send(struct l1ctl_link *l1l, struct msgb *msg); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 501d0c7..777138f 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -279,8 +279,8 @@ NULL, LOGL_DEBUG, "main"); /* Init L1CTL server */ - rc = l1ctl_link_init(&app_data.l1l, app_data.bind_socket); - if (rc) + app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket); + if (app_data.l1l == NULL) goto exit; /* Init transceiver interface */ -- To view, visit https://gerrit.osmocom.org/12583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b Gerrit-Change-Number: 12583 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:48:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 12:48:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/trxcon.c: do not expose tall_trx_ctx In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12584 ) Change subject: trxcon/trxcon.c: do not expose tall_trx_ctx ...................................................................... trxcon/trxcon.c: do not expose tall_trx_ctx Both l1ctl_link_init() and trx_if_open() do accept 'tall_ctx' now, so there is no need to expose the root context anymore. For logging initialization, we can just pass a pointer. Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 --- M src/host/trxcon/logging.c M src/host/trxcon/logging.h M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 4 files changed, 14 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c index 6a3043b..78915f2 100644 --- a/src/host/trxcon/logging.c +++ b/src/host/trxcon/logging.c @@ -26,7 +26,6 @@ #include #include "logging.h" -#include "trxcon.h" static struct log_info_cat trx_log_info_cat[] = { [DAPP] = { @@ -78,9 +77,9 @@ .num_cat = ARRAY_SIZE(trx_log_info_cat), }; -int trx_log_init(const char *category_mask) +int trx_log_init(void *tall_ctx, const char *category_mask) { - osmo_init_logging2(tall_trx_ctx, &trx_log_info); + osmo_init_logging2(tall_ctx, &trx_log_info); if (category_mask) log_parse_category_mask(osmo_stderr_target, category_mask); diff --git a/src/host/trxcon/logging.h b/src/host/trxcon/logging.h index 0206362..152c346 100644 --- a/src/host/trxcon/logging.h +++ b/src/host/trxcon/logging.h @@ -14,4 +14,4 @@ DSCHD, }; -int trx_log_init(const char *category_mask); +int trx_log_init(void *tall_ctx, const char *category_mask); diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 777138f..8e371df 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -74,7 +74,7 @@ uint32_t trx_fn_advance; } app_data; -void *tall_trx_ctx = NULL; +static void *tall_trxcon_ctx = NULL; struct osmo_fsm_inst *trxcon_fsm; static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, @@ -242,7 +242,7 @@ case SIGABRT: case SIGUSR1: case SIGUSR2: - talloc_report_full(tall_trx_ctx, stderr); + talloc_report_full(tall_trxcon_ctx, stderr); break; default: break; @@ -261,8 +261,8 @@ talloc_enable_null_tracking(); /* Init talloc memory management system */ - tall_trx_ctx = talloc_init("trxcon context"); - msgb_talloc_ctx_init(tall_trx_ctx, 0); + tall_trxcon_ctx = talloc_init("trxcon context"); + msgb_talloc_ctx_init(tall_trxcon_ctx, 0); /* Setup signal handlers */ signal(SIGINT, &signal_handler); @@ -271,20 +271,21 @@ osmo_init_ignore_signals(); /* Init logging system */ - trx_log_init(app_data.debug_mask); + trx_log_init(tall_trxcon_ctx, app_data.debug_mask); /* Allocate the application state machine */ osmo_fsm_register(&trxcon_fsm_def); - trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trx_ctx, + trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); /* Init L1CTL server */ - app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket); + app_data.l1l = l1ctl_link_init(tall_trxcon_ctx, + app_data.bind_socket); if (app_data.l1l == NULL) goto exit; /* Init transceiver interface */ - app_data.trx = trx_if_open(tall_trx_ctx, + app_data.trx = trx_if_open(tall_trxcon_ctx, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); if (!app_data.trx) @@ -331,8 +332,8 @@ * Print report for the root talloc context in order * to be able to find and fix potential memory leaks. */ - talloc_report_full(tall_trx_ctx, stderr); - talloc_free(tall_trx_ctx); + talloc_report_full(tall_trxcon_ctx, stderr); + talloc_free(tall_trxcon_ctx); /* Make both Valgrind and ASAN happy */ talloc_report_full(NULL, stderr); diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index 65b5e85..f66a628 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -3,7 +3,6 @@ #define GEN_MASK(state) (0x01 << state) extern struct osmo_fsm_inst *trxcon_fsm; -extern void *tall_trx_ctx; enum trxcon_fsm_states { TRXCON_STATE_IDLE = 0, -- To view, visit https://gerrit.osmocom.org/12584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 Gerrit-Change-Number: 12584 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 12:59:53 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 Jan 2019 12:59:53 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12616 Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Update libosmocore to work with newer oc2g osmo-bts The version of osmo-bts that has oc2g support needs a newer libosmocore, otherwise it fails trying to use OSMO_SOCK_F_UDP_REUSEADDR. Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Related: SYS#4444 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/16/12616/1 diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 09ac239..6d00c0d 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f36e0abb9796530a80937057eed2985f652d37f2" +SRCREV = "b8a91625dd974f596214646da345d9d649f4dae3" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "0.12.1+gitr${SRCPV}" PR = "r0" -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 13:01:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 13:01:00 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12608 ) Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 13:01:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 13:01:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 13:01:24 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix memleak triggered by unsupported messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12604 ) Change subject: trxcon/l1ctl.c: fix memleak triggered by unsupported messages ...................................................................... trxcon/l1ctl.c: fix memleak triggered by unsupported messages Change-Id: I6e636afec8e45d7dc786f5f159cd5d7784d9a83b --- M src/host/trxcon/l1ctl.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 0b6d75a..2f1d720 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -871,6 +871,7 @@ case L1CTL_SIM_REQ: LOGP(DL1C, LOGL_NOTICE, "Ignoring unsupported message " "(type=%u)\n", l1h->msg_type); + msgb_free(msg); return -ENOTSUP; default: LOGP(DL1C, LOGL_ERROR, "Unknown MSG type %u: %s\n", l1h->msg_type, -- To view, visit https://gerrit.osmocom.org/12604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e636afec8e45d7dc786f5f159cd5d7784d9a83b Gerrit-Change-Number: 12604 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 13:03:46 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 13:03:46 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12608 ) Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12608/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/12608/2/src/libmsc/a_iface_bssap.c at 593 PS2, Line 593: Ignoring Ignoring, but not doing return? Is it intended? -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 13:03:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 13:59:05 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 13:59:05 +0000 Subject: Change in osmo-msc[master]: Don't send Alert Notifications to ESME not bound for RX In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12599 ) Change subject: Don't send Alert Notifications to ESME not bound for RX ...................................................................... Patch Set 2: > Why is that? In short, I guess I was thinking to work around what looks like a big failure in the python-smpplib; in that it is expecting the response to the _last_ message _it_ sent in the _next_ received PDU, whereas, with many LURs/sec going on, it often gets an alert_notification. :( This can even happen on the bind_transmitter command So I figured, bind it as a transmitter and we won't get "unsolicited" PDUs But you are right, I misinterpreted the spec: "An ESME indicates its desire not to receive (mobile) originated messages from other SME?s (e.g. mobile stations) by binding as a Transmitter." it says MO messages, says nothing about alert notifications. Hmm.. I know we really don't want to work around other software's bugs, but given the lack of SMPP libraries out there, I wonder if this could become an obscure smpp config option useful to anybody. "no tx-to-transmitter" or some such. I'm guessing we /really/ don't want to go down that road. :) So.. the other patch that allows to exclude an ESME will help in binding an ESME in tranceiver mode for SMS but I guess python-smpplib HAS to be fixed, otherwise you cannot ever get away from this transaction possibility: ESME -> bind_transmitter - > SMSC SMSC -> alert_notification - > ESME ESME "huh I was expecting bind_transmitter_resp?" -- To view, visit https://gerrit.osmocom.org/12599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec92d4c145ca050c2e212139572eeaae581b99df Gerrit-Change-Number: 12599 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 13:59:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 14:03:27 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 14:03:27 +0000 Subject: Change in osmo-msc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12597 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Make alert notifications vty configurable per ESME Adds (no) alert-notifications as a per-esme vty command, in order to allow some ESMEs to be excluded from alerts. The default is still to send alert notifications to all esme, so no changes are required to the config file to maintain identical operation after this patch. Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 --- M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_vty.c 4 files changed, 35 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 10f3cfa..fb9b0f8 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -283,8 +283,13 @@ llist_for_each_entry(esme, &smsc->esme_list, list) { /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery - * pending flag to be set before, FIXME: make this VTY - * configurable */ + * pending flag to be set before. */ + if (!esme->acl->alert_notifications) { + LOGP(DSMPP, LOGL_DEBUG, + "[%s] is not set to receive Alert Notifications\n", + esme->system_id); + continue; + } if (esme->acl && esme->acl->deliver_src_imsi) { smpp_tx_alert(esme, TON_Subscriber_Number, NPI_Land_Mobile_E212, diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index ea5303c..2350d84 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -148,6 +148,7 @@ acl->smsc = smsc; strcpy(acl->system_id, sys_id); + acl->alert_notifications = 1; INIT_LLIST_HEAD(&acl->route_list); llist_add_tail(&acl->list, &smsc->acl_list); diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 27a2646..dc7b7c1 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -68,6 +68,7 @@ int deliver_src_imsi; int osmocom_ext; int dcs_transparent; + int alert_notifications; struct llist_head route_list; }; diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index be55c4d..5896707 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -499,6 +499,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_esme_alert_notif, cfg_esme_alert_notif_cmd, + "alert-notifications", + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_esme_no_alert_notif, cfg_esme_no_alert_notif_cmd, + "no alert-notifications", NO_STR + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 0; + + return CMD_SUCCESS; +} + static void dump_one_esme(struct vty *vty, struct osmo_esme *esme) { @@ -560,6 +582,8 @@ vty_out(vty, " osmocom-extensions%s", VTY_NEWLINE); if (acl->dcs_transparent) vty_out(vty, " dcs-transparent%s", VTY_NEWLINE); + if (acl->alert_notifications) + vty_out(vty, " alert-notifications%s", VTY_NEWLINE); llist_for_each_entry(r, &acl->route_list, list) write_esme_route_single(vty, r); @@ -603,6 +627,8 @@ install_element(SMPP_ESME_NODE, &cfg_esme_no_osmo_ext_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_dcs_transp_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_no_dcs_transp_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_alert_notif_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_no_alert_notif_cmd); install_element_ve(&show_esme_cmd); -- To view, visit https://gerrit.osmocom.org/12597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I57f4d268ca6fe6a233f2caaffce62e4aade01274 Gerrit-Change-Number: 12597 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 17 14:22:38 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 17 Jan 2019 14:22:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#818?= In-Reply-To: <1698983028.610.1547718119928.JavaMail.jenkins@jenkins.osmocom.org> References: <1698983028.610.1547718119928.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1820311010.611.1547734958139.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 17 14:36:40 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 14:36:40 +0000 Subject: Change in osmo-msc[master]: Log transaction allocation errors as such In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Log transaction allocation errors as such ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12615/1/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12615/1/src/libmsc/transaction.c at 112 PS1, Line 112: DVLR > Why changing this? Because absence of VLR subscriber is error. > And why DVLR? Because absence of VLR subscriber is error related to VLR, not Call Control. > Rather do this in a separate change I'd rather not: it's completely pointless to split every single line into separate commit. Especially when the changes are directly related as is in this case. -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 14:36:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 14:40:32 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 14:40:32 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12571 to look at the new patch set (#2). Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... VLR: use msgb_eq_data_print() for comparison This simplifies tests refactoring by showing exact byte where mismatch happened. It also makes code more readable. Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/12571/2 -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 14:48:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 14:48:04 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 9 PS1, Line 9: This simplifies tests refactoring by showing exact byte where mismatch > that's technically not allowed Ok, a little clarification: it is technically allowed. We probably shouldn't do multiline logging in regular programs/libraries for aesthetic reasons but it's perfectly fine in unit-tests - there're no technical reasons to avoid it. Especially in this case where log output will be seen only if test fails. https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 10 PS1, Line 10: happened. It also makes code more readable. > That's a personal preference at best. Yes? You can see the person's name in "Author" header of the commit log. Having said that, do you really find multi-line if() clause more readable? -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 14:48:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:02:56 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 15:02:56 +0000 Subject: Change in osmo-msc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12600 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Cosmetic: Fix spelling in smpp vty Change-Id: Id3fa3f26c333bf445590fd75ad7a08be68fed3e2 --- M src/libmsc/smpp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index 5896707..4c179d4 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -164,7 +164,7 @@ DEFUN(cfg_smpp_policy, cfg_smpp_policy_cmd, "policy (accept-all|closed)", "Set the authentication policy of this SMSC\n" - "Accept all SMPP connections independeint of system ID / passwd\n" + "Accept all SMPP connections independent of system ID / password\n" "Accept only SMPP connections from ESMEs explicitly configured") { struct smsc *smsc = smsc_from_vty(vty); @@ -541,7 +541,7 @@ DEFUN(show_esme, show_esme_cmd, "show smpp esme", - SHOW_STR "SMPP Interface\n" "SMPP Extrenal SMS Entity\n") + SHOW_STR "SMPP Interface\n" "SMPP External SMS Entity\n") { struct smsc *smsc = smsc_from_vty(vty); struct osmo_esme *esme; -- To view, visit https://gerrit.osmocom.org/12600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id3fa3f26c333bf445590fd75ad7a08be68fed3e2 Gerrit-Change-Number: 12600 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:03:47 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 15:03:47 +0000 Subject: Change in openbsc[master]: Make alert notifications vty configurable per ESME In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12601 ) Change subject: Make alert notifications vty configurable per ESME ...................................................................... Make alert notifications vty configurable per ESME OSMO-MSC backport Adds (no) alert-notifications as a per-esme vty command, in order to allow some ESMEs to be excluded from alerts. The default is still to send alert notifications to all esme, so no changes are required to the config file to maintain identical operation after this patch. Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 --- M openbsc/src/libmsc/smpp_openbsc.c M openbsc/src/libmsc/smpp_smsc.c M openbsc/src/libmsc/smpp_smsc.h M openbsc/src/libmsc/smpp_vty.c 4 files changed, 34 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index 3fe2dfd..f463e1c 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -278,8 +278,12 @@ llist_for_each_entry(esme, &smsc->esme_list, list) { /* we currently send an alert notification to each ESME that is * connected, and do not require a (non-existant) delivery - * pending flag to be set before, FIXME: make this VTY - * configurable */ + * pending flag to be set before. */ + if (!esme->acl->alert_notifications) { + LOGP(DSMPP, LOGL_DEBUG, + "[%s] is not set to receive Alert Notifications\n", esme->system_id); + continue; + } if (esme->acl && esme->acl->deliver_src_imsi) { smpp_tx_alert(esme, TON_Subscriber_Number, NPI_Land_Mobile_E212, diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index e4acd3a..35097b4 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -148,6 +148,7 @@ acl->smsc = smsc; strcpy(acl->system_id, sys_id); + acl->alert_notifications = 1; INIT_LLIST_HEAD(&acl->route_list); llist_add_tail(&acl->list, &smsc->acl_list); diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index 257383f..2398201 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -68,6 +68,7 @@ int deliver_src_imsi; int osmocom_ext; int dcs_transparent; + int alert_notifications; struct llist_head route_list; }; diff --git a/openbsc/src/libmsc/smpp_vty.c b/openbsc/src/libmsc/smpp_vty.c index 0a84358..ff0314e 100644 --- a/openbsc/src/libmsc/smpp_vty.c +++ b/openbsc/src/libmsc/smpp_vty.c @@ -499,6 +499,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_esme_alert_notif, cfg_esme_alert_notif_cmd, + "alert-notifications", + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_esme_no_alert_notif, cfg_esme_no_alert_notif_cmd, + "no alert-notifications", NO_STR + "Disable sending of SMPP Alert Notifications for this ESME") +{ + struct osmo_smpp_acl *acl = vty->index; + + acl->alert_notifications = 0; + + return CMD_SUCCESS; +} + static void dump_one_esme(struct vty *vty, struct osmo_esme *esme) { @@ -560,6 +582,8 @@ vty_out(vty, " osmocom-extensions%s", VTY_NEWLINE); if (acl->dcs_transparent) vty_out(vty, " dcs-transparent%s", VTY_NEWLINE); + if (acl->alert_notifications) + vty_out(vty, " alert-notifications%s", VTY_NEWLINE); llist_for_each_entry(r, &acl->route_list, list) write_esme_route_single(vty, r); @@ -603,6 +627,8 @@ install_element(SMPP_ESME_NODE, &cfg_esme_no_osmo_ext_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_dcs_transp_cmd); install_element(SMPP_ESME_NODE, &cfg_esme_no_dcs_transp_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_alert_notif_cmd); + install_element(SMPP_ESME_NODE, &cfg_esme_no_alert_notif_cmd); install_element_ve(&show_esme_cmd); -- To view, visit https://gerrit.osmocom.org/12601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2b52f2778b24eebc82b2e5e2fb3c2250b1f9e5b0 Gerrit-Change-Number: 12601 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:17:48 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:17:48 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12608 ) Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 15:17:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:29:51 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 17 Jan 2019 15:29:51 +0000 Subject: Change in openbsc[master]: Cosmetic: Fix spelling in smpp vty In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12603 ) Change subject: Cosmetic: Fix spelling in smpp vty ...................................................................... Cosmetic: Fix spelling in smpp vty Change-Id: If2180828e2acd28d96754c593c317c2868644c4b --- M openbsc/src/libmsc/smpp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmsc/smpp_vty.c b/openbsc/src/libmsc/smpp_vty.c index ff0314e..f1df652 100644 --- a/openbsc/src/libmsc/smpp_vty.c +++ b/openbsc/src/libmsc/smpp_vty.c @@ -164,7 +164,7 @@ DEFUN(cfg_smpp_policy, cfg_smpp_policy_cmd, "policy (accept-all|closed)", "Set the authentication policy of this SMSC\n" - "Accept all SMPP connections independeint of system ID / passwd\n" + "Accept all SMPP connections independent of system ID / password\n" "Accept only SMPP connections from ESMEs explicitly configured") { struct smsc *smsc = smsc_from_vty(vty); @@ -541,7 +541,7 @@ DEFUN(show_esme, show_esme_cmd, "show smpp esme", - SHOW_STR "SMPP Interface\n" "SMPP Extrenal SMS Entity\n") + SHOW_STR "SMPP Interface\n" "SMPP External SMS Entity\n") { struct smsc *smsc = smsc_from_vty(vty); struct osmo_esme *esme; -- To view, visit https://gerrit.osmocom.org/12603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If2180828e2acd28d96754c593c317c2868644c4b Gerrit-Change-Number: 12603 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:30:08 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... Patch Set 3: Code-Review-1 (2 comments) It seems like this doesn't really fix an issue - it rather works around it by disabling some code. https://gerrit.osmocom.org/#/c/12401/3/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12401/3/src/osmo-bsc/assignment_fsm.c at 345 PS3, Line 345: ------- This looks like something which should belong to issue tracker. Put it into https://osmocom.org/issues/3735 instead? https://gerrit.osmocom.org/#/c/12401/3/src/osmo-bsc/assignment_fsm.c at 369 PS3, Line 369: Test scenario: This looks like it belong to TTCN3 instead. I think we should first make TTCN3 test covering call-in-call scenario and than make any significant changes to this. -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 15:30:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:30:42 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:30:42 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory.h: fix enum def within function signature In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12591 ) Change subject: ranap_msg_factory.h: fix enum def within function signature ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 Gerrit-Change-Number: 12591 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 15:30:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:32:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:32:17 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12616 ) Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 15:32:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:50:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:50:36 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12485 to look at the new patch set (#2). Change subject: LCLS: constify helper parameters ...................................................................... LCLS: constify helper parameters Related: OS#2487 Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/osmo_bsc_lcls.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/12485/2 -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 15:58:22 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 15:58:22 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12483 ) Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... Patch Set 4: (2 comments) This change is ready for review. https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c at 522 PS2, Line 522: /*! Create BSSMAP Assignment Completed message as per 3GPP TS 48.008 ?3.2.1.2 > (end with dot) Done https://gerrit.osmocom.org/#/c/12483/2/src/gsm/gsm0808.c at 537 PS2, Line 537: enum gsm0808_lcls_status lcls_bss_status) > looks like wrong indent on gerrit Looks fine in Emacs. -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 Jan 2019 15:58:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:08:28 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 Jan 2019 16:08:28 +0000 Subject: Change in osmo-bts[master]: Rename oc2g config file to match new naming scheme Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12617 Change subject: Rename oc2g config file to match new naming scheme ...................................................................... Rename oc2g config file to match new naming scheme examples/oc2g/osmo-bts.cfg->examples/oc2g/osmo-bts-oc2g.cfg Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Related: SYS#4444 --- M contrib/systemd/osmo-bts-oc2g.service R doc/examples/oc2g/osmo-bts-oc2g.cfg 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/12617/1 diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index 2f2d837..7b0168a 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -5,7 +5,7 @@ Type=simple ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' -ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts-oc2g.cfg -M ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' Restart=always diff --git a/doc/examples/oc2g/osmo-bts.cfg b/doc/examples/oc2g/osmo-bts-oc2g.cfg similarity index 100% rename from doc/examples/oc2g/osmo-bts.cfg rename to doc/examples/oc2g/osmo-bts-oc2g.cfg -- To view, visit https://gerrit.osmocom.org/12617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Gerrit-Change-Number: 12617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:08:29 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 Jan 2019 16:08:29 +0000 Subject: Change in osmo-bts[master]: dump_docs: Use new config file naming scheme Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12618 Change subject: dump_docs: Use new config file naming scheme ...................................................................... dump_docs: Use new config file naming scheme Change-Id: I05723ef50deb918ed1131c1d30f8e613351b3be5 --- M contrib/dump_docs.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/12618/1 diff --git a/contrib/dump_docs.py b/contrib/dump_docs.py index 59f2a61..bdf27c4 100755 --- a/contrib/dump_docs.py +++ b/contrib/dump_docs.py @@ -10,7 +10,7 @@ env['L1FWD_BTS_HOST'] = '127.0.0.1' bts_proc = subprocess.Popen(["./src/osmo-bts-sysmo/sysmobts-remote", - "-c", "./doc/examples/sysmo/osmo-bts.cfg"], env = env, + "-c", "./doc/examples/sysmo/osmo-bts-sysmo.cfg"], env = env, stdin=None, stdout=None) time.sleep(1) -- To view, visit https://gerrit.osmocom.org/12618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I05723ef50deb918ed1131c1d30f8e613351b3be5 Gerrit-Change-Number: 12618 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:14:36 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 Jan 2019 16:14:36 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12485 ) Change subject: LCLS: constify helper parameters ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 17 Jan 2019 16:14:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:29:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 16:29:20 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12485 ) Change subject: LCLS: constify helper parameters ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12485/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/12485/1/src/osmo-bsc/osmo_bsc_lcls.c at 278 PS1, Line 278: static void lcls_break_local_switching(struct gsm_subscriber_connection *conn) > the function changes the switching of the conn, right? Isn't it confusing to say const then? Done -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 17 Jan 2019 16:29:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:33:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 17 Jan 2019 16:33:34 +0000 Subject: Change in osmo-bts[master]: Rename oc2g config file to match new naming scheme In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12617 ) Change subject: Rename oc2g config file to match new naming scheme ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Gerrit-Change-Number: 12617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 16:33:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:37:17 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 Jan 2019 16:37:17 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 30: > Also I think we don't have any TTCN3 test that verifies the periodic LU for 2G. If we do not have that yet we should implement it. The difficulty there is that we would, in TTCN3, actually have to *wait* for the entire periodic LU timeout (15 minutes?) -- unless we reconfigure that to something like 10 seconds if possible. IIRC the msc_vlr_tests in osmo-msc wait for this period using fake time, no real time wait required. -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 16:37:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:46:11 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 16:46:11 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12554 to look at the new patch set (#3). Change subject: socket: add define for socket name length ...................................................................... socket: add define for socket name length The function osmo_sock_get_name_buf() can be used to write a string representation to a user provided memory. Unfortunately the proper length for the user provided memory is not obvious. To make using osmo_sock_get_name_buf() more practical, add a define constant that defines the length of the required memory. Also use this define in socket.c. Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12554/3 -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:47:05 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 16:47:05 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12554 ) Change subject: socket: add define for socket name length ...................................................................... Patch Set 2: (1 comment) > Build Started https://jenkins.osmocom.org/jenkins/job/gerrit-libosmocore/1454/ https://gerrit.osmocom.org/#/c/12554/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12554/2/src/socket.c at 786 PS2, Line 786: /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ > It might make sense to move the comment as well: the format is explained in doxygen already. [?] Done -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 17 Jan 2019 16:47:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 16:55:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 16:55:28 +0000 Subject: Change in osmo-ci[master]: nightly packages: Build libosmo-dsp Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12619 Change subject: nightly packages: Build libosmo-dsp ...................................................................... nightly packages: Build libosmo-dsp Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/12619/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 1c98029..55c744c 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -183,6 +183,7 @@ checkout rtl-sdr checkout osmo-fl2k checkout simtrace2 + checkout libosmo-dsp create_osmo_trx_debian8_jessie @@ -213,6 +214,7 @@ build rtl-sdr build osmo-fl2k build simtrace2 + build libosmo-dsp download_bumpversion -- To view, visit https://gerrit.osmocom.org/12619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab Gerrit-Change-Number: 12619 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:07:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 17:07:34 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12554 ) Change subject: socket: add define for socket name length ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 17 Jan 2019 17:07:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:09:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 17:09:10 +0000 Subject: Change in libosmocore[master]: Add function to combine nibbles into byte In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12573 ) Change subject: Add function to combine nibbles into byte ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I380687c31a787c0a109819f7c3b2946eae52675e Gerrit-Change-Number: 12573 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:17:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 17:17:31 +0000 Subject: Change in osmo-ci[master]: nightly packages: Build libosmo-dsp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12619 ) Change subject: nightly packages: Build libosmo-dsp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab Gerrit-Change-Number: 12619 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 17:17:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:17:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 17:17:32 +0000 Subject: Change in osmo-ci[master]: nightly packages: Build libosmo-dsp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12619 ) Change subject: nightly packages: Build libosmo-dsp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab Gerrit-Change-Number: 12619 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 17 Jan 2019 17:17:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:17:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 Jan 2019 17:17:33 +0000 Subject: Change in osmo-ci[master]: nightly packages: Build libosmo-dsp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12619 ) Change subject: nightly packages: Build libosmo-dsp ...................................................................... nightly packages: Build libosmo-dsp Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 1c98029..55c744c 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -183,6 +183,7 @@ checkout rtl-sdr checkout osmo-fl2k checkout simtrace2 + checkout libosmo-dsp create_osmo_trx_debian8_jessie @@ -213,6 +214,7 @@ build rtl-sdr build osmo-fl2k build simtrace2 + build libosmo-dsp download_bumpversion -- To view, visit https://gerrit.osmocom.org/12619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I989c7961336b4dacbc83e97d1c098f93f56ef6ab Gerrit-Change-Number: 12619 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:26:15 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:26:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: BSC_Tests: Add tests to check channel allocator Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12620 Change subject: WIP: BSC_Tests: Add tests to check channel allocator ...................................................................... WIP: BSC_Tests: Add tests to check channel allocator When a channel is assigned via the assignment request throught the A interface, the MSC may offer either FR, HR or both. When FR and HR are permitted, a preference is set on one of the two. At the moment we do not check how the bsc is reacting to those preferences and its also not checked how the behavior is when the preferred rate is not available because all lchan of that type are already in use. Lets add a set of tests to verify this. Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Related: OS#3503 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 304 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/12620/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 77da306..1467063 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2053,6 +2053,289 @@ vc_conn.done; } +private function f_shun_all_tch_f() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 shun"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 shun"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 shun"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 shun"); +} + +private function f_shun_all_tch_h() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 shun"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 shun"); +} + +private function f_allow_all_tch() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 allow"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 allow"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 allow"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 allow"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 allow"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 allow"); +} + +/* Allow HR only */ +private function f_TC_assignment_codec_xr_exhausted_req_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '09'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR only */ +private function f_TC_assignment_codec_xr_exhausted_req_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '08'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow HR only (expect assignment failure) */ +private function f_TC_assignment_codec_xr_exhausted_req_hr_fail(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '09'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); + f_establish_fully(ass_cmd, exp_fail); +} + +/* Allow FR only (expect assignment failure) */ +private function f_TC_assignment_codec_xr_exhausted_req_fr_fail(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '08'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + f_establish_fully(ass_cmd, exp_fail); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_fr_exhausted_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_fr_exhausted_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_hr_exhausted_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_hr_exhausted_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Request a HR channel while all FR channels are exhausted, this is expected + * to work without conflicts */ +testcase TC_assignment_codec_fr_exhausted_req_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a FR channel while all FR channels are exhausted, this is expected + * to fail. */ +testcase TC_assignment_codec_fr_exhausted_req_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr_fail)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel while all FR channels + * are exhausted, this is expected to be resolved by selecting a HR channel. */ +testcase TC_assignment_codec_fr_exhausted_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_fr_hr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a HR (prefered) or alternatively a FR channel while all FR channels + * are exhausted, this is expected to work without conflicts. */ +testcase TC_assignment_codec_fr_exhausted_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_hr_fr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a FR channel while all HR channels are exhausted, this is expected + * to work without conflicts */ +testcase TC_assignment_codec_hr_exhausted_req_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a HR channel while all HR channels are exhausted, this is expected + * to fail. */ +testcase TC_assignment_codec_hr_exhausted_req_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr_fail)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a HR (prefered) or alternatively a FR channel while all HR channels + * are exhausted, this is expected to be resolved by selecting a FR channel. */ +testcase TC_assignment_codec_hr_exhausted_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_hr_fr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel while all HR channels + * are exhausted, this is expected to work without conflicts. */ +testcase TC_assignment_codec_hr_exhausted_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + f_shun_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_fr_hr)); + vc_conn.done; + f_allow_all_tch(); + setverdict(pass); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Request a HR (prefered) or alternatively a FR channel, it is expected that + * HR, which is the prefered type, is selected. */ +testcase TC_assignment_codec_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_hr_fr)); + vc_conn.done; + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel, it is expected that + * FR, which is the prefered type, is selected. */ +testcase TC_assignment_codec_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_allow_all_tch(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_fr_hr)); + vc_conn.done; + setverdict(pass); +} + /* test the procedure of the MSC requesting a Classmark Update: * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ @@ -3444,6 +3727,17 @@ execute( TC_assignment_codec_amr_f() ); execute( TC_assignment_codec_amr_h() ); + execute( TC_assignment_codec_fr_exhausted_req_hr() ); + execute( TC_assignment_codec_fr_exhausted_req_fr() ); + execute( TC_assignment_codec_fr_exhausted_req_fr_hr() ); + execute( TC_assignment_codec_fr_exhausted_req_hr_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_hr() ); + execute( TC_assignment_codec_hr_exhausted_req_hr_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_fr_hr() ); + execute( TC_assignment_codec_req_hr_fr() ); + execute( TC_assignment_codec_req_fr_hr() ); + /* RLL Establish Indication on inactive DCHAN / SAPI */ execute( TC_rll_est_ind_inact_lchan() ); execute( TC_rll_est_ind_inval_sapi1() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index fd26922..67fdeed 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -35,6 +35,16 @@ + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:28:57 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:28:57 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: remove references to lchan_alloc() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12621 Change subject: chan_alloc: remove references to lchan_alloc() ...................................................................... chan_alloc: remove references to lchan_alloc() The function lchan_alloc() does not exist anymore, however there is still a prototype definition in chan_alloc.h and a comment in abis_rsl.c. Lets remove those. Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 --- M include/osmocom/bsc/chan_alloc.h M src/osmo-bsc/abis_rsl.c 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/12621/1 diff --git a/include/osmocom/bsc/chan_alloc.h b/include/osmocom/bsc/chan_alloc.h index 97f6cb2..b509e3e 100644 --- a/include/osmocom/bsc/chan_alloc.h +++ b/include/osmocom/bsc/chan_alloc.h @@ -24,9 +24,6 @@ struct gsm_subscriber_connection; -/* Allocate a logical channel (SDCCH, TCH, ...) */ -struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, int allow_bigger); - /* Free a logical channel (SDCCH, TCH, ...) */ void lchan_free(struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 8ffb07e..d67573f 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1378,8 +1378,6 @@ * - If SDCCH is not available, try whatever MS requested, if not SDCCH. * - If there is still no channel available, reject channel request. * - * lchan_alloc() possibly tries to allocate larger lchans. - * * Note: If the MS requests not TCH/H, we don't know if the phone * supports TCH/H, so we must assign TCH/F or SDCCH. */ -- To view, visit https://gerrit.osmocom.org/12621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 Gerrit-Change-Number: 12621 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:28:57 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:28:57 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12622 Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... lchan_select: dont allow half rate EFR to be selected The function lchan_select_by_chan_mode() is prone to select an half rate lchan when EFR is used, even though EFR is not defined for half-rate. Lets protect against that. Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Related: OS#3503 --- M src/osmo-bsc/lchan_select.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/12622/1 diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index f70ad4a..0e22448 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -136,8 +136,11 @@ case GSM48_CMODE_SIGN: type = GSM_LCHAN_SDCCH; break; - case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: + /* There is no full-rate EFR specified! */ + if (!full_rate) + return NULL; + case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_AMR: type = full_rate ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H; break; -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:28:57 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:28:57 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Do not unsolicitedly select a TCH/F Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12623 Change subject: lchan_select: Do not unsolicitedly select a TCH/F ...................................................................... lchan_select: Do not unsolicitedly select a TCH/F The function lchan_select_by_type() will unsolicitedly select a TCH/F when it is asked for a TCH/H but a TCH/H is not available. This behavior is presumably a leftover from before the split. Now every fallback to another rate must be agreed with the MSC in advance, it is a spec violation to silently fallback to TCH/F when asked for a TCH/H. Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Related: OS#3503 --- M src/osmo-bsc/lchan_select.c 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/12623/1 diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 0e22448..eac0adf 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -206,12 +206,6 @@ break; case GSM_LCHAN_TCH_H: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); - /* If we don't have TCH/H available, fall-back to TCH/F */ - if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F); - if (lchan) - type = GSM_LCHAN_TCH_F; - } /* No dedicated TCH/x available -- try fully dynamic * TCH/F_TCH/H_PDCH */ if (!lchan) { @@ -221,17 +215,6 @@ if (lchan) type = GSM_LCHAN_TCH_H; } - /* - * No need to check TCH/F_TCH/H_PDCH channels for TCH/F: - * if no TCH/H was available, neither will be TCH/F. - */ - /* If we don't have TCH/F either, try dynamic TCH/F_PDCH */ - if (!lchan) { - lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, - GSM_PCHAN_TCH_F); - if (lchan) - type = GSM_LCHAN_TCH_F; - } break; default: LOGP(DRLL, LOGL_ERROR, "Unknown gsm_chan_t %u\n", type); -- To view, visit https://gerrit.osmocom.org/12623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Gerrit-Change-Number: 12623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:28:58 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to shun specific lchans Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12624 Change subject: bsc_vty: add features to shun specific lchans ...................................................................... bsc_vty: add features to shun specific lchans In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us to mark certain lchans as shunned and check that condition while doing the channel allocation Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 4 files changed, 72 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 9f7ce8d..22d80df 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -613,6 +613,10 @@ struct gsm48_req_ref *rqd_ref; struct gsm_subscriber_connection *conn; + + /* Debug feature: When set to true via VTY, the channel allocator will + * not use this lchan. */ + bool shun; }; /* One Timeslot in a TRX */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 791aebe..ed93dcb 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1372,10 +1372,11 @@ lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); vty_out_dyn_ts_details(vty, lchan->ts); - vty_out(vty, " Connection: %u, State: %s%s%s%s", + vty_out(vty, " Connection: %u, State: %s%s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? " Error reason: " : "", lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? lchan->last_error : "", + lchan->shun ? " (shunned)" : "", VTY_NEWLINE); vty_out(vty, " BS Power: %u dBm, MS Power: %u dBm%s", lchan->ts->trx->nominal_power - lchan->ts->trx->max_power_red @@ -1430,22 +1431,24 @@ gsm_pchan_name(lchan->ts->pchan_on_init)); vty_out_dyn_ts_status(vty, lchan->ts); vty_out(vty, ", Lchan %u, Type %s, State %s - " - "L1 MS Power: %u dBm RXL-FULL-dl: %4d dBm RXL-FULL-ul: %4d dBm%s", + "L1 MS Power: %u dBm RXL-FULL-dl: %4d dBm RXL-FULL-ul: %4d dBm%s%s", lchan->nr, gsm_lchant_name(lchan->type), lchan_state_name(lchan), mr->ms_l1.pwr, rxlev2dbm(mr->dl.full.rx_lev), rxlev2dbm(mr->ul.full.rx_lev), + lchan->shun ? " (shunned)" : "", VTY_NEWLINE); } static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_lchan *lchan; ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false) continue; dump_cb(vty, lchan); } @@ -1454,33 +1457,36 @@ } static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - dump_lchan_trx_ts(ts, vty, dump_cb); + dump_lchan_trx_ts(ts, vty, dump_cb, all); } return CMD_SUCCESS; } static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); - dump_lchan_trx(trx, vty, dump_cb); + dump_lchan_trx(trx, vty, dump_cb, all); } return CMD_SUCCESS; } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_bts *bts = NULL; @@ -1500,7 +1506,7 @@ bts = gsm_bts_num(net, bts_nr); if (argc == 1) - return dump_lchan_bts(bts, vty, dump_cb); + return dump_lchan_bts(bts, vty, dump_cb, all); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1512,7 +1518,7 @@ trx = gsm_bts_trx_num(bts, trx_nr); if (argc == 2) - return dump_lchan_trx(trx, vty, dump_cb); + return dump_lchan_trx(trx, vty, dump_cb, all); } if (argc >= 3) { ts_nr = atoi(argv[2]); @@ -1524,7 +1530,7 @@ ts = &trx->ts[ts_nr]; if (argc == 3) - return dump_lchan_trx_ts(ts, vty, dump_cb); + return dump_lchan_trx_ts(ts, vty, dump_cb, all); } if (argc >= 4) { lchan_nr = atoi(argv[3]); @@ -1541,7 +1547,7 @@ for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { bts = gsm_bts_num(net, bts_nr); - dump_lchan_bts(bts, vty, dump_cb); + dump_lchan_bts(bts, vty, dump_cb, all); } return CMD_SUCCESS; @@ -1554,17 +1560,27 @@ SHOW_STR "Display information about a logical channel\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_full_vty); + return lchan_summary(vty, argc, argv, lchan_dump_full_vty, true); } DEFUN(show_lchan_summary, show_lchan_summary_cmd, "show lchan summary [<0-255>] [<0-255>] [<0-7>] [<0-7>]", SHOW_STR "Display information about a logical channel\n" - "Short summary\n" + "Short summary (in use lchans)\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_short_vty); + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, false); +} + +DEFUN(show_lchan_all, + show_lchan_all_cmd, + "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", + SHOW_STR "Display information about a logical channel\n" + "Short summary (all lchans)\n" + BTS_TRX_TS_LCHAN_STR) +{ + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, true); } static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) @@ -4774,6 +4790,34 @@ return CMD_SUCCESS; } +/* Debug command to temporarily disable certain timeslots in order to force + * the channel allocator to pick one specific or from a group of specific + * timeslots. */ +DEFUN(ts_shun, ts_shun_cmd, + "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (shun|allow)", + BTS_NR_TRX_TS_SS_STR2 + "Avoid channel allocation on timeslot (for debugging)\n" + "Allow channel allocation on timeslot (take back shunning, for debugging)\n") +{ + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan; + int ss_nr = atoi(argv[3]); + ts = vty_get_ts(vty, argv[0], argv[1], argv[2]); + if (!ts) + return CMD_WARNING; + lchan = &ts->lchan[ss_nr]; + if (!lchan) + return CMD_WARNING; + + if (!strcmp(argv[4], "shun")) + lchan->shun = true; + else + lchan->shun = false; + + return CMD_SUCCESS; +} + + DEFUN(lchan_mdcx, lchan_mdcx_cmd, "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> mdcx A.B.C.D <0-65535>", BTS_NR_TRX_TS_SS_STR2 @@ -5085,6 +5129,7 @@ install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); + install_element_ve(&show_lchan_all_cmd); install_element_ve(&show_subscr_conn_cmd); @@ -5249,6 +5294,8 @@ install_element(ENABLE_NODE, &pdch_act_cmd); install_element(ENABLE_NODE, &lchan_act_cmd); install_element(ENABLE_NODE, &lchan_mdcx_cmd); + install_element(ENABLE_NODE, &ts_shun_cmd); + install_element(ENABLE_NODE, &handover_subscr_conn_cmd); install_element(ENABLE_NODE, &assignment_subscr_conn_cmd); install_element(ENABLE_NODE, &smscb_cmd_cmd); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index f344cf9..c3b0017 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -400,6 +400,7 @@ .meas_rep_last_seen_nr = 255, .last_error = lchan->last_error, + .shun = lchan->shun, }; } diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index eac0adf..4edf748 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -80,16 +80,17 @@ /* TS is (going to be) in desired pchan mode. Go ahead and check for an available lchan. */ ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) { - if (lchan->fi->state == LCHAN_ST_UNUSED) { + if (lchan->fi->state == LCHAN_ST_UNUSED && lchan->shun == false) { LOGPLCHANALLOC("%s ss=%d is available%s\n", gsm_ts_and_pchan_name(ts), lchan->nr, ts->pchan_is != as_pchan ? " after dyn PCHAN change" : ""); return lchan; } - LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s not suitable\n", + + LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s %s\n", gsm_ts_and_pchan_name(ts), lchan->nr, gsm_lchant_name(lchan->type), - osmo_fsm_inst_state_name(lchan->fi)); + osmo_fsm_inst_state_name(lchan->fi), lchan->shun ? "shunned" : "not suitable"); } } -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 17:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 17 Jan 2019 17:28:58 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12625 Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... assignment_fsm: fix channel allocator preferences When the MSC allocates a channel through the ASSIGNMENT REQUEST, it may ask for a TCH/H and a TCH/F at the same time and tell which of the two types it prefers. The process of channel allocation currently selects, based on the BTS, MSC and MS capabilites exactly one apropriate codec/rate (e.g. TCH/H) and then trys to allocate it. If that allocation fails, there is no way to try the second choice and the assignment fails. For example: The MSC asks for TCH/F and TCH/H, prefering TCH/F, then the channel allocator will try TCH/F and if it fails (all TCH/F are currently in use), then TCH/H is never tried. Since the BSC currently only trys the first best codec/rate that is supported it also ignores the preference. Lets fix those problems by including the preference information and both possible codec/rate settings into the channel allocation decision. Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Related: OS#3503 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 8 files changed, 366 insertions(+), 136 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/12625/1 diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 51340c1..adefe04 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -9,14 +9,19 @@ struct bts_codec_conf; struct bsc_msc_data; struct gsm_bts; +struct channel_mode_and_rate; -int match_codec_pref(enum gsm48_chan_mode *chan_mode, - bool *full_rate, - uint16_t *s15_s0, +enum rate_pref { + RATE_PREF_NONE, + RATE_PREF_HR, + RATE_PREF_FR, +}; + +int match_codec_pref(struct channel_mode_and_rate *ch_mode_rate, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, - const struct gsm_bts *bts); + const struct gsm_bts *bts, enum rate_pref rate_pref); void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 22d80df..a161051 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -99,6 +99,12 @@ SUBSCR_SCCP_ST_CONNECTED }; +struct channel_mode_and_rate { + enum gsm48_chan_mode chan_mode; + bool full_rate; + uint16_t s15_s0; +}; + struct assignment_request { bool aoip; @@ -107,9 +113,12 @@ char msc_rtp_addr[INET_ADDRSTRLEN]; uint16_t msc_rtp_port; - enum gsm48_chan_mode chan_mode; - bool full_rate; - uint16_t s15_s0; + /* Prefered rate/codec setting (mandatory) */ + struct channel_mode_and_rate ch_mode_rate_pref; + + /* Alternate rate/codec setting (optional) */ + bool ch_mode_rate_alt_present; + struct channel_mode_and_rate ch_mode_rate_alt; }; struct assignment_fsm_data { @@ -282,6 +291,13 @@ /* pointer to "other" connection, if Call Leg Relocation was successful */ struct gsm_subscriber_connection *other; } lcls; + + /* Depending on the preferences that where submitted together with + * the assignment and the current channel load, the BSC has to select + * one of the offered codec/rates. The final selection by the BSC is + * stored here and is used when sending the assignment complete or + * when performing a handover procedure. */ + struct channel_mode_and_rate ch_mode_rate; }; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index d67573f..c1e6bf0 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1375,22 +1375,12 @@ /* check availability / allocate channel * * - First try to allocate SDCCH. - * - If SDCCH is not available, try whatever MS requested, if not SDCCH. - * - If there is still no channel available, reject channel request. + * - If SDCCH is not available, try to a TCH/H (less bandwith). + * - If there is still no channel available, try a TCH/F. * - * Note: If the MS requests not TCH/H, we don't know if the phone - * supports TCH/H, so we must assign TCH/F or SDCCH. */ lchan = lchan_select_by_type(bts, GSM_LCHAN_SDCCH); - if (!lchan && lctype != GSM_LCHAN_SDCCH) { - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " - "0x%x, retrying with %s\n", - msg->lchan->ts->trx->bts->nr, - gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, - gsm_lchant_name(lctype)); - lchan = lchan_select_by_type(bts, lctype); - } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, @@ -1398,7 +1388,7 @@ gsm_lchant_name(GSM_LCHAN_TCH_H)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_H); } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a24f7f9..d61b4bb 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -170,7 +170,7 @@ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc.cfg = conn->assignment.req.s15_s0; + sc.cfg = conn->ch_mode_rate.s15_s0; sc_ptr = ≻ } } @@ -252,8 +252,11 @@ } static bool lchan_type_compat_with_mode(enum gsm_chan_t type, - enum gsm48_chan_mode chan_mode, int full_rate) + struct channel_mode_and_rate *ch_mode_rate) { + enum gsm48_chan_mode chan_mode = ch_mode_rate->chan_mode; + int full_rate = ch_mode_rate->full_rate; + switch (chan_mode) { case GSM48_CMODE_SIGN: switch (type) { @@ -296,6 +299,170 @@ OSMO_ASSERT(osmo_fsm_register(&assignment_fsm) == 0); } +/* Check if the incoming assignment requests requires a voice stream or not, + * we will look at the preferred and the alternate channel mode and also make + * sure that both are consistent. */ +static int check_voice_stream_needed(struct gsm_subscriber_connection *conn, struct osmo_fsm_inst *fi) +{ + bool result_alt = false; + bool result_pref = false; + struct assignment_request *req = &conn->assignment.req; + + /* When the assignment request indicates that there is an alternate + * rate available (e.g. "Full or Half rate channel, Half rate + * preferred..."), then both must be either voice or either signalling, + * a mismatch is not permitted */ + + /* Check the prefered setting */ + switch (req->ch_mode_rate_pref.chan_mode) { + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + result_pref = true; + break; + case GSM48_CMODE_SIGN: + result_pref = false; + break; + default: + assignment_fail(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP, + "Prefered channel mode not supported: %s", + gsm48_chan_mode_name(req->ch_mode_rate_pref.chan_mode)); + return -EINVAL; + } + conn->assignment.requires_voice_stream = result_pref; + + /* If there is an alternate setting, check that one as well */ + if (!req->ch_mode_rate_alt_present) + return 0; + switch (req->ch_mode_rate_alt.chan_mode) { + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + result_alt = true; + break; + case GSM48_CMODE_SIGN: + result_alt = false; + break; + default: + assignment_fail(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP, + "Alternate channel mode not supported: %s", + gsm48_chan_mode_name(req->ch_mode_rate_alt.chan_mode)); + return -EINVAL; + } + + /* Make sure both settings match */ + if (result_pref != result_alt) { + assignment_fail(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP, + "Inconsistent channel modes: %s != %s", + gsm48_chan_mode_name(req->ch_mode_rate_pref.chan_mode), + gsm48_chan_mode_name(req->ch_mode_rate_alt.chan_mode)); + return -EINVAL; + } + + return 0; +} + +/* Check if the conn is already associated with an lchan. If yes, we will check + * if that lchan is compatible with the preferred rate/codec. If the lchan + * turns out to be incompatible we try with the alternate rate/codec. */ +static int check_for_existing_lchan(struct gsm_subscriber_connection *conn) +{ + struct assignment_request *req = &conn->assignment.req; + + if (!conn->lchan) + return 0; + + /* Check if the currently existing lchan is compatible with the + * preferred rate/codec. */ + if (lchan_type_compat_with_mode(conn->lchan->type, &req->ch_mode_rate_pref)) { + if (conn->lchan->tch_mode == req->ch_mode_rate_pref.chan_mode) { + /* current lchan suffices and already is in the right mode. We're done. */ + LOG_ASSIGNMENT(conn, LOGL_DEBUG, + "Current lchan is compatible with requested chan_mode," + " sending BSSMAP Assignment Complete directly." + " requested chan_mode=%s; current lchan is %s\n", + gsm48_chan_mode_name(req->ch_mode_rate_pref.chan_mode), + gsm_lchan_name(conn->lchan)); + + conn->ch_mode_rate = req->ch_mode_rate_pref; + + send_assignment_complete(conn); + return 1; + } + + if (!req->ch_mode_rate_alt_present) { + /* FIXME: send Channel Mode Modify to put the current lchan in the right mode, and kick + * off its RTP stream setup code path. See gsm48_lchan_modify() and + * gsm48_rx_rr_modif_ack(), and see lchan_fsm.h LCHAN_EV_CHAN_MODE_MODIF_* */ + LOG_ASSIGNMENT(conn, LOGL_ERROR, + "NOT IMPLEMENTED:" + " Current lchan would be compatible, we should send Channel Mode Modify\n"); + return 0; + } + } + + /* Exit early when no alternate choice for a rate/codec exists. */ + if (!req->ch_mode_rate_alt_present) + return 0; + + /* In cases where the prefered rate/codec does is not compatible, + * try the alternate rate/codec. */ + if (lchan_type_compat_with_mode(conn->lchan->type, &req->ch_mode_rate_alt)) { + if (conn->lchan->tch_mode == req->ch_mode_rate_alt.chan_mode) { + /* current lchan suffices and already is in the right mode. We're done. */ + LOG_ASSIGNMENT(conn, LOGL_DEBUG, + "Current lchan is compatible with requested chan_mode," + " sending BSSMAP Assignment Complete directly." + " requested chan_mode=%s; current lchan is %s\n", + gsm48_chan_mode_name(req->ch_mode_rate_alt.chan_mode), + gsm_lchan_name(conn->lchan)); + + conn->ch_mode_rate = req->ch_mode_rate_alt; + + send_assignment_complete(conn); + return 1; + } + + /* FIXME: send Channel Mode Modify to put the current lchan in the right mode, and kick + * off its RTP stream setup code path. See gsm48_lchan_modify() and + * gsm48_rx_rr_modif_ack(), and see lchan_fsm.h LCHAN_EV_CHAN_MODE_MODIF_* */ + LOG_ASSIGNMENT(conn, LOGL_ERROR, + "NOT IMPLEMENTED:" + " Current lchan would be compatible, we should send Channel Mode Modify\n"); + } + + return 0; +} + +/* Check if a new lchan finally exists, if not log the problem and inform the + * MSC by sending an BSSMAP assignment failure */ +static int check_new_lchan(struct gsm_subscriber_connection *conn, struct osmo_fsm_inst *fi) +{ + struct assignment_request *req = &conn->assignment.req; + + if (!conn->assignment.new_lchan && req->ch_mode_rate_alt_present) { + assignment_count_result(BSC_CTR_ASSIGNMENT_NO_CHANNEL); + assignment_fail(GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, + "BSSMAP Assignment Command:" + " No lchan available for: chan_mode_pref=%s, full_rate_pref=%i / chan_mode_alt=%s, full_rate_alt=%i\n", + get_value_string(gsm48_chan_mode_names, req->ch_mode_rate_pref.chan_mode), + req->ch_mode_rate_pref.full_rate, get_value_string(gsm48_chan_mode_names, + req->ch_mode_rate_alt.chan_mode), + req->ch_mode_rate_alt.full_rate); + return -1; + } else if (!conn->assignment.new_lchan) { + assignment_count_result(BSC_CTR_ASSIGNMENT_NO_CHANNEL); + assignment_fail(GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, + "BSSMAP Assignment Command:" + " No lchan available for: chan_mode=%s, full_rate=%i\n", + get_value_string(gsm48_chan_mode_names, req->ch_mode_rate_pref.chan_mode), + req->ch_mode_rate_pref.full_rate); + return -1; + } + + return 0; +} + void assignment_fsm_start(struct gsm_subscriber_connection *conn, struct gsm_bts *bts, struct assignment_request *req) { @@ -314,75 +481,50 @@ conn->assignment.fi = fi; fi->priv = conn; + /* Create a copy of the request data and use that copy from now on. */ conn->assignment.req = *req; + req = &conn->assignment.req; - switch (req->chan_mode) { - - case GSM48_CMODE_SPEECH_V1: - case GSM48_CMODE_SPEECH_EFR: - case GSM48_CMODE_SPEECH_AMR: - conn->assignment.requires_voice_stream = true; - /* Select an lchan below. */ - break; - - case GSM48_CMODE_SIGN: - conn->assignment.requires_voice_stream = false; - /* Select an lchan below. */ - break; - - default: - assignment_fail(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP, - "Channel mode not supported: %s", - gsm48_chan_mode_name(req->chan_mode)); + /* Check if we need a voice stream. If yes, set the approriate struct + * members in conn */ + if (check_voice_stream_needed(conn, fi) < 0) return; - } - if (conn->lchan - && lchan_type_compat_with_mode(conn->lchan->type, req->chan_mode, req->full_rate)) { - - if (conn->lchan->tch_mode == req->chan_mode) { - /* current lchan suffices and already is in the right mode. We're done. */ - LOG_ASSIGNMENT(conn, LOGL_DEBUG, - "Current lchan is compatible with requested chan_mode," - " sending BSSMAP Assignment Complete directly." - " requested chan_mode=%s; current lchan is %s\n", - gsm48_chan_mode_name(req->chan_mode), - gsm_lchan_name(conn->lchan)); - send_assignment_complete(conn); - return; - } - - /* FIXME: send Channel Mode Modify to put the current lchan in the right mode, and kick - * off its RTP stream setup code path. See gsm48_lchan_modify() and - * gsm48_rx_rr_modif_ack(), and see lchan_fsm.h LCHAN_EV_CHAN_MODE_MODIF_* */ - LOG_ASSIGNMENT(conn, LOGL_ERROR, - "NOT IMPLEMENTED:" - " Current lchan would be compatible, we should send Channel Mode Modify\n"); - } - - conn->assignment.new_lchan = lchan_select_by_chan_mode(bts, req->chan_mode, req->full_rate); - - if (!conn->assignment.new_lchan) { - assignment_count_result(BSC_CTR_ASSIGNMENT_NO_CHANNEL); - assignment_fail(GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, - "BSSMAP Assignment Command:" - " No lchan available for: chan_mode=%s, full_rate=%i\n", - get_value_string(gsm48_chan_mode_names, req->chan_mode), req->full_rate); + /* There may be an already existing lchan, if yes, try to work with + * the existing lchan */ + if (check_for_existing_lchan(conn)) return; + + /* Try to allocate a new lchan with the preferred codec/rate choice */ + conn->assignment.new_lchan = + lchan_select_by_chan_mode(bts, req->ch_mode_rate_pref.chan_mode, req->ch_mode_rate_pref.full_rate); + conn->ch_mode_rate = req->ch_mode_rate_pref; + + /* In case the lchan allocation fails, we try with the alternat + * codec/rate choice (if possible) */ + if (!conn->assignment.new_lchan && req->ch_mode_rate_alt_present) { + conn->assignment.new_lchan = + lchan_select_by_chan_mode(bts, req->ch_mode_rate_alt.chan_mode, req->ch_mode_rate_alt.full_rate); + conn->ch_mode_rate = req->ch_mode_rate_alt; } + /* Check whether the lchan allocation was successful or not and tear + * down the assignment in case of failure. */ + if (check_new_lchan(conn, fi) < 0) + return; + assignment_fsm_update_id(conn); LOG_ASSIGNMENT(conn, LOGL_INFO, "Starting Assignment: chan_mode=%s, full_rate=%d," " aoip=%s MSC-rtp=%s:%u\n", - gsm48_chan_mode_name(req->chan_mode), req->full_rate, + gsm48_chan_mode_name(conn->ch_mode_rate.chan_mode), conn->ch_mode_rate.full_rate, req->aoip ? "yes" : "no", req->msc_rtp_addr, req->msc_rtp_port); assignment_fsm_state_chg(ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE); info = (struct lchan_activate_info){ .activ_for = FOR_ASSIGNMENT, .for_conn = conn, - .chan_mode = req->chan_mode, - .s15_s0 = req->s15_s0, + .chan_mode = conn->ch_mode_rate.chan_mode, + .s15_s0 = conn->ch_mode_rate.s15_s0, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, .re_use_mgw_endpoint_from_lchan = conn->lchan, diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index c99c383..a94d6a8 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -266,21 +266,18 @@ /*! Match the codec preferences from local config with a received codec preferences IEs received from the * MSC and the BTS' codec configuration. - * \param[out] chan_mode GSM 04.08 channel mode. - * \param[out] full_rate true if full-rate. - * \param[out] s15_s0 codec configuration bits S15-S0 (AMR) + * \param[out] ch_mode_rate resulting codec and rate information * \param[in] ct GSM 08.08 channel type received from MSC. * \param[in] scl GSM 08.08 speech codec list received from MSC (optional). * \param[in] msc associated msc (current codec settings). * \param[in] bts associated bts (current codec settings). + * \param[in] pref selected rate preference (full, half or none). * \returns 0 on success, -1 in case no match was found */ -int match_codec_pref(enum gsm48_chan_mode *chan_mode, - bool *full_rate, - uint16_t *s15_s0, +int match_codec_pref(struct channel_mode_and_rate *ch_mode_rate, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, - const struct gsm_bts *bts) + const struct gsm_bts *bts, enum rate_pref rate_pref) { unsigned int i; uint8_t perm_spch; @@ -297,6 +294,18 @@ /* Pick a permitted speech value from the global codec configuration list */ perm_spch = audio_support_to_gsm88(msc->audio_support[i]); + /* Determine if the result is a half or full rate codec */ + rc = full_rate_from_perm_spch(&ch_mode_rate->full_rate, perm_spch); + if (rc < 0) + return -EINVAL; + + /* If we have a preference for FR or HR in our request, we + * discard the potential match */ + if (rate_pref == RATE_PREF_HR && ch_mode_rate->full_rate) + continue; + if (rate_pref == RATE_PREF_FR && !ch_mode_rate->full_rate) + continue; + /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ if (!test_codec_support_bts(bts, perm_spch)) @@ -312,19 +321,14 @@ /* Exit without result, in case no match can be deteched */ if (!match) { - *full_rate = false; - *chan_mode = GSM48_CMODE_SIGN; - *s15_s0 = 0; + ch_mode_rate->full_rate = false; + ch_mode_rate->chan_mode = GSM48_CMODE_SIGN; + ch_mode_rate->s15_s0 = 0; return -1; } - /* Determine if the result is a half or full rate codec */ - rc = full_rate_from_perm_spch(full_rate, perm_spch); - if (rc < 0) - return -EINVAL; - /* Lookup a channel mode for the selected codec */ - *chan_mode = gsm88_to_chan_mode(perm_spch); + ch_mode_rate->chan_mode = gsm88_to_chan_mode(perm_spch); /* Special handling for AMR */ if (perm_spch == GSM0808_PERM_HR3 || perm_spch == GSM0808_PERM_FR3) { @@ -337,9 +341,9 @@ * result */ amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); if (sc_match) - *s15_s0 = sc_match->cfg & amr_s15_s0_supported; + ch_mode_rate->s15_s0 = sc_match->cfg & amr_s15_s0_supported; else - *s15_s0 = amr_s15_s0_supported; + ch_mode_rate->s15_s0 = amr_s15_s0_supported; /* NOTE: The function test_codec_pref() will populate the * sc_match pointer from the searched speech codec list. For @@ -349,7 +353,7 @@ * However s15_s0 is always populated with a meaningful value, * regardless if AoIP is in use or not. */ } else - *s15_s0 = 0; + ch_mode_rate->s15_s0 = 0; return 0; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 35f2e55..dc89ca4 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -521,10 +521,8 @@ struct bsc_msc_data *msc = conn->sccp.msc; struct handover_in_req *req = &ho->inter_bsc_in; int match_idx; - enum gsm48_chan_mode mode; - bool full_rate = false; - uint16_t s15_s0; struct osmo_fsm_inst *fi; + struct channel_mode_and_rate ch_mode_rate = {}; handover_fsm_alloc(conn); @@ -562,7 +560,7 @@ bts->nr, req->cell_id_target_name); /* Figure out channel type */ - if (match_codec_pref(&mode, &full_rate, &s15_s0, &req->ct, &req->scl, msc, bts)) { + if (match_codec_pref(&ch_mode_rate, &req->ct, &req->scl, msc, bts, RATE_PREF_NONE)) { LOG_HO(conn, LOGL_DEBUG, "BTS %u has no matching channel codec (%s, speech codec list len = %u)\n", bts->nr, gsm0808_channel_type_name(&req->ct), req->scl.len); @@ -570,10 +568,10 @@ } LOG_HO(conn, LOGL_DEBUG, "BTS %u: Found matching audio type: %s %s (for %s)\n", - bts->nr, gsm48_chan_mode_name(mode), full_rate? "full-rate" : "half-rate", + bts->nr, gsm48_chan_mode_name(ch_mode_rate.chan_mode), ch_mode_rate.full_rate? "full-rate" : "half-rate", gsm0808_channel_type_name(&req->ct)); - lchan = lchan_select_by_chan_mode(bts, mode, full_rate); + lchan = lchan_select_by_chan_mode(bts, ch_mode_rate.chan_mode, ch_mode_rate.full_rate); if (!lchan) { LOG_HO(conn, LOGL_DEBUG, "BTS %u has no matching free channels\n", bts->nr); continue; @@ -605,9 +603,9 @@ info = (struct lchan_activate_info){ .activ_for = FOR_HANDOVER, .for_conn = conn, - .chan_mode = mode, - .s15_s0 = s15_s0, - .requires_voice_stream = chan_mode_is_tch(mode), + .chan_mode = ch_mode_rate.chan_mode, + .s15_s0 = ch_mode_rate.s15_s0, + .requires_voice_stream = chan_mode_is_tch(ch_mode_rate.chan_mode), .msc_assigned_cic = req->msc_assigned_cic, }; @@ -715,7 +713,7 @@ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ gsm0808_speech_codec_from_chan_type(&sc, ho_perf_params.speech_version_chosen); - sc.cfg = conn->assignment.req.s15_s0; + sc.cfg = conn->ch_mode_rate.s15_s0; memcpy(&ho_perf_params.speech_codec_chosen, &sc, sizeof(sc)); ho_perf_params.speech_codec_chosen_present = true; } diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index f2ccf2c..7b3cd25 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -599,6 +599,97 @@ return 0; } +/* Select a prefered and an alternative codec rate depending on the available + * capabilities. This decision does not include the actual channel load yet, + * this is also the reason why the result is a prefered and an alternate + * setting. The final decision is made in assignment_fsm.c when the actual + * lchan is requested. The preferred lchan will be requested first. If we + * find an alternate setting here, this one will be tried secondly if our + * primary coice fails. */ +static int select_codec(struct assignment_request *req, struct gsm0808_channel_type *ct, + struct gsm_subscriber_connection *conn) +{ + int rc; + struct bsc_msc_data *msc; + + msc = conn->sccp.msc; + req->ch_mode_rate_alt_present = false; + + switch (ct->ch_rate_type & GSM0808_SPEECH_PERM) { + case GSM0808_DATA_FULL_BM: + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_FR); + break; + case GSM0808_DATA_HALF_LM: + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_HR); + break; + case GSM0808_DATA_FULL_RPREF: + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_FR); + if (rc < 0) { + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_NONE); + break; + } + rc = match_codec_pref(&req->ch_mode_rate_alt, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_HR); + if (rc == 0) + req->ch_mode_rate_alt_present = true; + rc = 0; + break; + case GSM0808_DATA_HALF_PREF: + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_HR); + + if (rc < 0) { + rc = match_codec_pref(&req->ch_mode_rate_pref, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_NONE); + break; + } + rc = match_codec_pref(&req->ch_mode_rate_alt, ct, &conn->codec_list, msc, conn_get_bts(conn), + RATE_PREF_FR); + if (rc == 0) + req->ch_mode_rate_alt_present = true; + rc = 0; + break; + default: + rc = -EINVAL; + break; + } + + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "No supported audio type found for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[%s] }\n", + ct->ch_indctr, ct->ch_rate_type, osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + /* TODO: actually output codec names, e.g. implement + * gsm0808_permitted_speech_names[] and iterate perm_spch. */ + return -EINVAL; + } + + if (req->ch_mode_rate_alt_present) { + DEBUGP(DMSC, "Found matching audio type (preferred): %s %s for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", + req->ch_mode_rate_pref.full_rate ? "full rate" : "half rate", + get_value_string(gsm48_chan_mode_names, req->ch_mode_rate_pref.chan_mode), + ct->ch_indctr, ct->ch_rate_type, osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + DEBUGP(DMSC, "Found matching audio type (alternative): %s %s for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", + req->ch_mode_rate_alt.full_rate ? "full rate" : "half rate", + get_value_string(gsm48_chan_mode_names, req->ch_mode_rate_alt.chan_mode), + ct->ch_indctr, ct->ch_rate_type, osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + } else { + DEBUGP(DMSC, "Found matching audio type: %s %s for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", + req->ch_mode_rate_pref.full_rate ? "full rate" : "half rate", + get_value_string(gsm48_chan_mode_names, req->ch_mode_rate_pref.chan_mode), + ct->ch_indctr, ct->ch_rate_type, osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + + } + + return 0; +} + /* * Handle the assignment request message. * @@ -608,18 +699,15 @@ struct msgb *msg, unsigned int length) { struct msgb *resp; - struct bsc_msc_data *msc; struct tlv_parsed tp; uint16_t cic = 0; - enum gsm48_chan_mode chan_mode = GSM48_CMODE_SIGN; - bool full_rate = false; - uint16_t s15_s0 = 0; bool aoip = false; struct sockaddr_storage rtp_addr; struct gsm0808_channel_type ct; uint8_t cause; int rc; struct assignment_request req = {}; + struct channel_mode_and_rate ch_mode_rate_pref = {}; if (!conn) { LOGP(DMSC, LOGL_ERROR, @@ -627,7 +715,6 @@ return -1; } - msc = conn->sccp.msc; aoip = gscon_is_aoip(conn); tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, length - 1, 0, 0); @@ -715,33 +802,19 @@ goto reject; } + req = (struct assignment_request){ + .aoip = aoip, + .msc_assigned_cic = cic, + }; + /* Match codec information from the assignment command against the * local preferences of the BSC and BTS */ - rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, &ct, &conn->codec_list, - msc, conn_get_bts(conn)); + rc = select_codec(&req, &ct, conn); if (rc < 0) { - LOGP(DMSC, LOGL_ERROR, "No supported audio type found for channel_type =" - " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", - ct.ch_indctr, ct.ch_rate_type, osmo_hexdump(ct.perm_spch, ct.perm_spch_len)); - /* TODO: actually output codec names, e.g. implement - * gsm0808_permitted_speech_names[] and iterate perm_spch. */ cause = GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL; goto reject; } - DEBUGP(DMSC, "Found matching audio type: %s %s for channel_type =" - " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", - full_rate? "full rate" : "half rate", - get_value_string(gsm48_chan_mode_names, chan_mode), - ct.ch_indctr, ct.ch_rate_type, osmo_hexdump(ct.perm_spch, ct.perm_spch_len)); - - req = (struct assignment_request){ - .aoip = aoip, - .msc_assigned_cic = cic, - .chan_mode = chan_mode, - .full_rate = full_rate, - .s15_s0 = s15_s0 - }; if (aoip) { unsigned int rc = osmo_sockaddr_to_str_and_uint(req.msc_rtp_addr, sizeof(req.msc_rtp_addr), @@ -755,9 +828,13 @@ } break; case GSM0808_CHAN_SIGN: + ch_mode_rate_pref = (struct channel_mode_and_rate) { + .chan_mode = GSM48_CMODE_SIGN, + }; + req = (struct assignment_request){ .aoip = aoip, - .chan_mode = chan_mode, + .ch_mode_rate_pref = ch_mode_rate_pref, }; break; default: diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index 534b99e..bb5468a 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -380,9 +380,7 @@ { int rc; unsigned int i; - bool full_rate; - enum gsm48_chan_mode chan_mode; - uint16_t s15_s0; + struct channel_mode_and_rate ch_mode_rate = { }; printf("Determining channel mode and rate:\n"); @@ -407,9 +405,9 @@ printf(" codec->efr=%u\n", bts->codec.efr); printf(" codec->amr=%u\n", bts->codec.amr); - rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, ct, scl, msc, bts); + rc = match_codec_pref(&ch_mode_rate, ct, scl, msc, bts, RATE_PREF_NONE); printf(" * result: rc=%i, full_rate=%i, s15_s0=%04x, chan_mode=%s\n", - rc, full_rate, s15_s0, gsm48_chan_mode_name(chan_mode)); + rc, ch_mode_rate.full_rate, ch_mode_rate.s15_s0, gsm48_chan_mode_name(ch_mode_rate.chan_mode)); printf("\n"); -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 18:27:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 17 Jan 2019 18:27:17 +0000 Subject: Change in osmo-msc[master]: vty: make 'sh connect/transact' readable again Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12626 Change subject: vty: make 'sh connect/transact' readable again ...................................................................... vty: make 'sh connect/transact' readable again After recent changes to vlr_subscr_name() result became variable-length which messes up old vty code. Fix this by moving it to the very end and adjusting headers as necessary. While at it, make sure we don't print headers if we have nothing else to show. Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 --- M src/libmsc/msc_vty.c 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12626/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 1fdf560..93d093f 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -550,15 +550,21 @@ static void vty_conn_hdr(struct vty *vty) { - vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s", - VTY_NEWLINE); + unsigned lnum = 0; + struct ran_conn *conn; + + llist_for_each_entry(conn, &gsmnet->ran_conns, entry) + lnum++; + + if (lnum) + vty_out(vty, "--ConnId RAN --LAC Use --Tokens C A5 State ------------ Subscriber%s", + VTY_NEWLINE); } static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn) { - vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", + vty_out(vty, "%08x %3s %5u %3u %08x %c /%1u %27s %22s%s", conn->a.conn_id, - conn->vsub ? vlr_subscr_name(conn->vsub) : "-", conn->via_ran == OSMO_RAT_UTRAN_IU ? "Iu" : "A", conn->lac, conn->use_count, @@ -566,6 +572,7 @@ conn->received_cm_service_request ? 'C' : '-', conn->geran_encr.alg_id, conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-", + conn->vsub ? vlr_subscr_name(conn->vsub) : "-", VTY_NEWLINE); } @@ -583,8 +590,15 @@ static void vty_trans_hdr(struct vty *vty) { - vty_out(vty, "------------Subscriber --ConnId -P TI -CallRef Proto%s", - VTY_NEWLINE); + unsigned lnum = 0; + struct gsm_trans *trans; + + llist_for_each_entry(trans, &gsmnet->trans_list, entry) + lnum++; + + if (lnum) + vty_out(vty, "--ConnId -P TI -CallRef [--- Proto ---] ------------ Subscriber%s", + VTY_NEWLINE); } static const char *get_trans_proto_str(const struct gsm_trans *trans) @@ -613,13 +627,14 @@ static void vty_dump_one_trans(struct vty *vty, const struct gsm_trans *trans) { - vty_out(vty, "%22s %08x %s %02u %08x %s%s", - trans->vsub ? vlr_subscr_name(trans->vsub) : "-", + vty_out(vty, "%08x %s %02u %08x [%s] %22s%s", trans->conn ? trans->conn->a.conn_id : 0, gsm48_pdisc_name(trans->protocol), trans->transaction_id, trans->callref, - get_trans_proto_str(trans), VTY_NEWLINE); + get_trans_proto_str(trans), + trans->vsub ? vlr_subscr_name(trans->vsub) : "-", + VTY_NEWLINE); } DEFUN(show_msc_transaction, show_msc_transaction_cmd, -- To view, visit https://gerrit.osmocom.org/12626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 Gerrit-Change-Number: 12626 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 17 18:27:20 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 Jan 2019 18:27:20 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 30: Code-Review-1 (42 comments) Good work so far; I did still find a lot of remaining problems, but we're well on our way to get this merged. (Some of the remarks are optional to fix, skip those where you are sure and prefer to leave as is) https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_iface.h File include/osmocom/msc/sgs_iface.h: https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_iface.h at 42 PS30, Line 42: /* global list of MME contexts */ this is the *entry* in that list, right? https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_server.h File include/osmocom/msc/sgs_server.h: https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_server.h at 4 PS30, Line 4: #define DEFAULT_VLR_NAME "*_SGS_SERVER_*" I meant to name the variables DEFAULT_SGS_SERVER_IP and _NAME, not the enclosed URL. https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_server.h at 18 PS30, Line 18: char *local_addr; (char array?) https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/sgs_server.h at 21 PS30, Line 21: char *vlr_name; ... here I'd prefer char arrays. (If you have reasons against it then keep it this way though.) https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/11642/30/include/osmocom/msc/vlr.h at 349 PS30, Line 349: const char *imsi); If an IMSI is present, it is already part of the vlr_subscr_name(). Also, since recently, vlr_susbcr_name() includes all available info on a subscriber, including IMSI, MSISDN and TMSI at the same time. (I think we shouldn't continue on the weird path I started with vlr_subscr_msisdn_or_name().) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_04_08.c at 453 PS29, Line 453: conn->vsub->classmark.classmark1 = lu->classmark1; > I think it makes sense to pull this apart, we already have that for BSSMAP and for SGs as well but I [?] ack https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/gsm_04_08.c at 473 PS30, Line 473: * See also GSM 04.08, chapter 9.2.15a */ (I guess preferably these days include the more specific 3GPP TS 24.008 or 44.008 ... nr; maybe next time.) https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11642/8/src/libmsc/gsm_09_11.c at 347 PS8, Line 347: RV_IND_SMS); > I am not sure, I have now made it look like other function calls in the file. [?] Vadim, aligning function arguments with the opening brace is a common code formatting style, also default of vim's cindent. I've used this style ever since I started in Osmocom (and also in other code bases before that). I would gladly adopt the single-tab indent if I could only figure out cindent config to do so. Do you use vim? Do you happen to know a cindent rule set to achieve single tab? I am definitely not going to manually edit all function arguments indenting and fight against cindent, then I'd rather just keep cindent's align-with-opening-brace; I am using automatic indenting extensively, doing it manually would multiply the time i need to write code. Consistency wise, I've seen both single-tab and align-with-brace indenting in the Osmocom code base, though align-with-brace seems to be more common. (Although, for function arguments, two tabs would actually make more sense, especially for function definitions where the following body also has one tab indent.) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 119 PS29, Line 119: SCCP > This is a static function, so its not part of the API and there shouldn't be a doc-string. just because it is a static function doesn't mean you should drop common commenting practices :P We're not as strict with static functions, but if you are documenting the function's return code, then put it in a comment above the function definition. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/gsm_subscriber.c at 130 PS29, Line 130: return sgs_iface_tx_paging(vsub, serv_ind); > When the MME performs an LU on the SGs the VLR knows that the subscriber exists and in case of pagin [?] ack https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/gsm_subscriber.c at 120 PS30, Line 120: (unrelated ws) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 354 PS29, Line 354: * reject, depending on the outcome of the location update. */ > Thats correct. [?] then all of this is fine, including the LOGL_ERROR. (I am sometimes a bit unsure whether services being rejected should qualify for LOGL_ERROR or LOGL_NOTICE, but so far I've always decided for LOGL_ERROR in the end) https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 414 PS29, Line 414: > Yes, at least SGs calls it a "Request", see 3GPP TS 29.118 8.12. [?] ack; same on the E-interface, where DTAP is forwarded both ways as "Request"s, regardless whether they are a response to earlier DTAP or not. https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 772 PS29, Line 772: /* Allocate subscriber connection */ > You mean when a subscriber has just created a conn on 2G/3G, then looses reception and the UE does a [?] for starters, this code path could check that via_ran == OSMO_RAT_EUTRAN_SGS and error out otherwise. In the long run it might make more sense to discard the other conn, to not have to wait a periodic lu expiry before SGs attach becomes possible? https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 984 PS29, Line 984: break; > The checks above abort the function early. [?] ah, of course, thx https://gerrit.osmocom.org/#/c/11642/29/src/libmsc/sgs_iface.c at 1212 PS29, Line 1212: * the VLR subscriber usage to be balanced. */ > This is the only FSM we need to register here. [?] last time i grepped it wasn't there (?) but it's definitely there now. ack. https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 54 PS30, Line 54: /* See also comment in a_iface.c */ which one, "The pointer is set once when calling a_init()"? :) https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 99 PS30, Line 99: conn->vsub = vsub; This should be vlr_subscr_get(vsub), right?? (whitespace error) https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 100 PS30, Line 100: conn->vsub->cs.attached_via_ran = conn->via_ran; here (after assigning vsub and via_ran) please call ran_conn_update_id(conn) for logging context. https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 103 PS30, Line 103: * authenticated by the MME no authentication is requred */ "required" https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 117 PS30, Line 117: vlr_subscr_msisdn_or_name(vsub)); would still prefer if the LOGxxx macros include the log ctx implicitly. Actually, I have recently added such to ran_conn, so: IMO what you should do is, in ran_conn.c, in ran_conn_alloc add case OSMO_RAT_EUTRAN_SGS: conn->log_subsys = DSGS; and then use LOG_RAN_CONN(conn, LOGL_DEBUG, "Allocated\n"); (the conn's FI should anyway already log that it is allocated, but use LOG_RAN_CONN() for all SGs logging; then you will always have the full subscriber and conn context added to the logging implicitly) For places where there is no ran_conn available I'm not sure how to best solve this, but if possible also go for logging macros that include all applicable context info implicitly. (I think I've mentioned this in an earlier review; maybe you decided it is not possible?) https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 132 PS30, Line 132: vlr_subscr_msisdn_or_name(vsub)); LOG_RAN_CONN() https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_iface.c at 245 PS30, Line 245: vlr_subscr_msisdn_or_name(vsub), sgsap_msg_type_name(msg_type)); (rather just vlr_subscr_name(), same below) https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_server.c at 187 PS30, Line 187: talloc_free(name); suggest using osmo_sock_get_name2(), needs no talloc_free() https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/sgs_vty.c File src/libmsc/sgs_vty.c: PS30: I would appreciate if you could add some .vty transcript test for the SGs VTY nodes, verifying that the new commands work as expected, show the expected docs and print back the expected 'show running-config'. https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr.c at 125 PS30, Line 125: const char *imsi) If you want to keep this, the name more accurately would be 'vlr_subscr_imsi_or_msisdn_or_name()' ... but again rather just use vlr_subscr_name(), as we now also do in most FSM instance IDs and log contexts https://gerrit.osmocom.org/#/c/11642/3/src/libvlr/vlr_sgs.c File src/libvlr/vlr_sgs.c: https://gerrit.osmocom.org/#/c/11642/3/src/libvlr/vlr_sgs.c at 1 PS3, Line 1: /* (C) 2018-2019 by sysmocom s.f.m.c. GmbH -2019? feel free to grep the other files yourself... (BTW, I am often thinking we should automate the copyright year indications somehow, by which years contain changes to the file...) https://gerrit.osmocom.org/#/c/11642/3/src/libvlr/vlr_sgs.c at 91 PS3, Line 91: vsub->sgs.paging_cb = paging_cb; > I removed this one, but there are others. I am using them as orientation while testing things. [?] confirmed: I grepped the latest patch set for '\sgs_fsm, SGS_UE_E_RX_PAGING_FAILURE, &cause); you are still using it here. Same in other functions in this file, not marking each one now. https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr_sgs.c at 308 PS30, Line 308: vsub->sgs.paging_serv_ind = serv_ind; I'm getting the impression that you should do another vlr_subscr_get() to increase the vlr_subscr's use count while paging, and decrease when paging is done. Have you given this consideration yet? For example, when above Ts5_timeout_cb() gets invoked, you want to be sure that the vsub has not been deallocated yet, even if the subscriber has somehow detached from the SGs (like an IMSI detach or an SGs connection reset?) https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr_sgs_fsm.h File src/libvlr/vlr_sgs_fsm.h: https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr_sgs_fsm.h at 35 PS30, Line 35: SGS_UE_E_RX_SGSAP_UE_UNRECHABLE, UNREACHABLE with A https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c File src/libvlr/vlr_sgs_fsm.c: https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 227 PS5, Line 227: (here and below would prefer N-tabs indent instead of align-with-opening-brace; curly braces are definitely no candidates for align-with-brace) https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 231 PS5, Line 231: struct vlr_subscr *vsub = fi->priv; one more indent for multi-line member assignment https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 238 PS5, Line 238: /* See 5.4.3 and 5.5.3 */ more indent https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 250 PS5, Line 250: default: more indent https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 252 PS5, Line 252: break; more indent https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 262 PS5, Line 262: /* Failed TMSI reallocation procedure, deallocate all TMSI rather indent with two tabs (and how did you end up with the weird line breaks) https://gerrit.osmocom.org/#/c/11642/5/src/libvlr/vlr_sgs_fsm.c at 293 PS5, Line 293: S(SGS_UE_E_RX_SGSAP_UE_UNRECHABLE) | S(SGS_UE_E_RX_PAGING_FAILURE) | S(SGS_UE_E_RX_ALERT_FAILURE) | drop? https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr_sgs_fsm.c File src/libvlr/vlr_sgs_fsm.c: https://gerrit.osmocom.org/#/c/11642/30/src/libvlr/vlr_sgs_fsm.c at 61 PS30, Line 61: LOGPFSML(fi, LOGL_ERROR, "(sub %s) VLR LU tmsi allocation failed\n", vlr_subscr_msisdn_or_name(vsub)); use vlr_subscr_name(), or rather have that context in the fi->id already https://gerrit.osmocom.org/#/c/11642/30/tests/msc_vlr/stubs.h File tests/msc_vlr/stubs.h: https://gerrit.osmocom.org/#/c/11642/30/tests/msc_vlr/stubs.h at 5 PS30, Line 5: * Author: Neels Hofmeyr that's me, though. are you copying another stubs.h that we could just re-use instead of copying? https://gerrit.osmocom.org/#/c/11642/30/tests/sms_queue/sms_queue_test.c File tests/sms_queue/sms_queue_test.c: https://gerrit.osmocom.org/#/c/11642/30/tests/sms_queue/sms_queue_test.c at 240 PS30, Line 240: are these the same as stubs.h? -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 Jan 2019 18:27:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 05:14:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 05:14:32 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: remove references to lchan_alloc() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12621 ) Change subject: chan_alloc: remove references to lchan_alloc() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12621/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/12621/1/src/osmo-bsc/abis_rsl.c at a1381 PS1, Line 1381: Does it make sense for lchan_select_by_type()? -- To view, visit https://gerrit.osmocom.org/12621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 Gerrit-Change-Number: 12621 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 05:14:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 05:23:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 05:23:29 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 140 PS1, Line 140: There is no full-rate EFR specified! This comment looks confusing. Let's rather say: /* EFR works over FR channels only */ https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 143 PS1, Line 143: case GSM48_CMODE_SPEECH_V1: Please add some "fall-through" comment here to suppress Coverity / compiler warnings. -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 05:23:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 05:25:48 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 05:25:48 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Do not unsolicitedly select a TCH/F In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12623 ) Change subject: lchan_select: Do not unsolicitedly select a TCH/F ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Gerrit-Change-Number: 12623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 05:25:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 05:31:48 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 05:31:48 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to shun specific lchans In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to shun specific lchans ...................................................................... Patch Set 1: (1 comment) Also, why not to call this flag 'ignored' or 'disabled'? https://gerrit.osmocom.org/#/c/12624/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12624/1/include/osmocom/bsc/gsm_data.h at 619 PS1, Line 619: shun As this flag is related to debug feature, it makes sense to prefix it somehow, e.g. '_shun'... -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 05:31:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 05:43:20 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 05:43:20 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12625/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/12625/1/src/osmo-bsc/abis_rsl.c at 1378 PS1, Line 1378: to Spelling: 'to' is not needed here I think. https://gerrit.osmocom.org/#/c/12625/1/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/1/src/osmo-bsc/assignment_fsm.c at 258 PS1, Line 258: int Let's use bool. -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 05:43:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 18 06:52:25 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 Jan 2019 06:52:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-simtrace2_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#256?= Message-ID: <2049009598.624.1547794345959.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 99.70 KB...] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBD.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDCallbacks.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriver.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c] [COMPILING libcommon/source/string.c] [COMPILING libcommon/source/stdio.c] [COMPILING libcommon/source/fputs.c] [COMPILING libcommon/source/usb_buf.c] [COMPILING libcommon/source/ringbuffer.c] [COMPILING libcommon/source/pseudo_talloc.c] [COMPILING libcommon/source/host_communication.c] [COMPILING libboard/common/source/sim_switch.c] [COMPILING libboard/common/source/board_cstartup_gnu.c] [COMPILING libboard/common/source/board_lowlevel.c] [COMPILING libboard/common/source/uart_console.c] [COMPILING libboard/common/source/led.c] [COMPILING libboard/common/source/boardver_adc.c] [COMPILING libboard/common/source/manifest.c] [COMPILING libboard/simtrace/source/board_simtrace.c] [COMPILING apps/trace/main.c] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c] [COMPILING libcommon/source/card_emu.c] [COMPILING libcommon/source/cciddriver.c] [COMPILING libcommon/source/iso7816_4.c] [COMPILING libcommon/source/iso7816_fidi.c] [COMPILING libcommon/source/mitm.c] [COMPILING libcommon/source/mode_cardemu.c] [COMPILING libcommon/source/mode_ccid.c] [COMPILING libcommon/source/simtrace_iso7816.c] [COMPILING libcommon/source/sniffer.c] [COMPILING libcommon/source/tc_etu.c] [COMPILING libcommon/source/usb.c] text data bss dec hex filename 144 0 4 148 94 obj/simtrace/flash_panic.o 54 0 0 54 36 obj/simtrace/flash_backtrace.o 1012 0 0 1012 3f4 obj/simtrace/flash_rbtree.o 1166 0 4104 5270 1496 obj/simtrace/flash_msgb.o 820 0 0 820 334 obj/simtrace/flash_bits.o 400 0 12 412 19c obj/simtrace/flash_timer.o 1807 0 4359 6166 1816 obj/simtrace/flash_utils.o 4143 0 224 4367 110f obj/simtrace/flash_USBD_HAL.o 84 0 0 84 54 obj/simtrace/flash_unique_id.o 375 0 0 375 177 obj/simtrace/flash_tc.o 729 0 60 789 315 obj/simtrace/flash_pio_it.o 406 0 0 406 196 obj/simtrace/flash_pio.o 1707 0 0 1707 6ab obj/simtrace/flash_exceptions.o 278 0 0 278 116 obj/simtrace/flash_spi.o 778 0 0 778 30a obj/simtrace/flash_efc.o 403 0 0 403 193 obj/simtrace/flash_pmc.o 1477 0 260 1737 6c9 obj/simtrace/flash_flashd.o 543 0 0 543 21f obj/simtrace/flash_usart.o 56 0 0 56 38 obj/simtrace/flash_wdt.o 148 0 0 148 94 obj/simtrace/flash_core_cm3.o 182 0 0 182 b6 obj/simtrace/flash_USBDescriptors.o 86 0 0 86 56 obj/simtrace/flash_USBRequests.o 584 0 2 586 24a obj/simtrace/flash_USBD.o 26 0 0 26 1a obj/simtrace/flash_USBDCallbacks.o 1587 0 16 1603 643 obj/simtrace/flash_USBDDriver.o 65 0 0 65 41 obj/simtrace/flash_USBDDriverCallbacks.o 282 0 0 282 11a obj/simtrace/flash_string.o 970 0 0 970 3ca obj/simtrace/flash_stdio.o 64 0 0 64 40 obj/simtrace/flash_fputs.o 201 0 96 297 129 obj/simtrace/flash_usb_buf.o 198 0 0 198 c6 obj/simtrace/flash_ringbuffer.o 393 0 3492 3885 f2d obj/simtrace/flash_pseudo_talloc.o 658 0 0 658 292 obj/simtrace/flash_host_communication.o 203 0 4 207 cf obj/simtrace/flash_sim_switch.o 120 9424 0 9544 2548 obj/simtrace/flash_board_cstartup_gnu.o 304 0 0 304 130 obj/simtrace/flash_board_lowlevel.o 1216 0 521 1737 6c9 obj/simtrace/flash_uart_console.o 731 184 0 915 393 obj/simtrace/flash_led.o 8 0 0 8 8 obj/simtrace/flash_boardver_adc.o 35 16 0 51 33 obj/simtrace/flash_manifest.o 231 0 0 231 e7 obj/simtrace/flash_board_simtrace.o 1121 1 0 1122 462 obj/simtrace/flash_main.o 244 0 0 244 f4 obj/simtrace/flash_dfu.o 645 4 6 655 28f obj/simtrace/flash_dfu_runtime.o 3490 0 208 3698 e72 obj/simtrace/flash_card_emu.o 0 0 0 0 0 obj/simtrace/flash_cciddriver.o 2629 12 4 2645 a55 obj/simtrace/flash_iso7816_4.o 96 0 0 96 60 obj/simtrace/flash_iso7816_fidi.o 0 0 0 0 0 obj/simtrace/flash_mitm.o 1820 576 0 2396 95c obj/simtrace/flash_mode_cardemu.o 0 0 0 0 0 obj/simtrace/flash_mode_ccid.o 352 0 520 872 368 obj/simtrace/flash_simtrace_iso7816.o 4534 24 547 5105 13f1 obj/simtrace/flash_sniffer.o 488 40 0 528 210 obj/simtrace/flash_tc_etu.o 619 48 0 667 29b obj/simtrace/flash_usb.o 24996 0 18636 43632 aa70 bin/simtrace-trace-flash.elf [COMPILING libosmocore/source/panic.c] [COMPILING libosmocore/source/backtrace.c] [COMPILING libosmocore/source/rbtree.c] [COMPILING libosmocore/source/msgb.c] [COMPILING libosmocore/source/bits.c] [COMPILING libosmocore/source/timer.c] [COMPILING libosmocore/source/utils.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/unique_id.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/tc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pio_it.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pio.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/spi.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/efc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pmc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/flashd.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/usart.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/wdt.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c] [COMPILING ./atmel_softpack_libraries/usb/common/core/USBDescriptors.c] [COMPILING ./atmel_softpack_libraries/usb/common/core/USBRequests.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBD.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDCallbacks.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriver.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c] [COMPILING libcommon/source/string.c] [COMPILING libcommon/source/stdio.c] [COMPILING libcommon/source/fputs.c] [COMPILING libcommon/source/usb_buf.c] [COMPILING libcommon/source/ringbuffer.c] [COMPILING libcommon/source/pseudo_talloc.c] [COMPILING libcommon/source/host_communication.c] [COMPILING libboard/common/source/sim_switch.c] [COMPILING libboard/common/source/board_cstartup_gnu.c] [COMPILING libboard/common/source/board_lowlevel.c] [COMPILING libboard/common/source/uart_console.c] [COMPILING libboard/common/source/led.c] [COMPILING libboard/common/source/boardver_adc.c] [COMPILING libboard/common/source/manifest.c] [COMPILING libboard/simtrace/source/board_simtrace.c] [COMPILING apps/trace/main.c] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c] [COMPILING libcommon/source/card_emu.c] [COMPILING libcommon/source/cciddriver.c] [COMPILING libcommon/source/iso7816_4.c] [COMPILING libcommon/source/iso7816_fidi.c] [COMPILING libcommon/source/mitm.c] [COMPILING libcommon/source/mode_cardemu.c] [COMPILING libcommon/source/mode_ccid.c] [COMPILING libcommon/source/simtrace_iso7816.c] [COMPILING libcommon/source/sniffer.c] [COMPILING libcommon/source/tc_etu.c] [COMPILING libcommon/source/usb.c] text data bss dec hex filename 144 0 4 148 94 obj/simtrace/dfu_panic.o 54 0 0 54 36 obj/simtrace/dfu_backtrace.o 1012 0 0 1012 3f4 obj/simtrace/dfu_rbtree.o 1166 0 4104 5270 1496 obj/simtrace/dfu_msgb.o 820 0 0 820 334 obj/simtrace/dfu_bits.o 400 0 12 412 19c obj/simtrace/dfu_timer.o 1807 0 4359 6166 1816 obj/simtrace/dfu_utils.o 4143 0 224 4367 110f obj/simtrace/dfu_USBD_HAL.o 84 0 0 84 54 obj/simtrace/dfu_unique_id.o 375 0 0 375 177 obj/simtrace/dfu_tc.o 729 0 60 789 315 obj/simtrace/dfu_pio_it.o 406 0 0 406 196 obj/simtrace/dfu_pio.o 1707 0 0 1707 6ab obj/simtrace/dfu_exceptions.o 278 0 0 278 116 obj/simtrace/dfu_spi.o 778 0 0 778 30a obj/simtrace/dfu_efc.o 403 0 0 403 193 obj/simtrace/dfu_pmc.o 1477 0 260 1737 6c9 obj/simtrace/dfu_flashd.o 543 0 0 543 21f obj/simtrace/dfu_usart.o 56 0 0 56 38 obj/simtrace/dfu_wdt.o 148 0 0 148 94 obj/simtrace/dfu_core_cm3.o 182 0 0 182 b6 obj/simtrace/dfu_USBDescriptors.o 86 0 0 86 56 obj/simtrace/dfu_USBRequests.o 584 0 2 586 24a obj/simtrace/dfu_USBD.o 26 0 0 26 1a obj/simtrace/dfu_USBDCallbacks.o 1587 0 16 1603 643 obj/simtrace/dfu_USBDDriver.o 65 0 0 65 41 obj/simtrace/dfu_USBDDriverCallbacks.o 282 0 0 282 11a obj/simtrace/dfu_string.o 970 0 0 970 3ca obj/simtrace/dfu_stdio.o 64 0 0 64 40 obj/simtrace/dfu_fputs.o 201 0 96 297 129 obj/simtrace/dfu_usb_buf.o 198 0 0 198 c6 obj/simtrace/dfu_ringbuffer.o 393 0 3492 3885 f2d obj/simtrace/dfu_pseudo_talloc.o 658 0 0 658 292 obj/simtrace/dfu_host_communication.o 203 0 4 207 cf obj/simtrace/dfu_sim_switch.o 120 9424 0 9544 2548 obj/simtrace/dfu_board_cstartup_gnu.o 304 0 0 304 130 obj/simtrace/dfu_board_lowlevel.o 1216 0 521 1737 6c9 obj/simtrace/dfu_uart_console.o 731 184 0 915 393 obj/simtrace/dfu_led.o 8 0 0 8 8 obj/simtrace/dfu_boardver_adc.o 33 16 0 49 31 obj/simtrace/dfu_manifest.o 231 0 0 231 e7 obj/simtrace/dfu_board_simtrace.o 1121 1 0 1122 462 obj/simtrace/dfu_main.o 244 0 0 244 f4 obj/simtrace/dfu_dfu.o 645 4 6 655 28f obj/simtrace/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/simtrace/dfu_card_emu.o 0 0 0 0 0 obj/simtrace/dfu_cciddriver.o 2629 12 4 2645 a55 obj/simtrace/dfu_iso7816_4.o 96 0 0 96 60 obj/simtrace/dfu_iso7816_fidi.o 0 0 0 0 0 obj/simtrace/dfu_mitm.o 1820 576 0 2396 95c obj/simtrace/dfu_mode_cardemu.o 0 0 0 0 0 obj/simtrace/dfu_mode_ccid.o 352 0 520 872 368 obj/simtrace/dfu_simtrace_iso7816.o 4534 24 547 5105 13f1 obj/simtrace/dfu_sniffer.o 488 40 0 528 210 obj/simtrace/dfu_tc_etu.o 619 48 0 667 29b obj/simtrace/dfu_usb.o 24996 0 18636 43632 aa70 bin/simtrace-trace-dfu.elf =============== simtrace / trace RES:0 ============== =============== qmod / dfu START ============== mkdir -p obj/qmod [COMPILING libosmocore/source/panic.c] [COMPILING libosmocore/source/backtrace.c] [COMPILING libosmocore/source/rbtree.c] [COMPILING libosmocore/source/msgb.c] [COMPILING libosmocore/source/bits.c] [COMPILING libosmocore/source/timer.c] [COMPILING libosmocore/source/utils.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/unique_id.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/tc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pio_it.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pio.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/spi.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/efc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/pmc.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/flashd.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/usart.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/source/wdt.c] [COMPILING ./atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c] [COMPILING ./atmel_softpack_libraries/usb/common/core/USBDescriptors.c] [COMPILING ./atmel_softpack_libraries/usb/common/core/USBRequests.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBD.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDCallbacks.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriver.c] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c] [COMPILING libcommon/source/string.c] [COMPILING libcommon/source/stdio.c] [COMPILING libcommon/source/fputs.c] [COMPILING libcommon/source/usb_buf.c] [COMPILING libcommon/source/ringbuffer.c] libcommon/source/ringbuffer.c: In function 'rbuf_write': libcommon/source/ringbuffer.c:75:5: internal compiler error: Segmentation fault int rbuf_write(volatile ringbuf * rb, uint8_t item) ^ arm-none-eabi-gcc: internal compiler error: Segmentation fault (program cc1) Please submit a full bug report, with preprocessed source if appropriate. See for instructions. Makefile:224: recipe for target 'obj/qmod/flash_ringbuffer.o' failed make: *** [obj/qmod/flash_ringbuffer.o] Error 4 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 18 08:20:26 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 08:20:26 +0000 Subject: Change in libosmocore[master]: socket: add define for socket name length In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12554 ) Change subject: socket: add define for socket name length ...................................................................... socket: add define for socket name length The function osmo_sock_get_name_buf() can be used to write a string representation to a user provided memory. Unfortunately the proper length for the user provided memory is not obvious. To make using osmo_sock_get_name_buf() more practical, add a define constant that defines the length of the required memory. Also use this define in socket.c. Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 43604ec..c183532 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -28,6 +28,8 @@ #define OSMO_SOCK_F_NO_MCAST_ALL (1 << 4) /*! use SO_REUSEADDR on UDP ports (required for multicast) */ #define OSMO_SOCK_F_UDP_REUSEADDR (1 << 5) +/*! maximum length of a socket name ("r=1.2.3.4:123<->l=5.6.7.8:987") */ +#define OSMO_SOCK_NAME_MAXLEN (2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1) int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 4f3b1ca..37fd584 100644 --- a/src/socket.c +++ b/src/socket.c @@ -783,8 +783,7 @@ */ char *osmo_sock_get_name(void *ctx, int fd) { - /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ - char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + char str[OSMO_SOCK_NAME_MAXLEN]; int rc; rc = osmo_sock_get_name_buf(str, sizeof(str), fd); if (rc <= 0) @@ -823,8 +822,7 @@ */ const char *osmo_sock_get_name2(int fd) { - /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ - static char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + static char str[OSMO_SOCK_NAME_MAXLEN]; osmo_sock_get_name_buf(str, sizeof(str), fd); return str; } -- To view, visit https://gerrit.osmocom.org/12554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If8be8c2c0d4935da17ab13b2c2127b719ceefbcc Gerrit-Change-Number: 12554 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 08:21:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 08:21:00 +0000 Subject: Change in libosmocore[master]: gsm29118: fix coverity issues In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12550 ) Change subject: gsm29118: fix coverity issues ...................................................................... gsm29118: fix coverity issues The function msgb_sgsap_name_put() assignes the return code of osmo_apn_from_str() directly to len. Len is an uint8_t and the return code an int. If osmo_apn_from_str() returns -1. Len would become 0xFF causing a buffer overrun with msgb_tlv_put. Lets use the proper type to catch the return code and check it before using it as length. Change-Id: Ic0bc5114eee47bdcf2300a6e4b0df473d3d1903a Fixes: CID#190405 Fixes: CID#190401 Related: OS#3615 --- M src/gsm/gsm29118.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index ca210fb..56e7473 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -196,9 +196,14 @@ { uint8_t buf[APN_MAXLEN]; uint8_t len; + int rc; + /* encoding is like DNS names, which is like APN fields */ memset(buf, 0, sizeof(buf)); - len = osmo_apn_from_str(buf, sizeof(buf), name); + rc = osmo_apn_from_str(buf, sizeof(buf), name); + if (rc < 0) + return -1; + len = (uint8_t)rc; /* Note: While the VLR-Name (see 3GPP TS 29.118, chapter 9.4.22) has * a flexible length, the MME-Name has a fixed size of 55 octets. (see -- To view, visit https://gerrit.osmocom.org/12550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0bc5114eee47bdcf2300a6e4b0df473d3d1903a Gerrit-Change-Number: 12550 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:01:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 09:01:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12627 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr The idea of this test case is to verify SM-RP-MR assignment for a few MT SMS being sent over GSUP. Basically, the algorythm is the following: 1.0 send the 1st SMS using MT-ForwardSM-Req on GSUP, 1.1 expect Paging Request on RAN, 1.2 establish a RAN connection, 1.3 expect CP-DATA/RP-DATA for the 1st SMS, 2.0 send the 2nd SMS using MT-ForwardSM-Req on GSUP, 2.1 expect CP-DATA/RP-DATA for the 2nd SMS, 3.0 compare both SM-RP-MR values assigned by the MSC, 3.1 send CP-DATA/RP-ACK for both 1st and 2nd SMS messages, 3.2 expect MT-ForwardSM-Res for both 1st and 2nd SMS messages. The SM-RP-MR values for both 1st and 2nd messages shall not match. Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/12627/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index b72c580..eee19b8 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2409,6 +2409,118 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Test SM-RP-MR assignment for MT-SMS over GSUP */ +private function f_tc_gsup_mt_sms_rp_mr(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars1 := valueof(t_SmsPars); /* 1st SMS */ + var SmsParameters spars2 := valueof(t_SmsPars); /* 2nd SMS */ + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + /* Submit the 1st MT SMS on GSUP */ + log("TX MT-forwardSM-Req for the 1st SMS"); + f_gsup_forwardSM_req(spars1); + + /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + + /* Wait for 1st MT SMS on DTAP */ + f_mt_sms_expect(spars1); + log("RX the 1st SMS on DTAP, DTAP TID is ", spars1.tid, + ", SM-RP-MR is ", spars1.rp.msg_ref); + + /* Submit the 2nd MT SMS on GSUP */ + log("TX MT-forwardSM-Req for the 2nd SMS"); + f_gsup_forwardSM_req(spars2); + + /* Wait for 2nd MT SMS on DTAP */ + f_mt_sms_expect(spars2); + log("RX the 2nd SMS on DTAP, DTAP TID is ", spars2.tid, + ", SM-RP-MR is ", spars2.rp.msg_ref); + + /* Both transaction IDs shall be different */ + if (spars1.tid == spars2.tid) { + log("Both DTAP transaction IDs shall be different"); + setverdict(fail); + } + + /* Both SM-RP-MR values shall be different */ + if (spars1.rp.msg_ref == spars2.rp.msg_ref) { + log("Both SM-RP-MR values shall be different"); + setverdict(fail); + } + + /* Both SM-RP-MR values shall be assigned */ + if (spars1.rp.msg_ref == 'FF'O) { + log("Unassigned SM-RP-MR value for the 1st SMS"); + setverdict(fail); + } + if (spars2.rp.msg_ref == 'FF'O) { + log("Unassigned SM-RP-MR value for the 2nd SMS"); + setverdict(fail); + } + + /* Send the 1st RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars1); + alt { + [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars1.rp.msg_ref + )) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Send the 2nd RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars2); + alt { + [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars2.rp.msg_ref + )) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_rp_mr() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(92); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_sms_rp_mr), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* Test multi-part MT-SMS over GSUP */ private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -4344,6 +4456,7 @@ execute( TC_gsup_mo_smma() ); execute( TC_gsup_mt_sms_ack() ); execute( TC_gsup_mt_sms_err() ); + execute( TC_gsup_mt_sms_rp_mr() ); execute( TC_gsup_mt_multi_part_sms() ); execute( TC_lu_and_mo_ussd_single_request() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 650aefb..766421b 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -68,6 +68,7 @@ + -- To view, visit https://gerrit.osmocom.org/12627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc Gerrit-Change-Number: 12627 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:09:04 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 09:09:04 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12628 Change subject: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS ...................................................................... libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS Initially, it was assumed that if there is no active RAN connection, we can just start counting from 0x00, as there are no other SMS related transactions, and transaction itself is allocated using talloc_zero(). Until now it was looking good, but... As soon as we establish RAN connection with subscriber, we already have a transaction with SM-RP-MR 0x00, but conn->next_rp_ref also remains 0x00 - it isn't being increased! It means that we can face a SM-RP-MR conflict (or collision) if another MT SMS would arrive to the MSC (from SMSC over GSUP) when this transaction is still active, i.e. the first SMS is still being sent, because conn->next_rp_ref++ would return 0x00 again. Let's clarify SM-RP-MR assignment in gsm411_alloc_mt_trans(), and update the conn->next_rp_ref counter in the paging call-back. This change makes the corresponding TC_gsup_mt_sms_rp_mr pass. Discovered by: Neels Hofmeyr Related Change-Id: (TTCN) I3a52d44f4abde9b6b471b9108c1cee905884c9bc Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac --- M src/libmsc/gsm_04_11.c 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/12628/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 4dc07bd..7261e17 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -147,6 +147,8 @@ case GSM_PAGING_SUCCEEDED: /* Associate transaction with established connection */ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); + /* Update SM-RP-MR counter, SM-RP-MR 0x00 is taken by this trans */ + trans->conn->next_rp_ref++; /* Confirm successful connection establishment */ gsm411_smc_recv(&trans->sms.smc_inst, GSM411_MMSMS_EST_CNF, NULL, 0); @@ -1052,10 +1054,14 @@ if (!trans) return NULL; - if (conn) { - /* Generate unique RP Message Reference */ - trans->sms.sm_rp_mr = conn->next_rp_ref++; - } + /* Assign a unique SM-RP Message Reference: + * a) if there is already an active connection, + * then use its counter conn->next_rp_ref; + * b) otherwise SM-RP-MR is set to 0x00, and + * as soon as RAN connection is established, + * its counter conn->next_rp_ref is updated + * by the paging call-back. */ + trans->sms.sm_rp_mr = conn ? conn->next_rp_ref++ : 0x00; /* Use SAPI 3 (see GSM 04.11, section 2.3) */ trans->dlci = UM_SAPI_SMS; -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:35:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 09:35:00 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12622 to look at the new patch set (#2). Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... lchan_select: dont allow half rate EFR to be selected The function lchan_select_by_chan_mode() is prone to select an half rate lchan when EFR is used, even though EFR is not defined for half-rate. Lets protect against that. Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Related: OS#3503 --- M src/osmo-bsc/lchan_select.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/12622/2 -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:35:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 09:35:00 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#2). Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... bsc_vty: add features to disable specific lchans via vty In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us to mark certain lchans as disabled and check that condition while doing the channel allocation Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 4 files changed, 73 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/2 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:35:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 09:35:00 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12625 to look at the new patch set (#2). Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... assignment_fsm: fix channel allocator preferences When the MSC allocates a channel through the ASSIGNMENT REQUEST, it may ask for a TCH/H and a TCH/F at the same time and tell which of the two types it prefers. The process of channel allocation currently selects, based on the BTS, MSC and MS capabilites exactly one apropriate codec/rate (e.g. TCH/H) and then trys to allocate it. If that allocation fails, there is no way to try the second choice and the assignment fails. For example: The MSC asks for TCH/F and TCH/H, prefering TCH/F, then the channel allocator will try TCH/F and if it fails (all TCH/F are currently in use), then TCH/H is never tried. Since the BSC currently only trys the first best codec/rate that is supported it also ignores the preference. Lets fix those problems by including the preference information and both possible codec/rate settings into the channel allocation decision. Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Related: OS#3503 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 8 files changed, 366 insertions(+), 136 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/12625/2 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 09:43:20 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 09:43:20 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 09:43:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 10:29:01 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 10:29:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12620 to look at the new patch set (#2). Change subject: WIP: BSC_Tests: Add tests to check channel allocator ...................................................................... WIP: BSC_Tests: Add tests to check channel allocator When a channel is assigned via the assignment request throught the A interface, the MSC may offer either FR, HR or both. When FR and HR are permitted, a preference is set on one of the two. At the moment we do not check how the bsc is reacting to those preferences and its also not checked how the behavior is when the preferred rate is not available because all lchan of that type are already in use. Lets add a set of tests to verify this. Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Related: OS#3503 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 304 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/12620/2 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 10:50:50 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 10:50:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12620 ) Change subject: WIP: BSC_Tests: Add tests to check channel allocator ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 18 Jan 2019 10:50:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 10:51:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 10:51:13 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: remove references to lchan_alloc() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12621 ) Change subject: chan_alloc: remove references to lchan_alloc() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 Gerrit-Change-Number: 12621 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 10:51:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 10:52:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 10:52:53 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 10:52:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 10:59:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 10:59:10 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: remove references to lchan_alloc() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12621 ) Change subject: chan_alloc: remove references to lchan_alloc() ...................................................................... chan_alloc: remove references to lchan_alloc() The function lchan_alloc() does not exist anymore, however there is still a prototype definition in chan_alloc.h and a comment in abis_rsl.c. Lets remove those. Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 --- M include/osmocom/bsc/chan_alloc.h M src/osmo-bsc/abis_rsl.c 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/chan_alloc.h b/include/osmocom/bsc/chan_alloc.h index 97f6cb2..b509e3e 100644 --- a/include/osmocom/bsc/chan_alloc.h +++ b/include/osmocom/bsc/chan_alloc.h @@ -24,9 +24,6 @@ struct gsm_subscriber_connection; -/* Allocate a logical channel (SDCCH, TCH, ...) */ -struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, int allow_bigger); - /* Free a logical channel (SDCCH, TCH, ...) */ void lchan_free(struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 8ffb07e..d67573f 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1378,8 +1378,6 @@ * - If SDCCH is not available, try whatever MS requested, if not SDCCH. * - If there is still no channel available, reject channel request. * - * lchan_alloc() possibly tries to allocate larger lchans. - * * Note: If the MS requests not TCH/H, we don't know if the phone * supports TCH/H, so we must assign TCH/F or SDCCH. */ -- To view, visit https://gerrit.osmocom.org/12621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I36227ea306d28587ac70acbe596c7756b23d88c7 Gerrit-Change-Number: 12621 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:00:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 18 Jan 2019 11:00:44 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 83 PS2, Line 83: if (lchan->fi->state == LCHAN_ST_UNUSED && lchan->disabled == false) At this point I've got an idea: what if we introduce a special FSM state for that? For example, LCHAN_ST_DISABLED. This way we wouldn't need to change this. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 89 PS2, Line 89: ws https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 94 PS2, Line 94: lchan->disabled ? "disabled" : "not suitable" This additional logging would also be unneeded. -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:00:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:01:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:01:12 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 2: (1 comment) I'm genrally worried when we introduce patches like this. They are very likely to confuse the regular operator/user and have possibly dangerous effects in production setups. At the very least, they should be added as HIDDEN vty commands, so they don't end up being documented and don't show up in vty autocompletion. Alternatively, one could have e.g. an environment variable that's only set during testing, which would be the precondition to registering related VTY commands. Specifically regarding this patch: Why introduce a new "disabled" member? Why not handle the disabled state as a state in the lchan FSM? https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 4796 PS2, Line 4796: DEFUN if we merge this at all, this should be a hidden command that is now displayed to the normal user. -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:01:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:01:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:01:31 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Do not unsolicitedly select a TCH/F In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12623 ) Change subject: lchan_select: Do not unsolicitedly select a TCH/F ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Gerrit-Change-Number: 12623 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:01:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:02:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:02:06 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:02:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:03:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:03:24 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12628 ) Change subject: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 18 Jan 2019 11:03:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:04:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:04:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12627 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc Gerrit-Change-Number: 12627 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 18 Jan 2019 11:04:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:05:16 +0000 Subject: Change in osmo-msc[master]: vty: make 'sh connect/transact' readable again In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12626 ) Change subject: vty: make 'sh connect/transact' readable again ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 Gerrit-Change-Number: 12626 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:05:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:07:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:07:06 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12616 ) Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 18 Jan 2019 11:07:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:07:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:07:18 +0000 Subject: Change in osmo-bts[master]: Rename oc2g config file to match new naming scheme In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12617 ) Change subject: Rename oc2g config file to match new naming scheme ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Gerrit-Change-Number: 12617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 18 Jan 2019 11:07:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:07:30 +0000 Subject: Change in osmo-bts[master]: dump_docs: Use new config file naming scheme In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12618 ) Change subject: dump_docs: Use new config file naming scheme ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I05723ef50deb918ed1131c1d30f8e613351b3be5 Gerrit-Change-Number: 12618 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 18 Jan 2019 11:07:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:07:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:07:46 +0000 Subject: Change in osmo-bts[master]: Rename oc2g config file to match new naming scheme In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12617 ) Change subject: Rename oc2g config file to match new naming scheme ...................................................................... Rename oc2g config file to match new naming scheme examples/oc2g/osmo-bts.cfg->examples/oc2g/osmo-bts-oc2g.cfg Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Related: SYS#4444 --- M contrib/systemd/osmo-bts-oc2g.service R doc/examples/oc2g/osmo-bts-oc2g.cfg 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index 2f2d837..7b0168a 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -5,7 +5,7 @@ Type=simple ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' -ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts-oc2g.cfg -M ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' Restart=always diff --git a/doc/examples/oc2g/osmo-bts.cfg b/doc/examples/oc2g/osmo-bts-oc2g.cfg similarity index 100% rename from doc/examples/oc2g/osmo-bts.cfg rename to doc/examples/oc2g/osmo-bts-oc2g.cfg -- To view, visit https://gerrit.osmocom.org/12617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie49d5695ea78da2995252c56c75ce42e6cec0e9c Gerrit-Change-Number: 12617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:07:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 18 Jan 2019 11:07:46 +0000 Subject: Change in osmo-bts[master]: dump_docs: Use new config file naming scheme In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12618 ) Change subject: dump_docs: Use new config file naming scheme ...................................................................... dump_docs: Use new config file naming scheme Change-Id: I05723ef50deb918ed1131c1d30f8e613351b3be5 --- M contrib/dump_docs.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/dump_docs.py b/contrib/dump_docs.py index 59f2a61..bdf27c4 100755 --- a/contrib/dump_docs.py +++ b/contrib/dump_docs.py @@ -10,7 +10,7 @@ env['L1FWD_BTS_HOST'] = '127.0.0.1' bts_proc = subprocess.Popen(["./src/osmo-bts-sysmo/sysmobts-remote", - "-c", "./doc/examples/sysmo/osmo-bts.cfg"], env = env, + "-c", "./doc/examples/sysmo/osmo-bts-sysmo.cfg"], env = env, stdin=None, stdout=None) time.sleep(1) -- To view, visit https://gerrit.osmocom.org/12618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I05723ef50deb918ed1131c1d30f8e613351b3be5 Gerrit-Change-Number: 12618 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:11:02 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 11:11:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12620 to look at the new patch set (#3). Change subject: WIP: BSC_Tests: Add tests to check channel allocator ...................................................................... WIP: BSC_Tests: Add tests to check channel allocator When a channel is assigned via the assignment request throught the A interface, the MSC may offer either FR, HR or both. When FR and HR are permitted, a preference is set on one of the two. At the moment we do not check how the bsc is reacting to those preferences and its also not checked how the behavior is when the preferred rate is not available because all lchan of that type are already in use. Lets add a set of tests to verify this. Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Depends: osmo-bsc I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 304 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/12620/3 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:11:20 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 11:11:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12620 to look at the new patch set (#4). Change subject: BSC_Tests: Add tests to check channel allocator ...................................................................... BSC_Tests: Add tests to check channel allocator When a channel is assigned via the assignment request throught the A interface, the MSC may offer either FR, HR or both. When FR and HR are permitted, a preference is set on one of the two. At the moment we do not check how the bsc is reacting to those preferences and its also not checked how the behavior is when the preferred rate is not available because all lchan of that type are already in use. Lets add a set of tests to verify this. Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Depends: osmo-bsc I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 304 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/12620/4 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 11:37:07 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 Jan 2019 11:37:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: change default for mp_vlr_name In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/12562 ) Change subject: MSC_Tests: change default for mp_vlr_name ...................................................................... Abandoned This was a misunderstanding, we don't need to change it. -- To view, visit https://gerrit.osmocom.org/12562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2bcfff8e2413437b92b744b2645e8e0024684bb1 Gerrit-Change-Number: 12562 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 12:01:12 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 18 Jan 2019 12:01:12 +0000 Subject: Change in osmo-msc[master]: vty: make 'sh connect/transact' readable again In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12626 ) Change subject: vty: make 'sh connect/transact' readable again ...................................................................... vty: make 'sh connect/transact' readable again After recent changes to vlr_subscr_name() result became variable-length which messes up old vty code. Fix this by moving it to the very end and adjusting headers as necessary. While at it, make sure we don't print headers if we have nothing else to show. Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 --- M src/libmsc/msc_vty.c 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 1fdf560..93d093f 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -550,15 +550,21 @@ static void vty_conn_hdr(struct vty *vty) { - vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s", - VTY_NEWLINE); + unsigned lnum = 0; + struct ran_conn *conn; + + llist_for_each_entry(conn, &gsmnet->ran_conns, entry) + lnum++; + + if (lnum) + vty_out(vty, "--ConnId RAN --LAC Use --Tokens C A5 State ------------ Subscriber%s", + VTY_NEWLINE); } static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn) { - vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", + vty_out(vty, "%08x %3s %5u %3u %08x %c /%1u %27s %22s%s", conn->a.conn_id, - conn->vsub ? vlr_subscr_name(conn->vsub) : "-", conn->via_ran == OSMO_RAT_UTRAN_IU ? "Iu" : "A", conn->lac, conn->use_count, @@ -566,6 +572,7 @@ conn->received_cm_service_request ? 'C' : '-', conn->geran_encr.alg_id, conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-", + conn->vsub ? vlr_subscr_name(conn->vsub) : "-", VTY_NEWLINE); } @@ -583,8 +590,15 @@ static void vty_trans_hdr(struct vty *vty) { - vty_out(vty, "------------Subscriber --ConnId -P TI -CallRef Proto%s", - VTY_NEWLINE); + unsigned lnum = 0; + struct gsm_trans *trans; + + llist_for_each_entry(trans, &gsmnet->trans_list, entry) + lnum++; + + if (lnum) + vty_out(vty, "--ConnId -P TI -CallRef [--- Proto ---] ------------ Subscriber%s", + VTY_NEWLINE); } static const char *get_trans_proto_str(const struct gsm_trans *trans) @@ -613,13 +627,14 @@ static void vty_dump_one_trans(struct vty *vty, const struct gsm_trans *trans) { - vty_out(vty, "%22s %08x %s %02u %08x %s%s", - trans->vsub ? vlr_subscr_name(trans->vsub) : "-", + vty_out(vty, "%08x %s %02u %08x [%s] %22s%s", trans->conn ? trans->conn->a.conn_id : 0, gsm48_pdisc_name(trans->protocol), trans->transaction_id, trans->callref, - get_trans_proto_str(trans), VTY_NEWLINE); + get_trans_proto_str(trans), + trans->vsub ? vlr_subscr_name(trans->vsub) : "-", + VTY_NEWLINE); } DEFUN(show_msc_transaction, show_msc_transaction_cmd, -- To view, visit https://gerrit.osmocom.org/12626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 Gerrit-Change-Number: 12626 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 18 14:49:56 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 Jan 2019 14:49:56 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12616 ) Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Patch Set 1: You are basing everything (meta-telephony and meta-sysmo-bsp) on 201705, but afaik all OC2G support was added after last osmo-bts release (please tell me if I'm wrong), so I think it makes more sense to do all osmo-bts-oc2g on laforge/nightly rather than 201705. This way this patch is not needed, and your osmo-bts.bb patches on top of meta-sysmo-bsp laforge/nightly. Then once we make a new release we merge everything into 201705 and we are done. What do you think? -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 18 Jan 2019 14:49:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 19 00:17:54 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 19 Jan 2019 00:17:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,1,osmocom-master-debian9,none,False_#1176?= Message-ID: <1905692773.627.1547857074967.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 58.58 KB...] more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC comp128.lo CC rxlev_stat.lo CC tlv_parser.lo CC gsm_utils.lo CC comp128v23.lo CC gsm48.lo CC rsl.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:453:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo CC gsup_sms.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/ctrl make[2]: Entering directory ' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo /bin/bash: line 2: 6835 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -DBUILDING_LIBOSMOCORE -Wall -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT control_if.lo -MD -MP -MF $depbase.Tpo -c -o control_if.lo control_if.c Makefile:485: recipe for target 'control_if.lo' failed make[2]: *** [control_if.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:13 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:13 +0000 Subject: Change in gr-gsm[master]: python/trx: use CamelCase naming for basic classes Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12629 Change subject: python/trx: use CamelCase naming for basic classes ...................................................................... python/trx: use CamelCase naming for basic classes Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9 --- M apps/grgsm_trx M python/trx/__init__.py M python/trx/ctrl_if.py M python/trx/ctrl_if_bb.py M python/trx/fake_pm.py M python/trx/radio_if.py M python/trx/radio_if_grc.py M python/trx/udp_link.py 8 files changed, 25 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/29/12629/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 6b3565d..23268b8 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -29,9 +29,9 @@ from argparse import ArgumentTypeError from gnuradio import eng_notation -from grgsm.trx import ctrl_if_bb -from grgsm.trx import radio_if -from grgsm.trx import fake_pm +from grgsm.trx import CTRLInterfaceBB +from grgsm.trx import RadioInterface +from grgsm.trx import FakePM COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ @@ -60,7 +60,7 @@ def run(self): # Init Radio interface - self.radio = radio_if(self.phy_args, self.phy_sample_rate, + self.radio = RadioInterface(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, self.phy_rx_antenna, self.phy_tx_antenna, self.phy_freq_offset, self.bind_addr, @@ -69,10 +69,10 @@ # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 - self.pm = fake_pm(-120, -105, -75, -50) + self.pm = FakePM(-120, -105, -75, -50) # Init TRX CTRL interface - self.server = ctrl_if_bb( + self.server = CTRLInterfaceBB( self.remote_addr, self.base_port + 101, self.bind_addr, self.base_port + 1, self.radio, self.pm) @@ -122,7 +122,7 @@ help = "Set device arguments") phy_group.add_argument("-s", "--sample-rate", dest = "sample_rate", type = eng_float, - default = radio_if.SAMPLE_RATE, + default = RadioInterface.SAMPLE_RATE, help = "Set samp_rate (default %(default)s)") phy_group.add_argument("-g", "--rx-gain", dest = "rx_gain", type = float, default = 30, diff --git a/python/trx/__init__.py b/python/trx/__init__.py index fda783e..c512262 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -20,10 +20,11 @@ This is a set of helper classes for the grgsm_trx application. ''' -from udp_link import udp_link -from ctrl_if import ctrl_if -from ctrl_if_bb import ctrl_if_bb -from fake_pm import fake_pm -from radio_if_grc import radio_if_grc -from radio_if import radio_if +from udp_link import UDPLink +from ctrl_if import CTRLInterface +from ctrl_if_bb import CTRLInterfaceBB +from fake_pm import FakePM +from radio_if_grc import RadioInterfaceGRC +from radio_if import RadioInterface + from dict_toggle_sign import dict_toggle_sign diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py index ae5cf05..fc43b7f 100644 --- a/python/trx/ctrl_if.py +++ b/python/trx/ctrl_if.py @@ -22,9 +22,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from grgsm.trx import udp_link +from grgsm.trx import UDPLink -class ctrl_if(udp_link): +class CTRLInterface(UDPLink): def handle_rx(self, data, remote): if self.verify_req(data): request = self.prepare_req(data) diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index fe0002e..781c35c 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -23,11 +23,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import grgsm -from ctrl_if import ctrl_if -class ctrl_if_bb(ctrl_if): +from ctrl_if import CTRLInterface + +class CTRLInterfaceBB(CTRLInterface): def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): - ctrl_if.__init__(self, remote_addr, remote_port, + CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) print("[i] Init CTRL interface (%s)" % self.desc_link()) diff --git a/python/trx/fake_pm.py b/python/trx/fake_pm.py index 72cf771..1d76916 100644 --- a/python/trx/fake_pm.py +++ b/python/trx/fake_pm.py @@ -24,7 +24,7 @@ from random import randint -class fake_pm: +class FakePM: # Freq. list for good power level bts_list = [] diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 49e6788..55c8d92 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -40,7 +40,7 @@ from dict_toggle_sign import dict_toggle_sign -class radio_if(gr.top_block): +class RadioInterface(gr.top_block): # PHY specific variables rx_freq = 935e6 tx_freq = 890e6 diff --git a/python/trx/radio_if_grc.py b/python/trx/radio_if_grc.py index 8a92f6e..fb9b100 100755 --- a/python/trx/radio_if_grc.py +++ b/python/trx/radio_if_grc.py @@ -24,7 +24,7 @@ import time -class radio_if_grc(gr.top_block): +class RadioInterfaceGRC(gr.top_block): def __init__(self, delay_correction=285.616e-6, osr=4, ppm=-0.799427, rx_freq=935e6+36*0.2e6, rx_gain=40, samp_rate=13e6/12.0, timing_advance=0, trx_base_port="5710", trx_remote_addr="127.0.0.1", tx_freq=935e6+36*0.2e6-45e6, tx_gain=40, uplink_shift=-(6.0/1625000*(156.25)*3)): gr.top_block.__init__(self, "Trx radio interface") @@ -255,7 +255,7 @@ return parser -def main(top_block_cls=radio_if_grc, options=None): +def main(top_block_cls=RadioInterfaceGRC, options=None): if options is None: options, _ = argument_parser().parse_args() diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index ad84e5a..f726751 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -25,7 +25,7 @@ import socket import select -class udp_link: +class UDPLink: def __init__(self, remote_addr, remote_port, bind_addr = '0.0.0.0', bind_port = 0): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) -- To view, visit https://gerrit.osmocom.org/12629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9 Gerrit-Change-Number: 12629 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:13 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:13 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: move init code from run() to __init__() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12630 Change subject: apps/grgsm_trx: move init code from run() to __init__() ...................................................................... apps/grgsm_trx: move init code from run() to __init__() Change-Id: I1bcc9c8a2d37d156bbec93be3838200f6c4a80c2 --- M apps/grgsm_trx 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/30/12630/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 23268b8..7eeea50 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -3,7 +3,7 @@ # GR-GSM based transceiver # -# (C) 2016-2018 by Vadim Yanitskiy +# (C) 2016-2019 by Vadim Yanitskiy # (C) 2017-2018 by Piotr Krysik # # All Rights Reserved @@ -58,7 +58,6 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) - def run(self): # Init Radio interface self.radio = RadioInterface(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, @@ -79,6 +78,7 @@ print("[i] Init complete") + def run(self): # Enter main loop while True: self.server.loop() -- To view, visit https://gerrit.osmocom.org/12630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bcc9c8a2d37d156bbec93be3838200f6c4a80c2 Gerrit-Change-Number: 12630 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:13 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:13 +0000 Subject: Change in gr-gsm[master]: python/trx: get rid of FakePM class Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12631 Change subject: python/trx: get rid of FakePM class ...................................................................... python/trx: get rid of FakePM class Change-Id: Ie96eb9735ecaa3329135c7be976ffd277a2f64f4 --- M apps/grgsm_trx M python/trx/CMakeLists.txt M python/trx/__init__.py M python/trx/ctrl_if_bb.py D python/trx/fake_pm.py M python/trx/radio_if.py 6 files changed, 8 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/31/12631/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 7eeea50..c3e83d9 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -31,7 +31,6 @@ from grgsm.trx import CTRLInterfaceBB from grgsm.trx import RadioInterface -from grgsm.trx import FakePM COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ @@ -65,16 +64,11 @@ self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) - # Power measurement emulation - # Noise: -120 .. -105 - # BTS: -75 .. -50 - self.pm = FakePM(-120, -105, -75, -50) - # Init TRX CTRL interface self.server = CTRLInterfaceBB( self.remote_addr, self.base_port + 101, self.bind_addr, self.base_port + 1, - self.radio, self.pm) + self.radio) print("[i] Init complete") diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index ffe5234..4333407 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -23,7 +23,6 @@ udp_link.py ctrl_if.py ctrl_if_bb.py - fake_pm.py radio_if.py radio_if_grc.py dict_toggle_sign.py diff --git a/python/trx/__init__.py b/python/trx/__init__.py index c512262..7b20699 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -23,7 +23,6 @@ from udp_link import UDPLink from ctrl_if import CTRLInterface from ctrl_if_bb import CTRLInterfaceBB -from fake_pm import FakePM from radio_if_grc import RadioInterfaceGRC from radio_if import RadioInterface diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 781c35c..f9840d4 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -27,7 +27,7 @@ from ctrl_if import CTRLInterface class CTRLInterfaceBB(CTRLInterface): - def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): + def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb): CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) @@ -35,8 +35,6 @@ # Set link to the follow graph (top block) self.tb = tb - # Power measurement - self.pm = pm def parse_cmd(self, request): # Power control @@ -137,10 +135,7 @@ # TODO: check freq range meas_freq = int(request[1]) * 1000 - - # HACK: send fake low power values - # until actual power measurement is implemented - meas_dbm = str(self.pm.measure(meas_freq)) + meas_dbm = str(self.tb.measure(meas_freq)) return (0, [meas_dbm]) diff --git a/python/trx/fake_pm.py b/python/trx/fake_pm.py deleted file mode 100644 index 1d76916..0000000 --- a/python/trx/fake_pm.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -# Virtual Um-interface (fake transceiver) -# Power measurement emulation for BB -# -# (C) 2017 by Vadim Yanitskiy -# -# 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, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -from random import randint - -class FakePM: - # Freq. list for good power level - bts_list = [] - - def __init__(self, noise_min, noise_max, bts_min, bts_max): - # Save power level ranges - self.noise_min = noise_min - self.noise_max = noise_max - self.bts_min = bts_min - self.bts_max = bts_max - - def measure(self, bts): - if bts in self.bts_list: - return randint(self.bts_min, self.bts_max) - else: - return randint(self.noise_min, self.noise_max) - - def update_bts_list(self, new_list): - self.bts_list = new_list - - def add_bts_list(self, add_list): - self.bts_list += add_list - - def del_bts_list(self, del_list): - for item in del_list: - if item in self.bts_list: - self.bts_list.remove(item) diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 55c8d92..32b767a 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -26,6 +26,7 @@ import pmt import time import grgsm +import random from math import pi @@ -290,3 +291,7 @@ print("[i] Setting TA value %d" % ta) advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 self.tx_time_setter.set_timing_advance(advance_time_sec) + + def measure(self, freq): + # HACK: generate a random low RSSI value + return random.randint(-120, -100) -- To view, visit https://gerrit.osmocom.org/12631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie96eb9735ecaa3329135c7be976ffd277a2f64f4 Gerrit-Change-Number: 12631 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:14 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:14 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: do not init both rx_freq and tx_freq Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12632 Change subject: trx/radio_if.py: do not init both rx_freq and tx_freq ...................................................................... trx/radio_if.py: do not init both rx_freq and tx_freq Change-Id: I9f251958ec90141d144fdb027aff20182131a1d1 --- M python/trx/radio_if.py 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/32/12632/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 32b767a..93080c4 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -4,7 +4,7 @@ # GR-GSM based transceiver # Follow graph implementation # -# (C) 2016-2018 by Vadim Yanitskiy +# (C) 2016-2019 by Vadim Yanitskiy # (C) 2017 by Piotr Krysik # # All Rights Reserved @@ -43,8 +43,8 @@ class RadioInterface(gr.top_block): # PHY specific variables - rx_freq = 935e6 - tx_freq = 890e6 + rx_freq = None + tx_freq = None osr = 4 # Application state flags @@ -65,6 +65,10 @@ # The current value is measured for USRP B2X0 at 26e6. delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 + # Dummy freq. value that is used during initialization + # basically, the DL freq. of ARFCN 0 + DUMMY_FREQ = 935e6 + def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, @@ -95,7 +99,6 @@ channels=range(1))) self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_src.set_center_freq(self.rx_freq, 0) self.phy_src.set_antenna(phy_rx_antenna, 0) self.phy_src.set_samp_rate(phy_sample_rate) self.phy_src.set_bandwidth(650e3, 0) @@ -103,8 +106,7 @@ self.msg_to_tag_src = grgsm.msg_to_tag() - self.rotator_src = grgsm.controlled_rotator_cc( - self.calc_phase_inc(self.rx_freq)) + self.rotator_src = grgsm.controlled_rotator_cc(0.0) self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) @@ -148,7 +150,6 @@ self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) self.phy_sink.set_antenna(phy_tx_antenna, 0) self.phy_sink.set_samp_rate(phy_sample_rate) - self.phy_sink.set_center_freq(self.tx_freq, 0) self.phy_sink.set_gain(self.tx_gain) self.tx_time_setter = grgsm.txtime_setter( @@ -169,8 +170,7 @@ self.msg_to_tag_sink = grgsm.msg_to_tag() - self.rotator_sink = grgsm.controlled_rotator_cc( - -self.calc_phase_inc(self.tx_freq)) + self.rotator_sink = grgsm.controlled_rotator_cc(0.0) # Connections self.msg_connect( @@ -225,8 +225,9 @@ # AFC (Automatic Frequency Correction) + # NOTE: dummy frequency is used during init self.gsm_clck_ctrl = grgsm.clock_offset_control( - self.rx_freq, phy_sample_rate, osr = self.osr) + self.DUMMY_FREQ, phy_sample_rate, osr = self.osr) self.dict_toggle_sign = dict_toggle_sign() -- To view, visit https://gerrit.osmocom.org/12632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f251958ec90141d144fdb027aff20182131a1d1 Gerrit-Change-Number: 12632 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:14 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:14 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: introduce a new @property 'ready' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12633 Change subject: trx/radio_if.py: introduce a new @property 'ready' ...................................................................... trx/radio_if.py: introduce a new @property 'ready' Change-Id: I513da0f45c6a608d15fbd0e8eafe14d6af8833d7 --- M python/trx/radio_if.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/33/12633/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 93080c4..e15add2 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -259,6 +259,16 @@ self.stop() self.wait() + @property + def ready(self): + # RX / TX frequencies shall be set + if self.rx_freq is None: + return False + if self.tx_freq is None: + return False + + return True + def calc_phase_inc(self, fc): return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate -- To view, visit https://gerrit.osmocom.org/12633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I513da0f45c6a608d15fbd0e8eafe14d6af8833d7 Gerrit-Change-Number: 12633 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:14 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:14 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if_bb.py: reset transceiver on POWEROFF Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12634 Change subject: trx/ctrl_if_bb.py: reset transceiver on POWEROFF ...................................................................... trx/ctrl_if_bb.py: reset transceiver on POWEROFF Change-Id: I1e7f74c56388a431794a0b32b8a9537c360f5d33 --- M python/trx/ctrl_if_bb.py M python/trx/radio_if.py 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/34/12634/1 diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index f9840d4..0e194d0 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -63,6 +63,9 @@ self.tb.stop() self.tb.wait() + # POWEROFF is also used to reset transceiver + self.tb.reset() + return 0 # Gain control diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index e15add2..ed5a8de 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -269,6 +269,12 @@ return True + def reset(self): + # TODO: do we need to reset both RX / TX freq.? + # self.rx_freq = None + # self.tx_freq = None + self.set_ta(0) + def calc_phase_inc(self, fc): return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate -- To view, visit https://gerrit.osmocom.org/12634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e7f74c56388a431794a0b32b8a9537c360f5d33 Gerrit-Change-Number: 12634 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:15 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:15 +0000 Subject: Change in gr-gsm[master]: python/trx: introduce and use Transceiver class Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12635 Change subject: python/trx: introduce and use Transceiver class ...................................................................... python/trx: introduce and use Transceiver class Change-Id: I6dc88edbb69a68746cc8e01206dc86f7ea2fa80f --- M apps/grgsm_trx M python/trx/CMakeLists.txt M python/trx/__init__.py M python/trx/ctrl_if_bb.py M python/trx/radio_if.py A python/trx/transceiver.py 6 files changed, 142 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/35/12635/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index c3e83d9..5e5e3be 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -29,8 +29,8 @@ from argparse import ArgumentTypeError from gnuradio import eng_notation -from grgsm.trx import CTRLInterfaceBB from grgsm.trx import RadioInterface +from grgsm.trx import Transceiver COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ @@ -64,18 +64,17 @@ self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) - # Init TRX CTRL interface - self.server = CTRLInterfaceBB( - self.remote_addr, self.base_port + 101, - self.bind_addr, self.base_port + 1, - self.radio) + # Init Transceiver + self.trx = Transceiver(self.bind_addr, + self.remote_addr, self.base_port, + radio_if = self.radio) print("[i] Init complete") def run(self): # Enter main loop while True: - self.server.loop() + self.trx.ctrl_if.loop() def shutdown(self): print("[i] Shutting down...") diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index 4333407..11290f3 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -25,6 +25,7 @@ ctrl_if_bb.py radio_if.py radio_if_grc.py + transceiver.py dict_toggle_sign.py DESTINATION ${GR_PYTHON_DIR}/grgsm/trx ) diff --git a/python/trx/__init__.py b/python/trx/__init__.py index 7b20699..00d370b 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -25,5 +25,6 @@ from ctrl_if_bb import CTRLInterfaceBB from radio_if_grc import RadioInterfaceGRC from radio_if import RadioInterface +from transceiver import Transceiver from dict_toggle_sign import dict_toggle_sign diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 0e194d0..4814263 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -4,7 +4,7 @@ # GR-GSM based transceiver # CTRL interface for OsmocomBB # -# (C) 2016-2017 by Vadim Yanitskiy +# (C) 2016-2019 by Vadim Yanitskiy # # All Rights Reserved # @@ -22,49 +22,32 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import grgsm - from ctrl_if import CTRLInterface class CTRLInterfaceBB(CTRLInterface): - def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb): - CTRLInterface.__init__(self, remote_addr, remote_port, - bind_addr, bind_port) - + def __init__(self, trx, *ctrl_if_args): + CTRLInterface.__init__(self, *ctrl_if_args) print("[i] Init CTRL interface (%s)" % self.desc_link()) - # Set link to the follow graph (top block) - self.tb = tb + # Transceiver instance we belong to + self.trx = trx def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): print("[i] Recv POWERON CMD") - # Ensure transceiver isn't working - if self.tb.trx_started: - print("[!] Transceiver already started") + # Start transceiver + if not self.trx.start(): return -1 - print("[i] Starting transceiver...") - self.tb.trx_started = True - self.tb.start() - return 0 elif self.verify_cmd(request, "POWEROFF", 0): print("[i] Recv POWEROFF cmd") - # TODO: flush all buffers between blocks - if self.tb.trx_started: - print("[i] Stopping transceiver...") - self.tb.trx_started = False - self.tb.set_ta(0) - self.tb.stop() - self.tb.wait() - - # POWEROFF is also used to reset transceiver - self.tb.reset() + # Stop transceiver + self.trx.stop() return 0 @@ -74,7 +57,7 @@ # TODO: check gain value gain = int(request[1]) - self.tb.set_rx_gain(gain) + self.trx.radio_if.set_rx_gain(gain) return 0 @@ -83,7 +66,7 @@ # TODO: check gain value gain = int(request[1]) - self.tb.set_tx_gain(gain) + self.trx.radio_if.set_tx_gain(gain) return 0 @@ -93,7 +76,7 @@ # TODO: check freq range freq = int(request[1]) * 1000 - self.tb.set_rx_freq(freq) + self.trx.radio_if.set_rx_freq(freq) return 0 @@ -102,7 +85,7 @@ # TODO: check freq range freq = int(request[1]) * 1000 - self.tb.set_tx_freq(freq) + self.trx.radio_if.set_tx_freq(freq) return 0 @@ -116,19 +99,12 @@ print("[!] TS index should be in range: 0..7") return -1 - # Ignore timeslot type for now + # Channel combination number (see GSM TS 05.02) + # TODO: check this value config = int(request[2]) - print("[i] Configure timeslot filter to: %s" - % ("drop all" if config == 0 else "TS %d" % tn)) - if config == 0: - # Value 0 means 'drop all' - self.tb.ts_filter.set_policy( - grgsm.FILTER_POLICY_DROP_ALL) - else: - self.tb.ts_filter.set_policy( - grgsm.FILTER_POLICY_DEFAULT) - self.tb.ts_filter.set_tn(tn) + # TODO: check return value + self.trx.radio_if.set_slot(tn, config) return 0 @@ -138,9 +114,11 @@ # TODO: check freq range meas_freq = int(request[1]) * 1000 - meas_dbm = str(self.tb.measure(meas_freq)) + meas_dbm = self.trx.measure(meas_freq) + if meas_dbm is None: + return -1 - return (0, [meas_dbm]) + return (0, [str(meas_dbm)]) # Timing Advance control elif self.verify_cmd(request, "SETTA", 1): @@ -152,7 +130,7 @@ print("[!] TA value must be in range: 0..63") return -1 - self.tb.set_ta(ta) + self.trx.radio_if.set_ta(ta) return 0 # Misc diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index ed5a8de..ec9cd5f 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -47,9 +47,6 @@ tx_freq = None osr = 4 - # Application state flags - trx_started = False - # GSM timings (in microseconds [uS]) # One timeslot duration is 576.9 ?s = 15/26 ms, # or 156.25 symbol periods (a symbol period is 48/13 ?s) @@ -304,6 +301,20 @@ self.phy_sink.set_gain(gain, 0) self.tx_gain = gain + def set_slot(self, slot, config): + print("[i] Configure timeslot filter to: %s" + % ("drop all" if config == 0 else "tn=%d" % slot)) + + if config == 0: + # Value 0 is used for deactivation + self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) + else: + # FIXME: ideally, we should (re)configure the Receiver + # block, but there is no API for that, and hard-coded + # timeslot configuration is used... + self.ts_filter.set_policy(grgsm.FILTER_POLICY_DEFAULT) + self.ts_filter.set_tn(slot) + def set_ta(self, ta): print("[i] Setting TA value %d" % ta) advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 diff --git a/python/trx/transceiver.py b/python/trx/transceiver.py new file mode 100644 index 0000000..837a61f --- /dev/null +++ b/python/trx/transceiver.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# GR-GSM based transceiver +# Transceiver implementation +# +# (C) 2018-2019 by Vadim Yanitskiy +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +from ctrl_if_bb import CTRLInterfaceBB + +class Transceiver: + """ Base transceiver implementation. + + Represents a single transceiver, that can be used as for the BTS side, + as for the MS side. Each individual instance of Transceiver unifies + three basic interfaces built on three independent UDP connections: + + - CLCK (base port + 100/0) - clock indications from TRX to L1, + - CTRL (base port + 101/1) - control interface for L1, + - DATA (base port + 102/2) - bidirectional data interface for bursts. + + A transceiver can be either in active (i.e. working), or in idle mode. + + NOTE: both CLCK and DATA interfaces are handled by the flow-graph, + (see RadioInterface), so we only initialize CTRL interface. + + """ + + def __init__(self, bind_addr, remote_addr, base_port, radio_if): + # Connection info + self.remote_addr = remote_addr + self.bind_addr = bind_addr + self.base_port = base_port + + # Execution state (running or idle) + self.running = False + + # Radio interface (handles both CLCK and DATA interfaces) + self.radio_if = radio_if + + # Init CTRL interface + self.ctrl_if = CTRLInterfaceBB(self, + remote_addr, base_port + 101, + bind_addr, base_port + 1) + + def start(self): + # Check execution state + if self.running: + print("[!] Transceiver is already started") + return False + + # Make sure that Radio interface is ready, i.e. + # all parameters (e.g. RX / RX freq) are set. + if not self.radio_if.ready: + print("[!] RadioInterface is not ready") + return False + + print("[i] Starting transceiver...") + self.radio_if.start() + self.running = True + + return True + + def stop(self): + # POWEROFF is also used to reset transceiver, + # so we should not complain that it isn't running. + if not self.running: + print("[i] Resetting transceiver") + self.radio_if.reset() + return + + print("[i] Stopping transceiver...") + + # TODO: flush all buffers between blocks + self.radio_if.stop() + self.radio_if.wait() + + self.running = False + + def measure(self, freq): + # TODO: transceiver should be in idle mode + return self.radio_if.measure(freq) -- To view, visit https://gerrit.osmocom.org/12635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6dc88edbb69a68746cc8e01206dc86f7ea2fa80f Gerrit-Change-Number: 12635 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:15 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:15 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: do not print anything if freq. shift is 0 Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12636 Change subject: trx/radio_if.py: do not print anything if freq. shift is 0 ...................................................................... trx/radio_if.py: do not print anything if freq. shift is 0 Change-Id: I100ce2ab8effc00e164e13253894445bdc816f06 --- M python/trx/radio_if.py 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/36/12636/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index ec9cd5f..4032850 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -276,19 +276,21 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - fc += self.freq_offset - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset))) + if self.freq_offset != 0: + fc += self.freq_offset + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - fc += self.freq_offset - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset))) + if self.freq_offset != 0: + fc += self.freq_offset + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/12636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I100ce2ab8effc00e164e13253894445bdc816f06 Gerrit-Change-Number: 12636 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 04:37:16 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 19 Jan 2019 04:37:16 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: update clock_offset_control in set_rx_freq() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12637 Change subject: trx/radio_if.py: update clock_offset_control in set_rx_freq() ...................................................................... trx/radio_if.py: update clock_offset_control in set_rx_freq() Change-Id: I065bf664f775099c90c123c9ff75f262a73bf1be --- M python/trx/radio_if.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/37/12637/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 4032850..4c678e7 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -283,6 +283,7 @@ eng_notation.num_to_str(self.freq_offset))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) + self.gsm_clck_ctrl.set_fc(fc) self.rx_freq = fc def set_tx_freq(self, fc): -- To view, visit https://gerrit.osmocom.org/12637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I065bf664f775099c90c123c9ff75f262a73bf1be Gerrit-Change-Number: 12637 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 19 06:51:23 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 19 Jan 2019 06:51:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-simtrace2_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#257?= In-Reply-To: <2049009598.624.1547794345959.JavaMail.jenkins@jenkins.osmocom.org> References: <2049009598.624.1547794345959.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1346845267.639.1547880683716.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 47.98 KB...] Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC gsm_utils.lo CC rsl.lo CC comp128.lo CC comp128v23.lo CC gsm48.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:453:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC apn.lo CC gsup.lo CC gsup_sms.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_mapping.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_ns.lo CC common_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/ctrl make[2]: Entering directory ' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la ' libtool: warning: relinking 'libosmoctrl.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmoctrl.map -version-info 3:0:3 -no-undefined -o libosmoctrl.la -rpath control_cmd.lo control_if.lo fsm_ctrl_commands.lo control_vty.lo -ltalloc ../../src/libosmocore.la ../../src/gsm/libosmogsm.la ../../src/vty/libosmovty.la ) libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/sim make[2]: Entering directory ' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_isim.lo /bin/bash: line 2: 23331 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT reader.lo -MD -MP -MF $depbase.Tpo -c -o reader.lo reader.c Makefile:501: recipe for target 'reader.lo' failed make[2]: *** [reader.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Jan 19 07:39:42 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 19 Jan 2019 07:39:42 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_?= =?UTF-8?Q?=C2=BB_master,1,osmocom-master-debian9,none,False_#1177?= In-Reply-To: <1905692773.627.1547857074967.JavaMail.jenkins@jenkins.osmocom.org> References: <1905692773.627.1547857074967.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1618673610.641.1547883582358.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:03:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:03:54 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12483 ) Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 19 Jan 2019 21:03:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:03:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:03:57 +0000 Subject: Change in libosmocore[master]: LCLS: add status parameter to Assignment Completed message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12483 ) Change subject: LCLS: add status parameter to Assignment Completed message ...................................................................... LCLS: add status parameter to Assignment Completed message * add gsm0808_create_ass_compl2() with additional gsm0808_lcls_status parameter and make gsm0808_create_ass_compl() into trivial wrapper around it * update tests accordingly Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 4 files changed, 43 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 782f3ec..6d14e13 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -76,6 +76,12 @@ const struct gsm0808_speech_codec *sc, const struct gsm0808_speech_codec_list *scl); +struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel, + uint8_t encr_alg_id, uint8_t speech_mode, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec *sc, + const struct gsm0808_speech_codec_list *scl, + enum gsm0808_lcls_status lcls_bss_status); struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 59b1657..fce8e0a 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -519,7 +519,7 @@ return gsm0808_create_ass2(ct, cic, ss, scl, ci, NULL, NULL); } -/*! Create BSSMAP Assignment Completed message +/*! Create BSSMAP Assignment Completed message as per 3GPP TS 48.008 ?3.2.1.2 * \param[in] rr_cause GSM 04.08 RR Cause value * \param[in] chosen_channel Chosen Channel * \param[in] encr_alg_id Encryption Algorithm ID @@ -527,13 +527,14 @@ * \param[in] ss Socket Address of BSS-side RTP socket * \param[in] sc Speech Codec (current) * \param[in] scl Speech Codec List (permitted) + * \param[in] lcls_bss_status ?3.2.2.119 LCLS-BSS-Status, optional * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ -struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, +struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode, const struct sockaddr_storage *ss, const struct gsm0808_speech_codec *sc, - const struct gsm0808_speech_codec_list - *scl) + const struct gsm0808_speech_codec_list *scl, + enum gsm0808_lcls_status lcls_bss_status) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: ass compl"); @@ -570,7 +571,11 @@ if (scl) gsm0808_enc_speech_codec_list(msg, scl); - /* write LSA identifier 3.2.2.15 */ + /* FIXME: write LSA identifier 3.2.2.15 - see 3GPP TS 43.073 */ + + /* LCLS-BSS-Status 3.2.2.119 */ + if (lcls_bss_status != GSM0808_LCLS_STS_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, lcls_bss_status); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -582,14 +587,33 @@ * \param[in] chosen_channel Chosen Channel * \param[in] encr_alg_id Encryption Algorithm ID * \param[in] speech_mode Speech Mode + * \param[in] ss Socket Address of BSS-side RTP socket + * \param[in] sc Speech Codec (current) + * \param[in] scl Speech Codec List (permitted) + * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ +struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, + uint8_t encr_alg_id, uint8_t speech_mode, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec *sc, + const struct gsm0808_speech_codec_list *scl) +{ + return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id, speech_mode, + ss, sc, scl, GSM0808_LCLS_STS_NA); +} + +/*! Create BSSMAP Assignment Completed message + * \param[in] rr_cause GSM 04.08 RR Cause value + * \param[in] chosen_channel Chosen Channel + * \param[in] encr_alg_id Encryption Algorithm ID + * \param[in] speech_mode Speech Mode * \returns callee-allocated msgb with BSSMAP Assignment Complete message */ struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode) { - return gsm0808_create_ass_compl(rr_cause, chosen_channel, encr_alg_id, - speech_mode, NULL, NULL, NULL); + return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id, + speech_mode, NULL, NULL, NULL, GSM0808_LCLS_STS_NA); } /*! Create BSSMAP Assignment Failure message diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index f9e9b8b..c440a79 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -153,6 +153,7 @@ gsm0808_create_ass2; gsm0808_create_assignment_completed; gsm0808_create_ass_compl; +gsm0808_create_ass_compl2; gsm0808_create_assignment_failure; gsm0808_create_ass_fail; gsm0808_create_cipher; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 546a487..e5c1fd3 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -510,11 +510,12 @@ struct gsm0808_speech_codec sc; struct gsm0808_speech_codec_list sc_list; static const uint8_t res[] = - { 0x00, 0x1d, 0x02, 0x15, 0x23, 0x21, 0x42, 0x2c, 0x11, 0x40, 0x22, + { 0x00, 0x1f, 0x02, 0x15, 0x23, 0x21, 0x42, 0x2c, 0x11, 0x40, 0x22, GSM0808_IE_AOIP_TRASP_ADDR, 0x06, 0xc0, 0xa8, 0x64, 0x17, 0x04, 0xd2, GSM0808_IE_SPEECH_CODEC, 0x01, GSM0808_SCT_HR1 | 0x90, GSM0808_IE_SPEECH_CODEC_LIST, 0x07, GSM0808_SCT_FR3 | 0x50, 0xef, - 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0 }; + 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0, + GSM0808_IE_LCLS_BSS_STATUS, GSM0808_LCLS_STS_LOCALLY_SWITCHED }; struct msgb *msg; memset(&sin, 0, sizeof(sin)); @@ -533,8 +534,8 @@ setup_codec_list(&sc_list); printf("Testing creating Assignment Complete (AoIP)\n"); - msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22, - &ss, &sc, &sc_list); + msg = gsm0808_create_ass_compl2(0x23, 0x42, 0x11, 0x22, + &ss, &sc, &sc_list, GSM0808_LCLS_STS_LOCALLY_SWITCHED); VERIFY(msg, res, ARRAY_SIZE(res)); msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/12483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 Gerrit-Change-Number: 12483 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:06:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:06:01 +0000 Subject: Change in libosmocore[master]: LCLS: make GCR into static member of osmo_lcls In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12568 ) Change subject: LCLS: make GCR into static member of osmo_lcls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I905c36d8455911c68c30bc429379b7313dd46aea Gerrit-Change-Number: 12568 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sat, 19 Jan 2019 21:06:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:06:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:06:03 +0000 Subject: Change in libosmocore[master]: LCLS: make GCR into static member of osmo_lcls In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12568 ) Change subject: LCLS: make GCR into static member of osmo_lcls ...................................................................... LCLS: make GCR into static member of osmo_lcls Most of the time we'll have GCR filled anyway so it make sense to have it as static parameter instead of a pointer to separately allocated structure. Update tests to cover both static and dynamic osmo_lcls allocation variants. Change-Id: I905c36d8455911c68c30bc429379b7313dd46aea --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 3 files changed, 28 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 4a2233e..7c6f707 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -63,7 +63,8 @@ struct osmo_lcls { enum gsm0808_lcls_config config; /**< ?3.2.2.116 Configuration */ enum gsm0808_lcls_control control; /**< ?3.2.2.117 Connection Status Control */ - struct osmo_gcr_parsed *gcr; /**< ?3.2.2.115 Global Call Reference */ + struct osmo_gcr_parsed gcr; /**< ?3.2.2.115 Global Call Reference */ + bool gcr_available; bool corr_needed; /**< ?3.2.2.118 Correlation-Not-Needed */ }; diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2a458c3..9fcccae 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -551,8 +551,8 @@ uint8_t enc = 0; /* LCLS: ?3.2.2.115 Global Call Reference */ - if (lcls->gcr) - enc = gsm0808_enc_gcr(msg, lcls->gcr); + if (lcls->gcr_available) + enc = gsm0808_enc_gcr(msg, &lcls->gcr); /* LCLS: ?3.2.2.116 Configuration */ if (lcls->config != GSM0808_LCLS_CFG_NA) { @@ -581,10 +581,9 @@ * \returns GCR size or negative on error */ int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp) { - int ret = gsm0808_dec_gcr(lcls->gcr, tp); - if (ret < 0) - return ret; + int ret = gsm0808_dec_gcr(&lcls->gcr, tp); + lcls->gcr_available = (ret < 0) ? false : true; lcls->config = tlvp_val8(tp, GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_NA); lcls->control = tlvp_val8(tp, GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_NA); lcls->corr_needed = TLVP_PRESENT(tp, GSM0808_IE_LCLS_CORR_NOT_NEEDED) ? false : true; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index e5c1fd3..90bef21 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -445,17 +445,17 @@ struct sockaddr_in sin; struct gsm0808_speech_codec_list sc_list; uint32_t call_id = 0xDEADFACE; - struct osmo_gcr_parsed gcr = { .net_len = 3, .node = 0xFEED }; uint8_t Kc[16]; struct osmo_lcls lcls = { .config = GSM0808_LCLS_CFG_BOTH_WAY, .control = GSM0808_LCLS_CSC_CONNECT, - .gcr = &gcr, + .gcr = { .net_len = 3, .node = 0xFEED }, + .gcr_available = true, .corr_needed = false }; - memset(gcr.cr, 'A', 5); - memset(gcr.net, 'D', gcr.net_len); + memset(lcls.gcr.cr, 'A', 5); + memset(lcls.gcr.net, 'D', lcls.gcr.net_len); memset(Kc, 'E', 16); memset(&ct, 0, sizeof(ct)); @@ -683,16 +683,16 @@ }; uint8_t len; struct msgb *msg; - struct osmo_gcr_parsed p = { 0 }, g = { - .net_len = 3, - .net = { 0xf1, 0xf2, 0xf3 }, - .node = 0xDEAD, - .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 }, - }; int rc; struct tlv_parsed tp; - struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = { - .gcr = &g, + struct osmo_lcls *lcls_out, lcls_in = { + .gcr = { + .net_len = 3, + .net = { 0xf1, 0xf2, 0xf3 }, + .node = 0xDEAD, + .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 }, + }, + .gcr_available = true, .config = GSM0808_LCLS_CFG_NA, .control = GSM0808_LCLS_CSC_NA, .corr_needed = true, @@ -702,6 +702,10 @@ if (!msg) return; + lcls_out = talloc_zero(msg, struct osmo_lcls); + if (!lcls_out) + return; + len = gsm0808_enc_lcls(msg, &lcls_in); printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); @@ -715,25 +719,25 @@ abort(); } - rc = gsm0808_dec_lcls(&lcls_out, &tp); + rc = gsm0808_dec_lcls(lcls_out, &tp); if (rc < 0) { printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(); } - if (lcls_out.config != lcls_in.config) { + if (lcls_out->config != lcls_in.config) { printf("LCLS Config parsed wrong: %s != %s\n", - gsm0808_lcls_config_name(lcls_out.config), gsm0808_lcls_config_name(lcls_in.config)); + gsm0808_lcls_config_name(lcls_out->config), gsm0808_lcls_config_name(lcls_in.config)); abort(); } - if (lcls_out.control != lcls_in.control) { + if (lcls_out->control != lcls_in.control) { printf("LCLS Control parsed wrong: %s != %s\n", - gsm0808_lcls_control_name(lcls_out.control), gsm0808_lcls_control_name(lcls_in.control)); + gsm0808_lcls_control_name(lcls_out->control), gsm0808_lcls_control_name(lcls_in.control)); abort(); } - if (!osmo_gcr_eq(lcls_out.gcr, lcls_in.gcr)) { + if (!osmo_gcr_eq(&lcls_out->gcr, &lcls_in.gcr)) { printf("GCR parsed wrong.\n"); abort(); } -- To view, visit https://gerrit.osmocom.org/12568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I905c36d8455911c68c30bc429379b7313dd46aea Gerrit-Change-Number: 12568 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:06:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:06:15 +0000 Subject: Change in libosmocore[master]: Prevent GCR encoder/decoder functions from being used directly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12569 ) Change subject: Prevent GCR encoder/decoder functions from being used directly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ae5a3472a20492d5f76170b722e4e2274a5c433 Gerrit-Change-Number: 12569 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 19 Jan 2019 21:06:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:06:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:06:17 +0000 Subject: Change in libosmocore[master]: Prevent GCR encoder/decoder functions from being used directly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12569 ) Change subject: Prevent GCR encoder/decoder functions from being used directly ...................................................................... Prevent GCR encoder/decoder functions from being used directly They only make sense in the context of LCLS so far - let's make sure they're not used by external projects directly instead of gsm0808_*() counterparts. Change-Id: I4ae5a3472a20492d5f76170b722e4e2274a5c433 --- M include/osmocom/gsm/gsm29205.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index f93e34a..9575456 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -37,6 +37,6 @@ uint8_t cr[5]; /** Call Reference ID */ }; -uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); -int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); -- To view, visit https://gerrit.osmocom.org/12569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4ae5a3472a20492d5f76170b722e4e2274a5c433 Gerrit-Change-Number: 12569 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:15:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:15:55 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E12=2E0=2E128-8dfde_=E2=86=92_1=2E0=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12638 Change subject: Bump version: 0.12.0.128-8dfde ? 1.0.0 ...................................................................... Bump version: 0.12.0.128-8dfde ? 1.0.0 Change-Id: I1bd973754b1ebc42283f6a07defa60f58523f5a3 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmocore12.install R debian/libosmogsm11.install M src/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/vty/Makefile.am 9 files changed, 247 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/12638/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 8b5f841..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,16 +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 -libosmogsm gsm0480_l3hdr_push() removed from gsm/gsm0480.h (was not exposed) -libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) -libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() -libosmocore msgb_l4len new symbol (exposed as 'static inline' in msgb.h) -libosmogsm gsm0808_cause_class_name() getter for class description -libosmogsm gsm0808_cause_class() getter for cause class -libosmogsm gsm0808_cause_ext() check for cause extended bit -libosmogsm gsm0808_cause_name() use enum as parameter -libosmogsm gsm0808_create_cipher_reject() use enum as parameter -libosmogsm osmo_gsup_message extended with SMS related fields -libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers -libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers -libosmogsm gsm0808_create_lcls_conn_ctrl() API/ABI break: change parameters from pointers to plain values diff --git a/debian/changelog b/debian/changelog index 606d923..c5de726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,239 @@ +libosmocore (1.0.0) unstable; urgency=medium + + [ K?vin Redon ] + * GSMTAP: add SIM sub_types + * comp128v23 (minor): update original code site and author + + [ Neels Hofmeyr ] + * fix strncpy bugs in gsm/ipa.c + * fix strncpy bugs in socket.c + * cosmetic: osmo-sim-test.c: use memcpy instead of strncpy + * use __FILE__, not __BASE_FILE__ + * log: add 'last' option to 'logging print file' + * gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 + * api doc: fix osmo_quote_str_* + * add osmo_str_tolower() and _toupper() with test + * fix tests linking: don't use system installed libs + * logging vty: add VTY transcript test + * gsm0808: implement BSSMAP Classmark Request + * jenkins: add --enable-external-tests + * logging vty: rewrite 'logging level' vty cmd generation + * logging vty: deprecate the 'everything' keyword + * logging vty: write: check logging levels validity + * logging vty: deprecate 'all', introduce 'force-all' + * Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" + * logging vty: add 'logging level set-all ' + * vty reference: fix deprecation bit evaluation + * vty list: fix deprecation/hidden bit logic + * vty: omit HIDDEN from vty reference + * vty logging: fix crash when missing 'logging enable' + * jenkins: print gcc version in log + * gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie + * add contrib/struct_endianess.py + * gsm0408_test: test encoding and decoding Mobile Identity + * api doc: gsm48_mi_to_string(): warn of return value implementation + * add osmo_bcd2str() + * gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases + * gsm48_generate_mid(): mask out ODD flag from mi_type + * gsm48_mi_to_string(): guard against zero length output buffer + * gsm48_mi_to_string(): do not read from zero length input buffer + * fix api doc for osmo_bcd2str() + * add to osmo_sock_get_name*() API + * add/clean big-endian packed structs (struct_endianess.py) + * define LOGPFSM fmt only once, in LOGPFSMLSRC + * add API doc for LOGPFSM* macros + * LOGPFSM*: guard against fi == NULL + * add LOGPFSMSL(), LOGPFSMSLSRC() + * gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type + * osmo_rat_type: add OSMO_RAT_EUTRAN_SGS + * fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* + * add osmo_mi_name(), for MI-to-string like "IMSI-123456" + * add osmo_lu_type_names[], osmo_lu_type_name() + * change GSM48_CMSERV_* to enum type, add names + * comments: update/fix three 3GPP spec references + + [ Alexander Couzens ] + * ctrl/vty: fsm: use correct element when iterating over fsm->proc.children + * bssgp: introduce flush queue functions + * configure.ac: check clock_gettime for glib < 2.17 + + [ Harald Welte ] + * gsm0480: Factor out msgb allocation helper function + * USSD: Introduce gsm0480_gen_ussd_resp_7bit() + * 04.80: New gsm0480_gen_{reject,return_error}() functions + * import oap_client into libosmogsm + * oap_client: Rename symbols with osmo_ prefix + * import oap_client_test from osmo-sgsn + * cosmetic: More context / naming / comment for test_idtag_parsing() + * Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() + * jenkins_arm.sh: Use same Werror related options as on other builds + * re-introduce ipa_ccm_idtag_parse_off() + * debian/rules: Don't overwrite .tarball-version + * Add RSPRO support to IPA and logging definitions + * Add new osmo-config-merge utility + * logging_vty: Ensure writing well-formed config files + * osmo-config-merge: Don't use C99 'for' loop initial declarations + * Revert "osmo-config-merge: Add manual page" + * osmo-config-merge: fclose() what we fopen() + * timerfd_create(): Fix error handling of osmo_fd_register() + * telnet_interface: avoid double-close of fd() + * vty.c: Set vty->fd to -1 after closing the FD + * SGsAP protocol definitions (header + C file) + * gsm23003: Add MME domain name related helper functions + * Fix VTY documentation error introduced in "bind" VTY port change + + [ Vadim Yanitskiy ] + * vty/vty.c: remove dead unused tall_bsc_ctx + * gsm/gsm0480.c: prevent NULL-pointer dereference + * gsm/gsm0480.c: use the local msgb allocator + * libosmogsm: (re)introduce gsm48_push_l3hdr() + * core/utils.h: drop duplicate '' include + * core/utils.h: move includes to the top + * vty/command.h: document and prettify CMD_ATTR_* flags + * utils/osmo-config-merge: explicitly return from main() + * libosmogsm/gsup.c: fix error code in osmo_gsup_encode() + * gsm/gsup.h: cosmetic: use tab for comment alignment + * core/msgb.h: introduce msgb_l4len() helper + * gsm0480: fix copy-pasted note for gsm0480_gen_return_error() + * GSUP/SMS: introduce MO-/MT-FORWARD-SM messages + * GSUP/SMS: introduce READY-FOR-SM message + * tests/gsm0808: use new msgb comparison API + * logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() + * tests/gsup_test.c: drop session IEs from MO-ForwardSM Error + + [ Philipp Maier ] + * socket: check return code of setsockopt + * socket: do not set SO_REUSEADDR for IPPROTO_UDP + * socket: add flag to enforce SO_REUSEADDR on UDP sockets + * gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP + * gsm0808: fix wrong codec defaults for OFR_AMR_WB + * gsm0808: add function to convert amr gsm0408 setings to gsm0808 + * gsm0808: add function to convert amr gsm0408 setings to gsm0808 + * gsm0808_utils: constify parameter + * gsm_utils: add function to get value strings for gsm48_chan_mode + * gsm0808: add function to convert AMR S15-S0 to gsm0408 settings + * gsm0808: allow decoding of zero length speech codec lists. + * gsm0808: fix doxygen apidoc + * gsm0808: cosmetic: rename parameter "reason" to "cause" + * gsm48: correct apidoc for gsm48_generate_mid() + * gsm_29_118: add missing include to header file + * gsm29118: add value strings for SGSAP IEI + * fsm: fix apidoc of osmo_fsm_state_name() + * gsm0808: add message generator for BSSMAP HANDOVER PERFORMED + * gsm_29_118: add missing extern for struct value_string decl. + * cosmetic apn: correct whitespace error + * gsm_29_118.h: Add constant for default port + * gsm29118: add generator functions for GSM29118 messages + * gsm0808: add encoder for cause codes and use it + + [ Mykola Shchetinin ] + * vty/vty.c: fix bug in vty_config_write + + [ Pau Espin Pedrol ] + * signal: Introduce API osmo_signal_talloc_ctx_init + * msgb: Introduce msgb_{de,en}queue_count APIs + * vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release + * ipa: Document ipa_msg_recv* functions + * osmo-release.sh: Add quotes to string to fix shellcheck warning + * osmo-release.sh: Allow forcing release without LIBVERSION bump + * osmo-release.sh: Add checks to help avoid libversion debian major mismatch + * gsm_08_58.h: Introduce struct abis_rsl_link_id + * gsm_08_58.h: Introduce struct abis_rsl_chan_nr + * gsm48: gsm48_decode_freq_list: Improve documentation of paramter f + * gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc + * timer: Fix clockid_t undefined on MacOS < 10.12 + * stats.h: Fix build on MacOS + + [ Stefan Sperling ] + * properly handle mandatory cli param of gsm0808_create_paging2 + * Properly deal with sockaddr_un socket path length limitations. + * ensure unix socket paths are NUL-terminated for bind/connect + * fix error handling gprs_ns_nsip_listen() + * add support for ipaccess messages on the ctrl interface + * stop printing group description in vty_out_rate_ctr_group_fmt() + * make 'show rate-counters' show group index + * send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK + * document unblock-ack vs. signalling in gprs_ns_process_msg() + * rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI + * port arfcn range encode support from osmo-bsc + * port rest octets encoding code from osmo-bsc + + [ Keith ] + * Add CC_CAUSE value_string array + + [ Alexander Chemeris ] + * coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. + * coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). + + [ Daniel Willmann ] + * osmo-config-merge: Fix some small issues + * osmo-config-merge: Add manual page + * stats_statsd: Send all stat_items as gauges + + [ Shinjo Park ] + * GSMTAP: add definitions for new LTE RRC channels + * GSMTAP: add definitions for LTE NAS subtypes + * GSMTAP: fix typos in comments + + [ Max ] + * vty: adjust telnet log + * Update cipher reject function + * Fix deprecation warning in gsm0808_test + * Add helper wrapper for BSSAP TLV parsing + * Update 3GPP TS 08.08 Cause handling + * Update GSM0808_LCLS enums + * Move msgb_push helpers to public header + * Support cipher mode reject with extended cause + * Add missing header include + * LCLS: add 48.008 parameter structure + * Update gsm0808_create_ass() doxygen + * ctrl: print textual error on IPA parsing failure + * Move BSSMAP_MSG_* defines to header file + * Update msgb Lx helpers + * ctrl: use #define for TRAP id + * Add msgb_tl_put() helper + * LCLS: update osmo_lcls struct + * Allow log_init() with NULL log_info + * Add osmo_sockaddr_in_to_str_and_uint() + * Constify llist_count() parameter + * msgb: add test helpers + * LCLS, TS 29.205: add GCR routines + * LCLS, TS 48.008: add GCR IE encoding/decoding + * LCLS: add gsm0808_create_ass2() + * Fix typos in SS opcode names + * LCLC: fix doc to match type signature + * Use define for key buffers + * TLV: fix doc copy-paste error + * TLV: add convenience function for 1-byte values + * LCLS: enc/dec entire parameter set instead of GCR + * Streamline glibc version check + * Automatically disable GnuTLS fallback + * LCLS: fix LCLS-CONNECT-CONTROL encoder + * msgb: fix debug print + * LCLS: use proper types for value_string wrappers + * LCLS: expand enc/dec tests + * LCLS: add GCR comparison helper + + [ Oliver Smith ] + * cosmetic: fix typo (soocket -> socket) + * add osmo_sock_get_{local,remote}_ip{,_port}() + * socket.c: fix IP and port buffer sizes + * merge_doc.xsl: move to osmo-gsm-manuals.git + * GSUP: fix missing osmo_gsup_get_err_msg_type()s + * GSUP: add end marker to enum osmo_gsup_iei + * GSUP: add CHECK-IMEI message + * Cosmetic: GSUP: note "on wire" for imei_result + * gsm23003: add osmo_imei_str_valid() + + [ Martin Hauke ] + * gsm/protocol/gsm_08_58.h: Fix typo + + [ Holger Hans Peter Freyther ] + * vty: The telnet interface is TCP only. Fix the comments + * vty: Make TCP port configurable and introduce telnet_init_default + + -- Harald Welte Sat, 19 Jan 2019 21:59:07 +0100 + libosmocore (0.12.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 33ae2d4..454a548 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,9 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore11 (= ${binary:Version}), + libosmocore12 (= ${binary:Version}), libosmogb6 (= ${binary:Version}), - libosmogsm10 (= ${binary:Version}), + libosmogsm11 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), @@ -110,7 +110,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore11 +Package: libosmocore12 Section: libs Architecture: any Multi-Arch: same @@ -124,14 +124,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore11 library in particular is a collection of common code used in + The libosmocore12 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore11, + libosmocore12, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -178,7 +178,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm10 +Package: libosmogsm11 Section: libs Architecture: any Multi-Arch: same @@ -202,7 +202,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm10, + libosmogsm11, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmocore11.install b/debian/libosmocore12.install similarity index 100% rename from debian/libosmocore11.install rename to debian/libosmocore12.install diff --git a/debian/libosmogsm10.install b/debian/libosmogsm11.install similarity index 100% rename from debian/libosmogsm10.install rename to debian/libosmogsm11.install diff --git a/src/Makefile.am b/src/Makefile.am index dca5865..6ca39ad 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=11:0:0 +LIBVERSION=12:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 03052fa..65b73fe 100644 --- a/src/gb/Makefile.am +++ b/src/gb/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=7:0:1 +LIBVERSION=8:0:2 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 c4b5fce..9066500 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=10:0:0 +LIBVERSION=11:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 49813c5..2e49498 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=5:0:1 +LIBVERSION=6:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bd973754b1ebc42283f6a07defa60f58523f5a3 Gerrit-Change-Number: 12638 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:21:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:21:34 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12616 ) Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 Jan 2019 21:21:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:21:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:21:35 +0000 Subject: Change in meta-telephony[201705]: Update libosmocore to work with newer oc2g osmo-bts In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12616 ) Change subject: Update libosmocore to work with newer oc2g osmo-bts ...................................................................... Update libosmocore to work with newer oc2g osmo-bts The version of osmo-bts that has oc2g support needs a newer libosmocore, otherwise it fails trying to use OSMO_SOCK_F_UDP_REUSEADDR. Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Related: SYS#4444 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 09ac239..6d00c0d 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f36e0abb9796530a80937057eed2985f652d37f2" +SRCREV = "b8a91625dd974f596214646da345d9d649f4dae3" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "0.12.1+gitr${SRCPV}" PR = "r0" -- To view, visit https://gerrit.osmocom.org/12616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: Ib205bee48779754a809895a7e5024eba5948194d Gerrit-Change-Number: 12616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:21:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:21:49 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E12=2E0=2E128-8dfde_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12638 ) Change subject: Bump version: 0.12.0.128-8dfde ? 1.0.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bd973754b1ebc42283f6a07defa60f58523f5a3 Gerrit-Change-Number: 12638 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 19 Jan 2019 21:21:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:23:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:23:10 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E20-de57_=E2=86=92_0=2E6=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12639 Change subject: Bump version: 0.5.1.20-de57 ? 0.6.0 ...................................................................... Bump version: 0.5.1.20-de57 ? 0.6.0 Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d --- M debian/changelog M src/Makefile.am 2 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/39/12639/1 diff --git a/debian/changelog b/debian/changelog index 8645b47..6a6882d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +libosmo-abis (0.6.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix strncpy bugs in ipaccess.c, ipa_proxy.c + * ipa: don't crash on missing IPA ID GET message + + [ Harald Welte ] + * Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() + * debian/rules: Don't overwrite .tarball-version + + [ Pau Espin Pedrol ] + * ipaccess: Use osmo_fd_setup to set up callbacks + * ipaccess_rcvmsg: Fix bug introduced in previous commit + * ipa: Simplify code in ipa_client_read + * ipa: Simplify code in ipa_server_conn_read + * ipa: Allow signalling fd destroyed in ipa_client_read + * ipa: Allow signalling fd destroyed in ipa_server_conn_read + * ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb + * ipaccess: Allow passing return code in e1inp_line_ops->sign_link() + * debian: Fix libosmoabis soname package version + * debian: Conflict libosmoabis6 with libosmoabis5 + * ipacces: Log correct trx_nr during IPA GET + * ipaccess: Simplify handling of ipaccess e1line ts + * e1_input.h: Set correct type for input_signal_data->link_type + * osmo_ortp: Log domain and fix strings without endl char + + [ Stefan Sperling ] + * Properly deal with sockaddr_un socket path length limitations. + * ensure unix socket paths are NUL-terminated for bind/connect + + -- Harald Welte Sat, 19 Jan 2019 22:20:46 +0100 + libosmo-abis (0.5.1) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/src/Makefile.am b/src/Makefile.am index eb2b572..9566617 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # 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=6:1:0 -TRAU_LIBVERSION=3:1:1 +ABIS_LIBVERSION=6:2:0 +TRAU_LIBVERSION=3:2:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d Gerrit-Change-Number: 12639 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:31:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:31:53 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E6-a555_=E2=86=92_0=2E4=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12640 Change subject: Bump version: 0.3.0.6-a555 ? 0.4.0 ...................................................................... Bump version: 0.3.0.6-a555 ? 0.4.0 Change-Id: I99a3244f922382468251df675287520ca40d9d0d --- M debian/changelog M src/Makefile.am 2 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/40/12640/1 diff --git a/debian/changelog b/debian/changelog index c08bf9e..6c56148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +libosmo-netif (0.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix strncpy bug in rs232.c + * logging: fix typo in stream.c + + [ Harald Welte ] + * Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() + * link libosmo-netif against libosmogsm + * debian/rules: Don't overwrite .tarball-version + + [ Pau Espin Pedrol ] + * jibuf: fix indentation in line inside conditional clause + + [ Stefan Sperling ] + * detect freed connections in osmo_stream_srv_read() + + -- Harald Welte Sat, 19 Jan 2019 22:28:01 +0100 + libosmo-netif (0.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/src/Makefile.am b/src/Makefile.am index de7dff5..d92d0f6 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=6:0:0 +LIBVERSION=6:1:0 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/12640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99a3244f922382468251df675287520ca40d9d0d Gerrit-Change-Number: 12640 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 19 21:32:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 Jan 2019 21:32:24 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E12=2E0=2E128-8dfde_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12638 ) Change subject: Bump version: 0.12.0.128-8dfde ? 1.0.0 ...................................................................... Bump version: 0.12.0.128-8dfde ? 1.0.0 Change-Id: I1bd973754b1ebc42283f6a07defa60f58523f5a3 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmocore12.install R debian/libosmogsm11.install M src/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/vty/Makefile.am 9 files changed, 247 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 8b5f841..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,16 +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 -libosmogsm gsm0480_l3hdr_push() removed from gsm/gsm0480.h (was not exposed) -libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) -libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() -libosmocore msgb_l4len new symbol (exposed as 'static inline' in msgb.h) -libosmogsm gsm0808_cause_class_name() getter for class description -libosmogsm gsm0808_cause_class() getter for cause class -libosmogsm gsm0808_cause_ext() check for cause extended bit -libosmogsm gsm0808_cause_name() use enum as parameter -libosmogsm gsm0808_create_cipher_reject() use enum as parameter -libosmogsm osmo_gsup_message extended with SMS related fields -libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers -libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers -libosmogsm gsm0808_create_lcls_conn_ctrl() API/ABI break: change parameters from pointers to plain values diff --git a/debian/changelog b/debian/changelog index 606d923..c5de726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,239 @@ +libosmocore (1.0.0) unstable; urgency=medium + + [ K?vin Redon ] + * GSMTAP: add SIM sub_types + * comp128v23 (minor): update original code site and author + + [ Neels Hofmeyr ] + * fix strncpy bugs in gsm/ipa.c + * fix strncpy bugs in socket.c + * cosmetic: osmo-sim-test.c: use memcpy instead of strncpy + * use __FILE__, not __BASE_FILE__ + * log: add 'last' option to 'logging print file' + * gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 + * api doc: fix osmo_quote_str_* + * add osmo_str_tolower() and _toupper() with test + * fix tests linking: don't use system installed libs + * logging vty: add VTY transcript test + * gsm0808: implement BSSMAP Classmark Request + * jenkins: add --enable-external-tests + * logging vty: rewrite 'logging level' vty cmd generation + * logging vty: deprecate the 'everything' keyword + * logging vty: write: check logging levels validity + * logging vty: deprecate 'all', introduce 'force-all' + * Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" + * logging vty: add 'logging level set-all ' + * vty reference: fix deprecation bit evaluation + * vty list: fix deprecation/hidden bit logic + * vty: omit HIDDEN from vty reference + * vty logging: fix crash when missing 'logging enable' + * jenkins: print gcc version in log + * gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie + * add contrib/struct_endianess.py + * gsm0408_test: test encoding and decoding Mobile Identity + * api doc: gsm48_mi_to_string(): warn of return value implementation + * add osmo_bcd2str() + * gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases + * gsm48_generate_mid(): mask out ODD flag from mi_type + * gsm48_mi_to_string(): guard against zero length output buffer + * gsm48_mi_to_string(): do not read from zero length input buffer + * fix api doc for osmo_bcd2str() + * add to osmo_sock_get_name*() API + * add/clean big-endian packed structs (struct_endianess.py) + * define LOGPFSM fmt only once, in LOGPFSMLSRC + * add API doc for LOGPFSM* macros + * LOGPFSM*: guard against fi == NULL + * add LOGPFSMSL(), LOGPFSMSLSRC() + * gsm_utils: add enum osmo_rat_type, from osmo-msc enum ran_type + * osmo_rat_type: add OSMO_RAT_EUTRAN_SGS + * fix typo in enum BSS_MAP_MSG_TYPE: BSS_MAP_MSG_ASSIGMENT* + * add osmo_mi_name(), for MI-to-string like "IMSI-123456" + * add osmo_lu_type_names[], osmo_lu_type_name() + * change GSM48_CMSERV_* to enum type, add names + * comments: update/fix three 3GPP spec references + + [ Alexander Couzens ] + * ctrl/vty: fsm: use correct element when iterating over fsm->proc.children + * bssgp: introduce flush queue functions + * configure.ac: check clock_gettime for glib < 2.17 + + [ Harald Welte ] + * gsm0480: Factor out msgb allocation helper function + * USSD: Introduce gsm0480_gen_ussd_resp_7bit() + * 04.80: New gsm0480_gen_{reject,return_error}() functions + * import oap_client into libosmogsm + * oap_client: Rename symbols with osmo_ prefix + * import oap_client_test from osmo-sgsn + * cosmetic: More context / naming / comment for test_idtag_parsing() + * Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() + * jenkins_arm.sh: Use same Werror related options as on other builds + * re-introduce ipa_ccm_idtag_parse_off() + * debian/rules: Don't overwrite .tarball-version + * Add RSPRO support to IPA and logging definitions + * Add new osmo-config-merge utility + * logging_vty: Ensure writing well-formed config files + * osmo-config-merge: Don't use C99 'for' loop initial declarations + * Revert "osmo-config-merge: Add manual page" + * osmo-config-merge: fclose() what we fopen() + * timerfd_create(): Fix error handling of osmo_fd_register() + * telnet_interface: avoid double-close of fd() + * vty.c: Set vty->fd to -1 after closing the FD + * SGsAP protocol definitions (header + C file) + * gsm23003: Add MME domain name related helper functions + * Fix VTY documentation error introduced in "bind" VTY port change + + [ Vadim Yanitskiy ] + * vty/vty.c: remove dead unused tall_bsc_ctx + * gsm/gsm0480.c: prevent NULL-pointer dereference + * gsm/gsm0480.c: use the local msgb allocator + * libosmogsm: (re)introduce gsm48_push_l3hdr() + * core/utils.h: drop duplicate '' include + * core/utils.h: move includes to the top + * vty/command.h: document and prettify CMD_ATTR_* flags + * utils/osmo-config-merge: explicitly return from main() + * libosmogsm/gsup.c: fix error code in osmo_gsup_encode() + * gsm/gsup.h: cosmetic: use tab for comment alignment + * core/msgb.h: introduce msgb_l4len() helper + * gsm0480: fix copy-pasted note for gsm0480_gen_return_error() + * GSUP/SMS: introduce MO-/MT-FORWARD-SM messages + * GSUP/SMS: introduce READY-FOR-SM message + * tests/gsm0808: use new msgb comparison API + * logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() + * tests/gsup_test.c: drop session IEs from MO-ForwardSM Error + + [ Philipp Maier ] + * socket: check return code of setsockopt + * socket: do not set SO_REUSEADDR for IPPROTO_UDP + * socket: add flag to enforce SO_REUSEADDR on UDP sockets + * gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP + * gsm0808: fix wrong codec defaults for OFR_AMR_WB + * gsm0808: add function to convert amr gsm0408 setings to gsm0808 + * gsm0808: add function to convert amr gsm0408 setings to gsm0808 + * gsm0808_utils: constify parameter + * gsm_utils: add function to get value strings for gsm48_chan_mode + * gsm0808: add function to convert AMR S15-S0 to gsm0408 settings + * gsm0808: allow decoding of zero length speech codec lists. + * gsm0808: fix doxygen apidoc + * gsm0808: cosmetic: rename parameter "reason" to "cause" + * gsm48: correct apidoc for gsm48_generate_mid() + * gsm_29_118: add missing include to header file + * gsm29118: add value strings for SGSAP IEI + * fsm: fix apidoc of osmo_fsm_state_name() + * gsm0808: add message generator for BSSMAP HANDOVER PERFORMED + * gsm_29_118: add missing extern for struct value_string decl. + * cosmetic apn: correct whitespace error + * gsm_29_118.h: Add constant for default port + * gsm29118: add generator functions for GSM29118 messages + * gsm0808: add encoder for cause codes and use it + + [ Mykola Shchetinin ] + * vty/vty.c: fix bug in vty_config_write + + [ Pau Espin Pedrol ] + * signal: Introduce API osmo_signal_talloc_ctx_init + * msgb: Introduce msgb_{de,en}queue_count APIs + * vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release + * ipa: Document ipa_msg_recv* functions + * osmo-release.sh: Add quotes to string to fix shellcheck warning + * osmo-release.sh: Allow forcing release without LIBVERSION bump + * osmo-release.sh: Add checks to help avoid libversion debian major mismatch + * gsm_08_58.h: Introduce struct abis_rsl_link_id + * gsm_08_58.h: Introduce struct abis_rsl_chan_nr + * gsm48: gsm48_decode_freq_list: Improve documentation of paramter f + * gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc + * timer: Fix clockid_t undefined on MacOS < 10.12 + * stats.h: Fix build on MacOS + + [ Stefan Sperling ] + * properly handle mandatory cli param of gsm0808_create_paging2 + * Properly deal with sockaddr_un socket path length limitations. + * ensure unix socket paths are NUL-terminated for bind/connect + * fix error handling gprs_ns_nsip_listen() + * add support for ipaccess messages on the ctrl interface + * stop printing group description in vty_out_rate_ctr_group_fmt() + * make 'show rate-counters' show group index + * send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK + * document unblock-ack vs. signalling in gprs_ns_process_msg() + * rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI + * port arfcn range encode support from osmo-bsc + * port rest octets encoding code from osmo-bsc + + [ Keith ] + * Add CC_CAUSE value_string array + + [ Alexander Chemeris ] + * coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. + * coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). + + [ Daniel Willmann ] + * osmo-config-merge: Fix some small issues + * osmo-config-merge: Add manual page + * stats_statsd: Send all stat_items as gauges + + [ Shinjo Park ] + * GSMTAP: add definitions for new LTE RRC channels + * GSMTAP: add definitions for LTE NAS subtypes + * GSMTAP: fix typos in comments + + [ Max ] + * vty: adjust telnet log + * Update cipher reject function + * Fix deprecation warning in gsm0808_test + * Add helper wrapper for BSSAP TLV parsing + * Update 3GPP TS 08.08 Cause handling + * Update GSM0808_LCLS enums + * Move msgb_push helpers to public header + * Support cipher mode reject with extended cause + * Add missing header include + * LCLS: add 48.008 parameter structure + * Update gsm0808_create_ass() doxygen + * ctrl: print textual error on IPA parsing failure + * Move BSSMAP_MSG_* defines to header file + * Update msgb Lx helpers + * ctrl: use #define for TRAP id + * Add msgb_tl_put() helper + * LCLS: update osmo_lcls struct + * Allow log_init() with NULL log_info + * Add osmo_sockaddr_in_to_str_and_uint() + * Constify llist_count() parameter + * msgb: add test helpers + * LCLS, TS 29.205: add GCR routines + * LCLS, TS 48.008: add GCR IE encoding/decoding + * LCLS: add gsm0808_create_ass2() + * Fix typos in SS opcode names + * LCLC: fix doc to match type signature + * Use define for key buffers + * TLV: fix doc copy-paste error + * TLV: add convenience function for 1-byte values + * LCLS: enc/dec entire parameter set instead of GCR + * Streamline glibc version check + * Automatically disable GnuTLS fallback + * LCLS: fix LCLS-CONNECT-CONTROL encoder + * msgb: fix debug print + * LCLS: use proper types for value_string wrappers + * LCLS: expand enc/dec tests + * LCLS: add GCR comparison helper + + [ Oliver Smith ] + * cosmetic: fix typo (soocket -> socket) + * add osmo_sock_get_{local,remote}_ip{,_port}() + * socket.c: fix IP and port buffer sizes + * merge_doc.xsl: move to osmo-gsm-manuals.git + * GSUP: fix missing osmo_gsup_get_err_msg_type()s + * GSUP: add end marker to enum osmo_gsup_iei + * GSUP: add CHECK-IMEI message + * Cosmetic: GSUP: note "on wire" for imei_result + * gsm23003: add osmo_imei_str_valid() + + [ Martin Hauke ] + * gsm/protocol/gsm_08_58.h: Fix typo + + [ Holger Hans Peter Freyther ] + * vty: The telnet interface is TCP only. Fix the comments + * vty: Make TCP port configurable and introduce telnet_init_default + + -- Harald Welte Sat, 19 Jan 2019 21:59:07 +0100 + libosmocore (0.12.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 33ae2d4..454a548 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,9 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore11 (= ${binary:Version}), + libosmocore12 (= ${binary:Version}), libosmogb6 (= ${binary:Version}), - libosmogsm10 (= ${binary:Version}), + libosmogsm11 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), @@ -110,7 +110,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore11 +Package: libosmocore12 Section: libs Architecture: any Multi-Arch: same @@ -124,14 +124,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore11 library in particular is a collection of common code used in + The libosmocore12 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore11, + libosmocore12, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -178,7 +178,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm10 +Package: libosmogsm11 Section: libs Architecture: any Multi-Arch: same @@ -202,7 +202,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm10, + libosmogsm11, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmocore11.install b/debian/libosmocore12.install similarity index 100% rename from debian/libosmocore11.install rename to debian/libosmocore12.install diff --git a/debian/libosmogsm10.install b/debian/libosmogsm11.install similarity index 100% rename from debian/libosmogsm10.install rename to debian/libosmogsm11.install diff --git a/src/Makefile.am b/src/Makefile.am index dca5865..6ca39ad 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=11:0:0 +LIBVERSION=12:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 03052fa..65b73fe 100644 --- a/src/gb/Makefile.am +++ b/src/gb/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=7:0:1 +LIBVERSION=8:0:2 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 c4b5fce..9066500 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=10:0:0 +LIBVERSION=11:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 49813c5..2e49498 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=5:0:1 +LIBVERSION=6:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1bd973754b1ebc42283f6a07defa60f58523f5a3 Gerrit-Change-Number: 12638 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 20 01:14:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:14:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c43cb85a7a4e_39fdea667c40684e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 97s] +s=- [ 97s] +c=IN IP4 0.0.0.0 [ 97s] +t=0 0 [ 97s] +m=audio 16012 RTP/AVP 97 [ 97s] +a=ptime:40 [ 97s] + [ 97s] +backtrace() returned 5 addresses [ 97s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf770cfac] [ 97s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804af83] [ 97s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf6) [0xf74db276] [ 97s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804b1d4] [ 97s] ./testsuite.at:27: exit code was 134, expected 0 [ 97s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 97s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 97s] make[1]: *** [override_dh_auto_test] Error 1 [ 97s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 97s] debian/rules:17: recipe for target 'build' failed [ 97s] make: *** [build] Error 2 [ 97s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 97s] [ 97s] lamb51 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:08 UTC 2019. [ 97s] [ 97s] ### VM INTERACTION START ### [ 100s] [ 90.108962] sysrq: SysRq : Power Off [ 100s] [ 90.117277] reboot: Power down [ 100s] ### VM INTERACTION END ### [ 100s] [ 100s] lamb51 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:11 UTC 2019. [ 100s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:14:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:14:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c43cb8680fa2_39fdea667c40701f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 91s] +s=- [ 91s] +c=IN IP4 0.0.0.0 [ 91s] +t=0 0 [ 91s] +m=audio 16012 RTP/AVP 97 [ 91s] +a=ptime:40 [ 91s] + [ 91s] +backtrace() returned 5 addresses [ 91s] +/usr/lib/x86_64-linux-gnu/libosmocore.so.12(osmo_panic+0xcb) [0x7fe60ba67b0b] [ 91s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x4030a4] [ 91s] +/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf5) [0x7fe60afa4b45] [ 91s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x403718] [ 91s] ./testsuite.at:27: exit code was 134, expected 0 [ 91s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 91s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 91s] make[1]: *** [override_dh_auto_test] Error 1 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] debian/rules:17: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] lamb07 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:15 UTC 2019. [ 91s] [ 91s] ### VM INTERACTION START ### [ 93s] Powering off. [ 93s] [ 82.461253] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] lamb07 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:18 UTC 2019. [ 93s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:14:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:14:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c43cb8637144_39fdea667c4069cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 93s] | #define HAVE_SYS_STAT_H 1 [ 93s] | #define HAVE_STDLIB_H 1 [ 93s] | #define HAVE_STRING_H 1 [ 93s] | #define HAVE_MEMORY_H 1 [ 93s] | #define HAVE_STRINGS_H 1 [ 93s] | #define HAVE_INTTYPES_H 1 [ 93s] | #define HAVE_STDINT_H 1 [ 93s] | #define HAVE_UNISTD_H 1 [ 93s] | #define HAVE_DLFCN_H 1 [ 93s] | #define LT_OBJDIR ".libs/" [ 93s] | [ 93s] | configure: exit 0 [ 93s] [ 93s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 93s] make[1]: *** [override_dh_auto_test] Error 1 [ 93s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 93s] debian/rules:17: recipe for target 'build' failed [ 93s] make: *** [build] Error 2 [ 93s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 93s] [ 93s] lamb27 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:27 UTC 2019. [ 93s] [ 93s] ### VM INTERACTION START ### [ 97s] [ 86.658070] sysrq: SysRq : Power Off [ 97s] [ 86.662382] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] lamb27 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:32 UTC 2019. [ 97s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:14:51 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:14:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c43cba550004_39fdea667c407299@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 109s] -'10, a:PCMU' -> 'a:PCMU' [ 109s] -'10,a: PCMU' -> 'a: PCMU' [ 109s] -'10 ,a: PCMU' -> 'a: PCMU' [ 109s] -', a:PCMU' -> 'a:PCMU' [ 109s] -' a:PCMU' -> 'a:PCMU' [ 109s] -'' -> '(null)' [ 109s] -p10, aPCMU -> (null) [ 109s] -'10,a :PCMU' -> '(null)' [ 109s] -Done [ 109s] +a=fmtp: [ 109s] \ No newline at end of file [ 109s] ./testsuite.at:27: exit code was 134, expected 0 [ 109s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 109s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 109s] make[1]: *** [override_dh_auto_test] Error 1 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] debian/rules:17: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] [ 109s] lamb05 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:40 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 102.275900] sysrq: SysRq : Power Off [ 112s] [ 102.283399] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb05 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:44 UTC 2019. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:08 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c43cba5c5bc1_39fdea667c4073ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 93s] | #define HAVE_SYS_STAT_H 1 [ 93s] | #define HAVE_STDLIB_H 1 [ 93s] | #define HAVE_STRING_H 1 [ 93s] | #define HAVE_MEMORY_H 1 [ 93s] | #define HAVE_STRINGS_H 1 [ 93s] | #define HAVE_INTTYPES_H 1 [ 93s] | #define HAVE_STDINT_H 1 [ 93s] | #define HAVE_UNISTD_H 1 [ 93s] | #define HAVE_DLFCN_H 1 [ 93s] | #define LT_OBJDIR ".libs/" [ 93s] | [ 93s] | configure: exit 0 [ 93s] [ 93s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 93s] make[1]: *** [override_dh_auto_test] Error 1 [ 93s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 93s] debian/rules:17: recipe for target 'build' failed [ 93s] make: *** [build] Error 2 [ 93s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 93s] [ 93s] lamb22 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:01 UTC 2019. [ 93s] [ 93s] ### VM INTERACTION START ### [ 96s] [ 84.008880] sysrq: SysRq : Power Off [ 96s] [ 84.014433] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] lamb22 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:05 UTC 2019. [ 96s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:08 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c43cba651d36_39fdea667c4074dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 95s] | #define HAVE_SYS_STAT_H 1 [ 95s] | #define HAVE_STDLIB_H 1 [ 95s] | #define HAVE_STRING_H 1 [ 95s] | #define HAVE_MEMORY_H 1 [ 95s] | #define HAVE_STRINGS_H 1 [ 95s] | #define HAVE_INTTYPES_H 1 [ 95s] | #define HAVE_STDINT_H 1 [ 95s] | #define HAVE_UNISTD_H 1 [ 95s] | #define HAVE_DLFCN_H 1 [ 95s] | #define LT_OBJDIR ".libs/" [ 95s] | [ 95s] | configure: exit 0 [ 95s] [ 95s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 95s] make[1]: *** [override_dh_auto_test] Error 1 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] debian/rules:17: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb03 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:03 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 88.602200] sysrq: SysRq : Power Off [ 98s] [ 88.609552] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb03 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:06 UTC 2019. [ 98s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:14:51 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:14:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c43cba4e47ef_39fdea667c4071b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 96s] +s=- [ 96s] +c=IN IP4 0.0.0.0 [ 96s] +t=0 0 [ 96s] +m=audio 16012 RTP/AVP 97 [ 96s] +a=ptime:40 [ 96s] + [ 96s] +backtrace() returned 5 addresses [ 96s] +/usr/lib/x86_64-linux-gnu/libosmocore.so.12(osmo_panic+0xcb) [0x7f0b0d0f735b] [ 96s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test(+0x4106) [0x559dfc1c1106] [ 96s] +/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf1) [0x7f0b0c6133f1] [ 96s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test(+0x48ca) [0x559dfc1c18ca] [ 96s] ./testsuite.at:27: exit code was 134, expected 0 [ 96s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 96s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 96s] make[1]: *** [override_dh_auto_test] Error 1 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] debian/rules:17: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] lamb19 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:35 UTC 2019. [ 96s] [ 96s] ### VM INTERACTION START ### [ 99s] [ 88.521206] sysrq: SysRq : Power Off [ 99s] [ 88.529522] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] lamb19 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:14:38 UTC 2019. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c43cbc0e3214_39fdea667c4078e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_8.0/i586 Package network:osmocom:latest/osmo-mgw failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 92s] +c=IN IP4 0.0.0.0 [ 92s] +t=0 0 [ 92s] +m=audio 16012 RTP/AVP 97 [ 92s] +a=ptime:40 [ 92s] + [ 92s] +backtrace() returned 6 addresses [ 92s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_generate_backtrace+0x11) [0xf761d911] [ 92s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf761d73c] [ 92s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804adaa] [ 92s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf3) [0xf7444723] [ 92s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804b177] [ 92s] ./testsuite.at:27: exit code was 134, expected 0 [ 92s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 92s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 92s] make[1]: *** [override_dh_auto_test] Error 1 [ 92s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 92s] debian/rules:17: recipe for target 'build' failed [ 92s] make: *** [build] Error 2 [ 92s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 92s] [ 92s] lamb58 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:39 UTC 2019. [ 92s] [ 92s] ### VM INTERACTION START ### [ 93s] Powering off. [ 93s] [ 82.706105] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] lamb58 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:41 UTC 2019. [ 93s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c43cbc07dbbb_39fdea667c4077f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 95s] | #define HAVE_SYS_STAT_H 1 [ 95s] | #define HAVE_STDLIB_H 1 [ 95s] | #define HAVE_STRING_H 1 [ 95s] | #define HAVE_MEMORY_H 1 [ 95s] | #define HAVE_STRINGS_H 1 [ 95s] | #define HAVE_INTTYPES_H 1 [ 95s] | #define HAVE_STDINT_H 1 [ 95s] | #define HAVE_UNISTD_H 1 [ 95s] | #define HAVE_DLFCN_H 1 [ 95s] | #define LT_OBJDIR ".libs/" [ 95s] | [ 95s] | configure: exit 0 [ 95s] [ 95s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 95s] make[1]: *** [override_dh_auto_test] Error 1 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] debian/rules:17: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb07 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:14 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 99s] [ 89.648224] sysrq: SysRq : Power Off [ 99s] [ 89.655379] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] lamb07 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:18 UTC 2019. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c43cbc024284_39fdea667c40765b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 95s] +s=- [ 95s] +c=IN IP4 0.0.0.0 [ 95s] +t=0 0 [ 95s] +m=audio 16012 RTP/AVP 97 [ 95s] +a=ptime:40 [ 95s] + [ 95s] +backtrace() returned 5 addresses [ 95s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf7654f2c] [ 95s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804afcb] [ 95s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf7) [0xf742b637] [ 95s] +/usr/src/packages/BUILD/tests/mgcp/mgcp_test() [0x804b21c] [ 95s] ./testsuite.at:27: exit code was 134, expected 0 [ 95s] 4. testsuite.at:24: 4. mgcp (testsuite.at:24): FAILED (testsuite.at:27) [ 95s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 95s] make[1]: *** [override_dh_auto_test] Error 1 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] debian/rules:17: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb09 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:10 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 88.352315] sysrq: SysRq : Power Off [ 98s] [ 88.359824] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb09 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:14 UTC 2019. [ 98s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:15:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:15:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c43cbbfadbc1_39fdea667c40757d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 96s] | #define HAVE_SYS_STAT_H 1 [ 96s] | #define HAVE_STDLIB_H 1 [ 96s] | #define HAVE_STRING_H 1 [ 96s] | #define HAVE_MEMORY_H 1 [ 96s] | #define HAVE_STRINGS_H 1 [ 96s] | #define HAVE_INTTYPES_H 1 [ 96s] | #define HAVE_STDINT_H 1 [ 96s] | #define HAVE_UNISTD_H 1 [ 96s] | #define HAVE_DLFCN_H 1 [ 96s] | #define LT_OBJDIR ".libs/" [ 96s] | [ 96s] | configure: exit 0 [ 96s] [ 96s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 96s] make[1]: *** [override_dh_auto_test] Error 1 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] debian/rules:17: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] lamb59 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:07 UTC 2019. [ 96s] [ 96s] ### VM INTERACTION START ### [ 99s] [ 88.849844] sysrq: SysRq : Power Off [ 99s] [ 88.857909] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] lamb59 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:11 UTC 2019. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:16:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c43cbdf6a38d_39fdea667c4079cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/i586 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 94s] | #define HAVE_SYS_STAT_H 1 [ 94s] | #define HAVE_STDLIB_H 1 [ 94s] | #define HAVE_STRING_H 1 [ 94s] | #define HAVE_MEMORY_H 1 [ 94s] | #define HAVE_STRINGS_H 1 [ 94s] | #define HAVE_INTTYPES_H 1 [ 94s] | #define HAVE_STDINT_H 1 [ 94s] | #define HAVE_UNISTD_H 1 [ 94s] | #define HAVE_DLFCN_H 1 [ 94s] | #define LT_OBJDIR ".libs/" [ 94s] | [ 94s] | configure: exit 0 [ 94s] [ 94s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 94s] make[1]: *** [override_dh_auto_test] Error 1 [ 94s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 94s] debian/rules:17: recipe for target 'build' failed [ 94s] make: *** [build] Error 2 [ 94s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 94s] [ 94s] lamb22 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:42 UTC 2019. [ 94s] [ 94s] ### VM INTERACTION START ### [ 97s] [ 85.900656] sysrq: SysRq : Power Off [ 97s] [ 85.908533] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] lamb22 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:15:45 UTC 2019. [ 97s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:16:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c43cbe0135fe_39fdea667c408155@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.10/i586 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 109s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 109s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 109s] ^~~~~~~~~~~~~~~~~ [ 109s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 109s] make[4]: *** [gsm_04_80.o] Error 1 [ 109s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 109s] Makefile:447: recipe for target 'all-recursive' failed [ 109s] make[3]: *** [all-recursive] Error 1 [ 109s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 109s] Makefile:518: recipe for target 'all-recursive' failed [ 109s] make[2]: *** [all-recursive] Error 1 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 109s] Makefile:427: recipe for target 'all' failed [ 109s] make[1]: *** [all] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 109s] dh_auto_build: make -j1 returned exit code 2 [ 109s] debian/rules:13: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] lamb56 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:15:53 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 102.788218] sysrq: SysRq : Power Off [ 112s] [ 102.793338] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb56 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:15:56 UTC 2019. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:16:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c43cbdfbcad4_39fdea667c40809a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_8.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 101s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 101s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 101s] ^ [ 101s] Makefile:472: recipe for target 'gsm_04_80.o' failed [ 101s] make[4]: *** [gsm_04_80.o] Error 1 [ 101s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 101s] Makefile:435: recipe for target 'all-recursive' failed [ 101s] make[3]: *** [all-recursive] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 101s] Makefile:507: recipe for target 'all-recursive' failed [ 101s] make[2]: *** [all-recursive] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] Makefile:415: recipe for target 'all' failed [ 101s] make[1]: *** [all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:13: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 101s] [ 101s] lamb24 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:15:51 UTC 2019. [ 101s] [ 101s] ### VM INTERACTION START ### [ 102s] Powering off. [ 102s] [ 91.823119] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] lamb24 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:15:52 UTC 2019. [ 102s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:16:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:16:17 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c43cbfe84c04_39fdea667c40827@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.10/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 80s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 80s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 80s] ^~~~~~~~~~~~~~~~~ [ 80s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 80s] make[4]: *** [gsm_04_80.o] Error 1 [ 80s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 80s] Makefile:447: recipe for target 'all-recursive' failed [ 80s] make[3]: *** [all-recursive] Error 1 [ 80s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 80s] Makefile:518: recipe for target 'all-recursive' failed [ 80s] make[2]: *** [all-recursive] Error 1 [ 80s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 80s] Makefile:427: recipe for target 'all' failed [ 80s] make[1]: *** [all] Error 2 [ 80s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 80s] dh_auto_build: make -j1 returned exit code 2 [ 80s] debian/rules:13: recipe for target 'build' failed [ 80s] make: *** [build] Error 2 [ 80s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 80s] [ 80s] sheep84 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:16:06 UTC 2019. [ 80s] [ 80s] ### VM INTERACTION START ### [ 83s] [ 76.287254] sysrq: SysRq : Power Off [ 83s] [ 76.293000] reboot: Power down [ 83s] ### VM INTERACTION END ### [ 83s] [ 83s] sheep84 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:16:09 UTC 2019. [ 83s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c43cc59df871_39fdea667c408380@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.10/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 106s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 106s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 106s] ^~~~~~~~~~~~~~~~~ [ 106s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 106s] make[4]: *** [gsm_04_80.o] Error 1 [ 106s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 106s] Makefile:447: recipe for target 'all-recursive' failed [ 106s] make[3]: *** [all-recursive] Error 1 [ 106s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 106s] Makefile:518: recipe for target 'all-recursive' failed [ 106s] make[2]: *** [all-recursive] Error 1 [ 106s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 106s] Makefile:427: recipe for target 'all' failed [ 106s] make[1]: *** [all] Error 2 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 106s] dh_auto_build: make -j1 returned exit code 2 [ 106s] debian/rules:13: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] lamb14 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:38 UTC 2019. [ 106s] [ 106s] ### VM INTERACTION START ### [ 109s] [ 99.398725] sysrq: SysRq : Power Off [ 109s] [ 99.406357] reboot: Power down [ 109s] ### VM INTERACTION END ### [ 109s] [ 109s] lamb14 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:42 UTC 2019. [ 109s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c43cc5a4af48_39fdea667c40849e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.04/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 107s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 107s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 107s] ^~~~~~~~~~~~~~~~~ [ 107s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 107s] make[4]: *** [gsm_04_80.o] Error 1 [ 107s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 107s] Makefile:447: recipe for target 'all-recursive' failed [ 107s] make[3]: *** [all-recursive] Error 1 [ 107s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 107s] Makefile:518: recipe for target 'all-recursive' failed [ 107s] make[2]: *** [all-recursive] Error 1 [ 107s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 107s] Makefile:427: recipe for target 'all' failed [ 107s] make[1]: *** [all] Error 2 [ 107s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 107s] dh_auto_build: make -j1 returned exit code 2 [ 107s] debian/rules:13: recipe for target 'build' failed [ 107s] make: *** [build] Error 2 [ 107s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 107s] [ 107s] lamb03 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:46 UTC 2019. [ 107s] [ 107s] ### VM INTERACTION START ### [ 110s] [ 99.585664] sysrq: SysRq : Power Off [ 110s] [ 99.593533] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] lamb03 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:49 UTC 2019. [ 110s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c43cc5a9271b_39fdea667c408590@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.04/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 108s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 108s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 108s] ^ [ 108s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 108s] make[4]: *** [gsm_04_80.o] Error 1 [ 108s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 108s] Makefile:447: recipe for target 'all-recursive' failed [ 108s] make[3]: *** [all-recursive] Error 1 [ 108s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 108s] Makefile:518: recipe for target 'all-recursive' failed [ 108s] make[2]: *** [all-recursive] Error 1 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 108s] Makefile:427: recipe for target 'all' failed [ 108s] make[1]: *** [all] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 108s] dh_auto_build: make -j1 returned exit code 2 [ 108s] debian/rules:13: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] lamb51 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:46 UTC 2019. [ 108s] [ 108s] ### VM INTERACTION START ### [ 111s] [ 101.267651] sysrq: SysRq : Power Off [ 111s] [ 101.275325] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] lamb51 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:17:50 UTC 2019. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:17 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c43cc5b29bef_39fdea667c40865b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/i586 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 88s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 88s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 88s] ^~~~~~~~~~~~~~~~~ [ 88s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 88s] make[4]: *** [gsm_04_80.o] Error 1 [ 88s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 88s] Makefile:447: recipe for target 'all-recursive' failed [ 88s] make[3]: *** [all-recursive] Error 1 [ 88s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 88s] Makefile:518: recipe for target 'all-recursive' failed [ 88s] make[2]: *** [all-recursive] Error 1 [ 88s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 88s] Makefile:427: recipe for target 'all' failed [ 88s] make[1]: *** [all] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 88s] dh_auto_build: make -j1 returned exit code 2 [ 88s] debian/rules:13: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 88s] [ 88s] sheep81 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:11 UTC 2019. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 82.789180] sysrq: SysRq : Power Off [ 91s] [ 82.794866] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] sheep81 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:14 UTC 2019. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:17 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c43cc5b715bc_39fdea667c4087d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 101s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 101s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 101s] ^~~~~~~~~~~~~~~~~ [ 101s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 101s] make[4]: *** [gsm_04_80.o] Error 1 [ 101s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 101s] Makefile:447: recipe for target 'all-recursive' failed [ 101s] make[3]: *** [all-recursive] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 101s] Makefile:518: recipe for target 'all-recursive' failed [ 101s] make[2]: *** [all-recursive] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] Makefile:427: recipe for target 'all' failed [ 101s] make[1]: *** [all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:13: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 101s] [ 101s] lamb24 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:11 UTC 2019. [ 101s] [ 101s] ### VM INTERACTION START ### [ 104s] [ 92.560401] sysrq: SysRq : Power Off [ 104s] [ 92.567096] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] lamb24 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:14 UTC 2019. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:18:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:18:34 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c43cc74d241c_39fdea667c40883b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.04/i586 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 141s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 141s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 141s] ^~~~~~~~~~~~~~~~~ [ 141s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 141s] make[4]: *** [gsm_04_80.o] Error 1 [ 141s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 141s] Makefile:447: recipe for target 'all-recursive' failed [ 141s] make[3]: *** [all-recursive] Error 1 [ 141s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 141s] Makefile:518: recipe for target 'all-recursive' failed [ 141s] make[2]: *** [all-recursive] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 141s] Makefile:427: recipe for target 'all' failed [ 141s] make[1]: *** [all] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:13: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] cloud124 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:26 UTC 2019. [ 141s] [ 141s] ### VM INTERACTION START ### [ 145s] [ 124.672196] sysrq: SysRq : Power Off [ 145s] [ 124.686387] reboot: Power down [ 146s] ### VM INTERACTION END ### [ 146s] [ 146s] cloud124 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:18:31 UTC 2019. [ 146s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:20:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:20:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c43ccee9106_39fdea667c4089a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 109s] | #define HAVE_SYS_STAT_H 1 [ 109s] | #define HAVE_STDLIB_H 1 [ 109s] | #define HAVE_STRING_H 1 [ 109s] | #define HAVE_MEMORY_H 1 [ 109s] | #define HAVE_STRINGS_H 1 [ 109s] | #define HAVE_INTTYPES_H 1 [ 109s] | #define HAVE_STDINT_H 1 [ 109s] | #define HAVE_UNISTD_H 1 [ 109s] | #define HAVE_DLFCN_H 1 [ 109s] | #define LT_OBJDIR ".libs/" [ 109s] | [ 109s] | configure: exit 0 [ 109s] [ 109s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 109s] make[1]: *** [override_dh_auto_test] Error 1 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] debian/rules:17: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] obs-arm-5 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:20:01 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 111s] [ 92.249427] sysrq: SysRq : Power Off [ 111s] [ 92.250949] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] obs-arm-5 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:20:04 UTC 2019. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:21:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:21:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c43cd2acccc4_39fdea667c40902b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 108s] | #define HAVE_STRING_H 1 [ 108s] | #define HAVE_MEMORY_H 1 [ 108s] | #define HAVE_STRINGS_H 1 [ 108s] | #define HAVE_INTTYPES_H 1 [ 108s] | #define HAVE_STDINT_H 1 [ 108s] | #define HAVE_UNISTD_H 1 [ 108s] | #define HAVE_DLFCN_H 1 [ 108s] | #define LT_OBJDIR ".libs/" [ 108s] | #define STDC_HEADERS 1 [ 108s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 108s] | [ 108s] | configure: exit 0 [ 108s] [ 108s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 108s] make[1]: *** [override_dh_auto_test] Error 1 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] debian/rules:45: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] lamb68 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:21:13 UTC 2019. [ 108s] [ 108s] ### VM INTERACTION START ### [ 111s] [ 101.494528] sysrq: SysRq : Power Off [ 111s] [ 101.502400] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb68 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:21:17 UTC 2019. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:21:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:21:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c43cd2b67bd1_39fdea667c4091e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 102s] 06 [ 102s] [ 102s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 102s] - [ 102s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 102s] 07 [ 102s] [ 102s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 102s] + [ 102s] result (UNBLOCK) = 1 [ 102s] [ 102s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 102s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 102s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 102s] make[1]: *** [override_dh_auto_test] Error 1 [ 102s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 102s] debian/rules:45: recipe for target 'build' failed [ 102s] make: *** [build] Error 2 [ 102s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 102s] [ 102s] lamb06 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:21:36 UTC 2019. [ 102s] [ 102s] ### VM INTERACTION START ### [ 103s] Powering off. [ 103s] [ 92.018082] reboot: Power down [ 103s] ### VM INTERACTION END ### [ 103s] [ 103s] lamb06 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:21:38 UTC 2019. [ 103s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:22:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:22:34 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c43cd6355c01_39fdea667c409255@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/aarch64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 115s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 115s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 115s] ^~~~~~~~~~~~~~~~~ [ 115s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 115s] make[4]: *** [gsm_04_80.o] Error 1 [ 115s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 115s] Makefile:447: recipe for target 'all-recursive' failed [ 115s] make[3]: *** [all-recursive] Error 1 [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 115s] Makefile:518: recipe for target 'all-recursive' failed [ 115s] make[2]: *** [all-recursive] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 115s] Makefile:427: recipe for target 'all' failed [ 115s] make[1]: *** [all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 115s] dh_auto_build: make -j1 returned exit code 2 [ 115s] debian/rules:13: recipe for target 'build' failed [ 115s] make: *** [build] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 115s] [ 115s] obs-arm-7 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:22:28 UTC 2019. [ 115s] [ 115s] ### VM INTERACTION START ### [ 119s] [ 104.355464] sysrq: SysRq : Power Off [ 119s] [ 104.384509] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] obs-arm-7 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:22:31 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:27:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:27:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c43ce91aa0e8_39fdea667c4093a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 61s] | #define HAVE_STRING_H 1 [ 61s] | #define HAVE_MEMORY_H 1 [ 61s] | #define HAVE_STRINGS_H 1 [ 61s] | #define HAVE_INTTYPES_H 1 [ 61s] | #define HAVE_STDINT_H 1 [ 61s] | #define HAVE_UNISTD_H 1 [ 61s] | #define HAVE_DLFCN_H 1 [ 61s] | #define LT_OBJDIR ".libs/" [ 61s] | #define STDC_HEADERS 1 [ 61s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 61s] | [ 61s] | configure: exit 0 [ 61s] [ 61s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 61s] make[1]: *** [override_dh_auto_test] Error 1 [ 61s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 61s] debian/rules:45: recipe for target 'build' failed [ 61s] make: *** [build] Error 2 [ 61s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 61s] [ 61s] build84 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:27:12 UTC 2019. [ 61s] [ 61s] ### VM INTERACTION START ### [ 64s] [ 56.227922] sysrq: SysRq : Power Off [ 64s] [ 56.231968] reboot: Power down [ 64s] ### VM INTERACTION END ### [ 64s] [ 64s] build84 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:27:16 UTC 2019. [ 64s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:28:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:28:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c43ceced0c31_39fdea667c4095e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 61s] | #define HAVE_STRING_H 1 [ 61s] | #define HAVE_MEMORY_H 1 [ 61s] | #define HAVE_STRINGS_H 1 [ 61s] | #define HAVE_INTTYPES_H 1 [ 61s] | #define HAVE_STDINT_H 1 [ 61s] | #define HAVE_UNISTD_H 1 [ 61s] | #define HAVE_DLFCN_H 1 [ 61s] | #define LT_OBJDIR ".libs/" [ 61s] | #define STDC_HEADERS 1 [ 61s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 61s] | [ 61s] | configure: exit 0 [ 61s] [ 61s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 61s] make[1]: *** [override_dh_auto_test] Error 1 [ 61s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 61s] debian/rules:45: recipe for target 'build' failed [ 61s] make: *** [build] Error 2 [ 61s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 61s] [ 61s] build77 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:27:58 UTC 2019. [ 61s] [ 61s] ### VM INTERACTION START ### [ 64s] [ 56.240630] sysrq: SysRq : Power Off [ 64s] [ 56.242451] reboot: Power down [ 64s] ### VM INTERACTION END ### [ 64s] [ 64s] build77 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:02 UTC 2019. [ 64s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:28:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:28:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c43cecf3105f_39fdea667c409682@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 110s] | #define HAVE_STRING_H 1 [ 110s] | #define HAVE_MEMORY_H 1 [ 110s] | #define HAVE_STRINGS_H 1 [ 110s] | #define HAVE_INTTYPES_H 1 [ 110s] | #define HAVE_STDINT_H 1 [ 110s] | #define HAVE_UNISTD_H 1 [ 110s] | #define HAVE_DLFCN_H 1 [ 110s] | #define LT_OBJDIR ".libs/" [ 110s] | #define STDC_HEADERS 1 [ 110s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 110s] | [ 110s] | configure: exit 0 [ 110s] [ 110s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 110s] make[1]: *** [override_dh_auto_test] Error 1 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] debian/rules:45: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] lamb02 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:04 UTC 2019. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 102.491880] sysrq: SysRq : Power Off [ 113s] [ 102.499499] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] lamb02 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:08 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:28:51 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:28:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c43cee8af343_39fdea667c40977c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 107s] 06 [ 107s] [ 107s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 107s] - [ 107s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 107s] 07 [ 107s] [ 107s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 107s] + [ 107s] result (UNBLOCK) = 1 [ 107s] [ 107s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 107s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 107s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 107s] make[1]: *** [override_dh_auto_test] Error 1 [ 107s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 107s] debian/rules:45: recipe for target 'build' failed [ 107s] make: *** [build] Error 2 [ 107s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 107s] [ 107s] lamb75 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:44 UTC 2019. [ 107s] [ 107s] ### VM INTERACTION START ### [ 110s] [ 100.794846] sysrq: SysRq : Power Off [ 110s] [ 100.802801] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] lamb75 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:48 UTC 2019. [ 110s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:29:08 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:29:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c43cee914f8f_39fdea667c40986d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 139s] | #define HAVE_STRING_H 1 [ 139s] | #define HAVE_MEMORY_H 1 [ 139s] | #define HAVE_STRINGS_H 1 [ 139s] | #define HAVE_INTTYPES_H 1 [ 139s] | #define HAVE_STDINT_H 1 [ 139s] | #define HAVE_UNISTD_H 1 [ 139s] | #define HAVE_DLFCN_H 1 [ 139s] | #define LT_OBJDIR ".libs/" [ 139s] | #define STDC_HEADERS 1 [ 139s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 139s] | [ 139s] | configure: exit 0 [ 139s] [ 139s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 139s] make[1]: *** [override_dh_auto_test] Error 1 [ 139s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 139s] debian/rules:45: recipe for target 'build' failed [ 139s] make: *** [build] Error 2 [ 139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 139s] [ 139s] cloud127 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:28:59 UTC 2019. [ 139s] [ 139s] ### VM INTERACTION START ### [ 142s] [ 122.591059] sysrq: SysRq : Power Off [ 142s] [ 122.595404] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] cloud127 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:05 UTC 2019. [ 144s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:29:25 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:29:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c43cf076fccb_39fdea667c409989@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 152s] 06 [ 152s] [ 152s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 152s] - [ 152s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 152s] 07 [ 152s] [ 152s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 152s] + [ 152s] result (UNBLOCK) = 1 [ 152s] [ 152s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 152s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 152s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 152s] make[1]: *** [override_dh_auto_test] Error 1 [ 152s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 152s] debian/rules:45: recipe for target 'build' failed [ 152s] make: *** [build] Error 2 [ 152s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 152s] [ 152s] cloud112 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:04 UTC 2019. [ 152s] [ 152s] ### VM INTERACTION START ### [ 155s] [ 134.227036] sysrq: SysRq : Power Off [ 155s] [ 134.231823] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] cloud112 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:09 UTC 2019. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:29:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:29:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c43cf07e083d_39fdea667c4100b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 106s] | #define HAVE_STRING_H 1 [ 106s] | #define HAVE_MEMORY_H 1 [ 106s] | #define HAVE_STRINGS_H 1 [ 106s] | #define HAVE_INTTYPES_H 1 [ 106s] | #define HAVE_STDINT_H 1 [ 106s] | #define HAVE_UNISTD_H 1 [ 106s] | #define HAVE_DLFCN_H 1 [ 106s] | #define LT_OBJDIR ".libs/" [ 106s] | #define STDC_HEADERS 1 [ 106s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 106s] | [ 106s] | configure: exit 0 [ 106s] [ 106s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 106s] make[1]: *** [override_dh_auto_test] Error 1 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 106s] debian/rules:45: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] lamb76 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:38 UTC 2019. [ 106s] [ 106s] ### VM INTERACTION START ### [ 109s] [ 99.338527] sysrq: SysRq : Power Off [ 109s] [ 99.346416] reboot: Power down [ 109s] ### VM INTERACTION END ### [ 109s] [ 109s] lamb76 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:42 UTC 2019. [ 109s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:30:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:30:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c43cf265e0ef_39fdea667c41017@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 108s] | #define HAVE_STRING_H 1 [ 108s] | #define HAVE_MEMORY_H 1 [ 108s] | #define HAVE_STRINGS_H 1 [ 108s] | #define HAVE_INTTYPES_H 1 [ 108s] | #define HAVE_STDINT_H 1 [ 108s] | #define HAVE_UNISTD_H 1 [ 108s] | #define HAVE_DLFCN_H 1 [ 108s] | #define LT_OBJDIR ".libs/" [ 108s] | #define STDC_HEADERS 1 [ 108s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 108s] | [ 108s] | configure: exit 0 [ 108s] [ 108s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 108s] make[1]: *** [override_dh_auto_test] Error 1 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] debian/rules:45: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] lamb61 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:49 UTC 2019. [ 108s] [ 108s] ### VM INTERACTION START ### [ 111s] [ 99.818172] sysrq: SysRq : Power Off [ 111s] [ 99.825984] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] lamb61 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:29:52 UTC 2019. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:30:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:30:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c43cf44c19c3_39fdea667c41028b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 145s] 06 [ 145s] [ 145s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 145s] - [ 145s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 145s] 07 [ 145s] [ 145s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 145s] + [ 145s] result (UNBLOCK) = 1 [ 145s] [ 145s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 145s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 145s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 145s] make[1]: *** [override_dh_auto_test] Error 1 [ 145s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 145s] debian/rules:45: recipe for target 'build' failed [ 145s] make: *** [build] Error 2 [ 145s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 145s] [ 145s] cloud133 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:30:20 UTC 2019. [ 145s] [ 145s] ### VM INTERACTION START ### [ 149s] [ 124.038282] sysrq: SysRq : Power Off [ 149s] [ 124.046030] reboot: Power down [ 151s] ### VM INTERACTION END ### [ 151s] [ 151s] cloud133 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:30:25 UTC 2019. [ 151s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:44:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:44:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c43d28d5cdc7_39fdea667c41035b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 103s] 06 [ 103s] [ 103s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 103s] - [ 103s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 103s] 07 [ 103s] [ 103s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 103s] + [ 103s] result (UNBLOCK) = 1 [ 103s] [ 103s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 103s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 103s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 103s] make[1]: *** [override_dh_auto_test] Error 1 [ 103s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 103s] debian/rules:45: recipe for target 'build' failed [ 103s] make: *** [build] Error 2 [ 103s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 103s] [ 103s] build34 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:44:02 UTC 2019. [ 103s] [ 103s] ### VM INTERACTION START ### [ 104s] Powering off. [ 104s] [ 91.913833] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] build34 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:44:04 UTC 2019. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:44:51 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:44:51 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c43d2abd50c0_39fdea667c4104f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/armv7l Package network:osmocom:latest/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 140s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 140s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 140s] ^~~~~~~~~~~~~~~~~ [ 140s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 140s] make[4]: *** [gsm_04_80.o] Error 1 [ 140s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 140s] Makefile:447: recipe for target 'all-recursive' failed [ 140s] make[3]: *** [all-recursive] Error 1 [ 140s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 140s] Makefile:518: recipe for target 'all-recursive' failed [ 140s] make[2]: *** [all-recursive] Error 1 [ 140s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 140s] Makefile:427: recipe for target 'all' failed [ 140s] make[1]: *** [all] Error 2 [ 140s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 140s] dh_auto_build: make -j1 returned exit code 2 [ 140s] debian/rules:13: recipe for target 'build' failed [ 140s] make: *** [build] Error 2 [ 140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 140s] [ 140s] armbuild04 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:44:33 UTC 2019. [ 140s] [ 140s] ### VM INTERACTION START ### [ 143s] [ 124.548755] SysRq : Power Off [ 143s] [ 124.549965] reboot: Power down [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] armbuild04 failed "build openbsc_1.1.0.dsc" at Sun Jan 20 01:44:37 UTC 2019. [ 143s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:47:08 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:47:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c43d324b5dee_39fdea667c41053b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/armv7l Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 112s] | #define HAVE_SYS_STAT_H 1 [ 112s] | #define HAVE_STDLIB_H 1 [ 112s] | #define HAVE_STRING_H 1 [ 112s] | #define HAVE_MEMORY_H 1 [ 112s] | #define HAVE_STRINGS_H 1 [ 112s] | #define HAVE_INTTYPES_H 1 [ 112s] | #define HAVE_STDINT_H 1 [ 112s] | #define HAVE_UNISTD_H 1 [ 112s] | #define HAVE_DLFCN_H 1 [ 112s] | #define LT_OBJDIR ".libs/" [ 112s] | [ 112s] | configure: exit 0 [ 112s] [ 112s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 112s] make[1]: *** [override_dh_auto_test] Error 1 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] debian/rules:17: recipe for target 'build' failed [ 112s] make: *** [build] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 112s] [ 112s] armbuild04 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:46:51 UTC 2019. [ 112s] [ 112s] ### VM INTERACTION START ### [ 115s] [ 98.044022] SysRq : Power Off [ 115s] [ 98.045134] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] armbuild04 failed "build osmo-mgw_1.4.0.dsc" at Sun Jan 20 01:46:55 UTC 2019. [ 115s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 20 01:57:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 01:57:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c43d59adabb3_39fdea667c410641@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 133s] | AMDEPBACKSLASH='' [ 133s] | AMDEP_FALSE='' [ 133s] | AMDEP_TRUE='#' [ 133s] | AMTAR='$${TAR-tar}' [ 133s] | AM_BACKSLASH='\' [ 133s] | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' [ 133s] | AM_DEFAULT_VERBOSITY='1' [ 133s] | AM_V='$(V)' [ 133s] | AR='ar' [ 133s] | AUTOCONF='${SHELL} /usr/src/packages/BUILD/missing autoconf' [ 133s] | AUTOHEADER='${SHELL} /usr/src/packages/BUILD/missing autoheader' [ 133s] | AUTOMAKE='${SHELL} /usr/src/packages/BUILD/missing automake-1.15' [ 133s] | AWK='gawk' [ 133s] | BUILD_IU_FALSE='' [ 133s] | BUILD_IU_TRUE='#' [ 133s] | CC='gcc' [ 133s] | CCDEPMODE='depmode=none' [ 133s] | CFLAGS='-g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess' [ 133s] | COVERAGE_CFLAGS='' [ 133s] | COVERAGE_LDFLAGS='' [ 133s] | CPP='gcc -E' [ 133s] | CPPFLAGS='-Wdate-time -D_FORTIFY_SOURCE=2 -Wall' [ 133s] | CYGPATH_W='echo' [ 135s] | DEFS='-DH[ 116.700669] SysRq : Power Off [ 135s] [ 116.701765] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] armbuild02 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 01:57:42 UTC 2019. [ 135s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun Jan 20 06:53:40 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 Jan 2019 06:53:40 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-simtrace2_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#258?= In-Reply-To: <1346845267.639.1547880683716.JavaMail.jenkins@jenkins.osmocom.org> References: <1346845267.639.1547880683716.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <801351523.655.1547967220593.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Jan 20 08:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 08:59:24 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E20-de57_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12639 to look at the new patch set (#2). Change subject: Bump version: 0.5.1.20-de57 ? 0.6.0 ...................................................................... Bump version: 0.5.1.20-de57 ? 0.6.0 Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d --- M configure.ac M debian/changelog M debian/control M src/Makefile.am 4 files changed, 38 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/39/12639/2 -- To view, visit https://gerrit.osmocom.org/12639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d Gerrit-Change-Number: 12639 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:00:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:00:07 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E20-de57_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12639 ) Change subject: Bump version: 0.5.1.20-de57 ? 0.6.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d Gerrit-Change-Number: 12639 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 09:00:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:00:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:00:24 +0000 Subject: Change in gr-gsm[master]: python/trx/__init__.py: cosmetic: add missing new line In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12574 ) Change subject: python/trx/__init__.py: cosmetic: add missing new line ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I379b321866bd892a52b0c272ed50c670da380a17 Gerrit-Change-Number: 12574 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:00:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:00:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:00:44 +0000 Subject: Change in gr-gsm[master]: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12575 ) Change subject: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie75e1d6e5e74c7c1cf34154633c1472e4b85dbb6 Gerrit-Change-Number: 12575 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:00:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:01:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:01:05 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: use existing 'dict_toggle_sign' block In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12576 ) Change subject: trx/radio_if.py: use existing 'dict_toggle_sign' block ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa616644a858f493b9f8706663f9e7fed717f3d0 Gerrit-Change-Number: 12576 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Sun, 20 Jan 2019 09:01:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:01:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:01:41 +0000 Subject: Change in gr-gsm[master]: python/trx: use CamelCase naming for basic classes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12629 ) Change subject: python/trx: use CamelCase naming for basic classes ...................................................................... Patch Set 1: Code-Review+1 Well, with things like TRX and CTRL spelled all-caps, it's not really CamelCase :P -- To view, visit https://gerrit.osmocom.org/12629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9 Gerrit-Change-Number: 12629 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:01:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:02:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:02:49 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: move init code from run() to __init__() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12630 ) Change subject: apps/grgsm_trx: move init code from run() to __init__() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bcc9c8a2d37d156bbec93be3838200f6c4a80c2 Gerrit-Change-Number: 12630 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:02:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:03:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:03:12 +0000 Subject: Change in gr-gsm[master]: python/trx: get rid of FakePM class In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12631 ) Change subject: python/trx: get rid of FakePM class ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie96eb9735ecaa3329135c7be976ffd277a2f64f4 Gerrit-Change-Number: 12631 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:03:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:07:45 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: do not init both rx_freq and tx_freq In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12632 ) Change subject: trx/radio_if.py: do not init both rx_freq and tx_freq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f251958ec90141d144fdb027aff20182131a1d1 Gerrit-Change-Number: 12632 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:07:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:08:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:08:02 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: introduce a new @property 'ready' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12633 ) Change subject: trx/radio_if.py: introduce a new @property 'ready' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I513da0f45c6a608d15fbd0e8eafe14d6af8833d7 Gerrit-Change-Number: 12633 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:08:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:08:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:08:42 +0000 Subject: Change in gr-gsm[master]: python/trx: introduce and use Transceiver class In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12635 ) Change subject: python/trx: introduce and use Transceiver class ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc88edbb69a68746cc8e01206dc86f7ea2fa80f Gerrit-Change-Number: 12635 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:08:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:09:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:09:52 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: do not print anything if freq. shift is 0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12636 ) Change subject: trx/radio_if.py: do not print anything if freq. shift is 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I100ce2ab8effc00e164e13253894445bdc816f06 Gerrit-Change-Number: 12636 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:09:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:10:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:10:03 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: update clock_offset_control in set_rx_freq() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12637 ) Change subject: trx/radio_if.py: update clock_offset_control in set_rx_freq() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I065bf664f775099c90c123c9ff75f262a73bf1be Gerrit-Change-Number: 12637 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 20 Jan 2019 09:10:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:10:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:10:13 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E20-de57_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12639 ) Change subject: Bump version: 0.5.1.20-de57 ? 0.6.0 ...................................................................... Bump version: 0.5.1.20-de57 ? 0.6.0 Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d --- M configure.ac M debian/changelog M debian/control M src/Makefile.am 4 files changed, 38 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 54d79f8..ba33ed9 100644 --- a/configure.ac +++ b/configure.ac @@ -59,9 +59,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) +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(ORTP, ortp >= 0.22.0) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/debian/changelog b/debian/changelog index 8645b47..6a6882d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +libosmo-abis (0.6.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix strncpy bugs in ipaccess.c, ipa_proxy.c + * ipa: don't crash on missing IPA ID GET message + + [ Harald Welte ] + * Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() + * debian/rules: Don't overwrite .tarball-version + + [ Pau Espin Pedrol ] + * ipaccess: Use osmo_fd_setup to set up callbacks + * ipaccess_rcvmsg: Fix bug introduced in previous commit + * ipa: Simplify code in ipa_client_read + * ipa: Simplify code in ipa_server_conn_read + * ipa: Allow signalling fd destroyed in ipa_client_read + * ipa: Allow signalling fd destroyed in ipa_server_conn_read + * ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb + * ipaccess: Allow passing return code in e1inp_line_ops->sign_link() + * debian: Fix libosmoabis soname package version + * debian: Conflict libosmoabis6 with libosmoabis5 + * ipacces: Log correct trx_nr during IPA GET + * ipaccess: Simplify handling of ipaccess e1line ts + * e1_input.h: Set correct type for input_signal_data->link_type + * osmo_ortp: Log domain and fix strings without endl char + + [ Stefan Sperling ] + * Properly deal with sockaddr_un socket path length limitations. + * ensure unix socket paths are NUL-terminated for bind/connect + + -- Harald Welte Sat, 19 Jan 2019 22:20:46 +0100 + libosmo-abis (0.5.1) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index e47fc22..24a082e 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ dh-autoreconf, libdpkg-perl, git, - libosmocore-dev (>= 0.6.4), + libosmocore-dev (>= 1.0.0), pkg-config, libortp-dev Standards-Version: 3.9.7 diff --git a/src/Makefile.am b/src/Makefile.am index eb2b572..9566617 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # 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=6:1:0 -TRAU_LIBVERSION=3:1:1 +ABIS_LIBVERSION=6:2:0 +TRAU_LIBVERSION=3:2:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I417065deb06ac7e8b3b8468b88cc803a41098c2d Gerrit-Change-Number: 12639 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:41:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:41:06 +0000 Subject: Change in libosmocore[master]: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12641 Change subject: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error ...................................................................... WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error gcc-8.2 is printing the following warning, which is an error when used -Werror like our --enable-werror: In file included from gprs_bssgp.c:34: In function ?tl16v_put?, inlined from ?tvlv_put.part.3? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_push? at ../../include/osmocom/gsm/tlv.h:386:2, inlined from ?bssgp_tx_dl_ud? at gprs_bssgp.c:1162:4: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? forming offset [11, 130] is out of the bounds [0, 10] of object ?mi? with type ?uint8_t[10]? {aka ?unsigned char[10]?} [-Werror=array-bounds] memcpy(buf, val, len); Where "130" sems to be the maximum value of uint8_t, shifted right one + 2. But even if we use strnlen() with "16" as maximum upper bound, gcc still believes there's a way that the return value of gsm48_generate_mid_from_imsi() could be 130. In fact, even when adding OSMO_ASSERTs inside gsm48_generate_mid(), gcc insists there is a problem :( Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 --- M src/gsm/gsm48.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/12641/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 795e98b..7e2564a 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -644,13 +644,15 @@ * \returns number of bytes used in \a buf */ uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type) { - uint8_t length = strnlen(id, 255), i, off = 0, odd = (length & 1) == 1; + uint8_t length = strnlen(id, 16), i, off = 0, odd = (length & 1) == 1; + /* maximum length == 16 */ buf[0] = GSM48_IE_MOBILE_ID; buf[2] = osmo_char2bcd(id[0]) << 4 | (mi_type & GSM_MI_TYPE_MASK) | (odd << 3); /* if the length is even we will fill half of the last octet */ buf[1] = (length + (odd ? 1 : 2)) >> 1; + /* buf[1] maximum = 18/2 = 9 */ for (i = 1; i < buf[1]; ++i) { uint8_t upper, lower = osmo_char2bcd(id[++off]); @@ -662,6 +664,7 @@ buf[2 + i] = (upper << 4) | lower; } + /* maximum return value: 2 + 9 = 11 */ return 2 + buf[1]; } -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:45:26 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 09:45:26 +0000 Subject: Change in libosmocore[master]: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12641 to look at the new patch set (#2). Change subject: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error ...................................................................... WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error gcc-8.2 is printing the following warning, which is an error when used -Werror like our --enable-werror: In file included from gprs_bssgp.c:34: In function ?tl16v_put?, inlined from ?tvlv_put.part.3? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_push? at ../../include/osmocom/gsm/tlv.h:386:2, inlined from ?bssgp_tx_dl_ud? at gprs_bssgp.c:1162:4: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? forming offset [11, 130] is out of the bounds [0, 10] of object ?mi? with type ?uint8_t[10]? {aka ?unsigned char[10]?} [-Werror=array-bounds] memcpy(buf, val, len); Where "130" sems to be the maximum value of uint8_t, shifted right one + 2. But even if we use strnlen() with "16" as maximum upper bound, gcc still believes there's a way that the return value of gsm48_generate_mid_from_imsi() could be 130. In fact, even when adding OSMO_ASSERTs inside gsm48_generate_mid(), gcc insists there is a problem :( Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 --- M src/gsm/gsm48.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/12641/2 -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 20 09:49:45 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Jan 2019 09:49:45 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c444445b7e60_39fdea667c43599c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 109s] 06 [ 109s] [ 109s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 109s] - [ 109s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 109s] 07 [ 109s] [ 109s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 109s] + [ 109s] result (UNBLOCK) = 1 [ 109s] [ 109s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 109s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 109s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 109s] make[1]: *** [override_dh_auto_test] Error 1 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] debian/rules:45: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] obs-arm-7 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 09:49:25 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 111s] [ 98.856975] sysrq: SysRq : Power Off [ 111s] [ 98.858345] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] obs-arm-7 failed "build osmo-sgsn_1.3.0.dsc" at Sun Jan 20 09:49:29 UTC 2019. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 20 09:54:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 20 Jan 2019 09:54:45 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if_bb.py: reset transceiver on POWEROFF In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12634 ) Change subject: trx/ctrl_if_bb.py: reset transceiver on POWEROFF ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12634/1/python/trx/radio_if.py File python/trx/radio_if.py: https://gerrit.osmocom.org/#/c/12634/1/python/trx/radio_if.py at 273 PS1, Line 273: do we need I think yes, but trxcon would need to always send both RXTUNE and TXTUNE before POWERON. Currently it doesn't :/ -- To view, visit https://gerrit.osmocom.org/12634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e7f74c56388a431794a0b32b8a9537c360f5d33 Gerrit-Change-Number: 12634 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 20 Jan 2019 09:54:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 10:23:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 10:23:02 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E6-a555_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12640 to look at the new patch set (#2). Change subject: Bump version: 0.3.0.6-a555 ? 0.4.0 ...................................................................... Bump version: 0.3.0.6-a555 ? 0.4.0 Change-Id: I99a3244f922382468251df675287520ca40d9d0d --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/40/12640/2 -- To view, visit https://gerrit.osmocom.org/12640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I99a3244f922382468251df675287520ca40d9d0d Gerrit-Change-Number: 12640 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 10:23:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 10:23:19 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E6-a555_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12640 ) Change subject: Bump version: 0.3.0.6-a555 ? 0.4.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99a3244f922382468251df675287520ca40d9d0d Gerrit-Change-Number: 12640 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 10:23:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 10:38:54 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 20 Jan 2019 10:38:54 +0000 Subject: Change in libosmocore[master]: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12641 ) Change subject: WIP: Attempt to avoid bogus gcc-8.2 array-bounds warning/error ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12641/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12641/2//COMMIT_MSG at 23 PS2, Line 23: the return value of gsm48_generate_mid_from_imsi() : could be 130 Oh, wow... https://gerrit.osmocom.org/#/c/12641/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12641/2/src/gsm/gsm48.c at 668 PS2, Line 668: 2 + buf[1] Hmm, why do we add 2 here? We use buf[0], buf[1], and buf[2], and then buf[2 + i], where i starts from 1... I think one byte is lost, and we should return 3 + buf[1]. -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 20 Jan 2019 10:38:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 13:04:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 13:04:21 +0000 Subject: Change in libosmocore[master]: constrain gsm48_generate_mid() output array bounds In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12641 to look at the new patch set (#3). Change subject: constrain gsm48_generate_mid() output array bounds ...................................................................... constrain gsm48_generate_mid() output array bounds The longest BCd-digit type identity is the IMEISV with 16, so there's no point in trying to parse up to 255 decimal digits, which will do nothing but to overflow the caller-provided output buffer. Let's also clearly define the required minimum size of the output buffer and add a reltead #define for it. Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 --- M include/osmocom/gsm/gsm48.h M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c M src/gsm/gsm48.c 4 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/12641/3 -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 13:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 13:04:22 +0000 Subject: Change in libosmocore[master]: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12642 Change subject: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits ...................................................................... gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits The IMEI-SV is speified as a 16 digit number: 14 digits of IMEI plus two digits of software version. Let's not try to feed 18 digit long numbers into our functions, as the resulting behavior is unspecified. Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/12642/1 diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 6902e8e..2d60b84 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -422,17 +422,17 @@ }, { .mi_type = GSM_MI_TYPE_IMEISV, - .mi_str = "987654321098765432", - .mi_name = "IMEI-SV-987654321098765432", - .expect_mi_tlv_hex = "170a937856341290785634f2", + .mi_str = "9876543210987654", + .mi_name = "IMEI-SV-9876543210987654", + .expect_mi_tlv_hex = "17099378563412907856f4", }, { .mi_type = GSM_MI_TYPE_IMEISV, - .mi_str = "987654321098765432", - .mi_name = "IMEI-SV-987654321098765432", - .expect_mi_tlv_hex = "170a937856341290785634f2", - .str_size = 16, - .expect_str = "987654321098765", + .mi_str = "9876543210987654", + .mi_name = "IMEI-SV-9876543210987654", + .expect_mi_tlv_hex = "17099378563412907856f4", + .str_size = 17, + .expect_str = "9876543210987654", }, { /* gsm48 treats TMSI as decimal string */ diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 8f6630b..0bd101d 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -40,14 +40,14 @@ -> MI-TLV-hex='17089a78563412907856' -> MI-str="987654321098765" rc=16 -> MI-name="IMEI-987654321098765" -- IMEI-SV 987654321098765432 - -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765432" rc=19 - -> MI-name="IMEI-SV-987654321098765432" -- IMEI-SV 987654321098765432 - -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765" rc=16 - -> MI-name="IMEI-SV-987654321098765432" +- IMEI-SV 9876543210987654 + -> MI-TLV-hex='17099378563412907856f4' + -> MI-str="9876543210987654" rc=17 + -> MI-name="IMEI-SV-9876543210987654" +- IMEI-SV 9876543210987654 + -> MI-TLV-hex='17099378563412907856f4' + -> MI-str="9876543210987654" rc=17 + -> MI-name="IMEI-SV-9876543210987654" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 -- To view, visit https://gerrit.osmocom.org/12642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 Gerrit-Change-Number: 12642 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 13:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 13:04:22 +0000 Subject: Change in libosmocore[master]: WIP: Work around bogus gcc-8.2 array-bounds warning/error Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12643 Change subject: WIP: Work around bogus gcc-8.2 array-bounds warning/error ...................................................................... WIP: Work around bogus gcc-8.2 array-bounds warning/error gcc-8.2 is printing the following warning, which is an error when used -Werror like our --enable-werror: In file included from gprs_bssgp.c:34: In function ?tl16v_put?, inlined from ?tvlv_put.part.3? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_push? at ../../include/osmocom/gsm/tlv.h:386:2, inlined from ?bssgp_tx_dl_ud? at gprs_bssgp.c:1162:4: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? forming offset [12, 130] is out of the bounds [0, 11] of object ?mi? with type ?uint8_t[11]? {aka ?unsigned char[11]?} [-Werror=array-bounds] memcpy(buf, val, len); Where "130" seems to be the maximum value of uint8_t, shifted right one + 2. But even as we use strnlen() with "16" as maximum upper bound, gcc still believes there's a way that the return value of gsm48_generate_mid_from_imsi() could be 130. In fact, even the newly-added OSMO_ASSERT() inside gsm48_generate_mid() doesn't help and gcc still insists there is a problem :( Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec --- M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/12643/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index be7ef9f..4a4bab3 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1157,10 +1157,17 @@ /* IMSI */ if (dup->imsi && strlen(dup->imsi)) { uint8_t mi[GSM48_MID_MAX_SIZE]; +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" int imsi_len = gsm48_generate_mid_from_imsi(mi, dup->imsi); if (imsi_len > 2) msgb_tvlv_push(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop } /* DRX parameters */ @@ -1220,7 +1227,14 @@ else bgph->pdu_type = BSSGP_PDUT_PAGING_CS; /* IMSI */ +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop /* DRX Parameters */ msgb_tvlv_put(msg, BSSGP_IE_DRX_PARAMS, 2, (uint8_t *) &drx_params); diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index 77350e2..bef9bb1 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -183,10 +183,16 @@ if (!msg) return -ENOMEM; - +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" /* strip the MI type and length values (2 bytes) */ if (imsi_len > 2) msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop LOGPC(DBSSGP, LOGL_NOTICE, "IMSI=%s ", imsi); return common_tx_radio_status2(msg, cause); -- To view, visit https://gerrit.osmocom.org/12643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec Gerrit-Change-Number: 12643 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 13:31:38 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 20 Jan 2019 13:31:38 +0000 Subject: Change in libosmocore[master]: constrain gsm48_generate_mid() output array bounds In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/12641 ) Change subject: constrain gsm48_generate_mid() output array bounds ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 20 Jan 2019 13:31:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:03:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:03:13 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E6-a555_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12640 ) Change subject: Bump version: 0.3.0.6-a555 ? 0.4.0 ...................................................................... Bump version: 0.3.0.6-a555 ? 0.4.0 Change-Id: I99a3244f922382468251df675287520ca40d9d0d --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 23 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 4246c00..66ec57f 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.1) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index c08bf9e..6c56148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +libosmo-netif (0.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix strncpy bug in rs232.c + * logging: fix typo in stream.c + + [ Harald Welte ] + * Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() + * link libosmo-netif against libosmogsm + * debian/rules: Don't overwrite .tarball-version + + [ Pau Espin Pedrol ] + * jibuf: fix indentation in line inside conditional clause + + [ Stefan Sperling ] + * detect freed connections in osmo_stream_srv_read() + + -- Harald Welte Sat, 19 Jan 2019 22:28:01 +0100 + libosmo-netif (0.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/src/Makefile.am b/src/Makefile.am index de7dff5..d92d0f6 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=6:0:0 +LIBVERSION=6:1:0 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/12640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I99a3244f922382468251df675287520ca40d9d0d Gerrit-Change-Number: 12640 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:04:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:04:14 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E0=2E39-b723_=E2=86=92_1=2E0=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12644 Change subject: Bump version: 0.10.0.39-b723 ? 1.0.0 ...................................................................... Bump version: 0.10.0.39-b723 ? 1.0.0 Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd --- M debian/changelog M debian/control R debian/libosmo-sigtran3.install M debian/rules M src/Makefile.am 5 files changed, 65 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/44/12644/1 diff --git a/debian/changelog b/debian/changelog index 135d08e..06496c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,61 @@ +libosmo-sccp (1.0.0) unstable; urgency=medium + + [ Harald Welte ] + * Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() + * debian/rules: Don't overwrite .tarball-version + * Revert "Install systemd services with autotools" + * osmo-stp.cfg: Ensure example config is well-formed + * First step towards an OsmoSTP manual + * STP: Update vty reference XML file + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua + * xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp + * Install systemd services with autotools + * Install systemd services with autotools + * debian/rules: Remove duplicated override_dh_auto_test section + * Install sample cfg file to /etc/osmocom + * debian: Document why enable-static is used in dh_auto_configure + + [ Neels Hofmeyr ] + * ipa_asp_fsm: init: expect IPA ID ACK, not GET + * cosmetic: sccp_scoc.c: fix timers definition units + * drop inaccurate comment from osmo_ss7_vty.c + * vty: fix 'show asp' from within 'asp' node + * allow less characters for SCCP address book entries + * add tests/vty: VTY UI transcript testing + * sccp_vty: define SCCP_STR once + * vty: tweak two printed strings + * vty: install 'show cs7' for sccp addrs on _ve nodes + * cosmetic: allocate ss7->sccp in one common function + * sccp_vty: fix doc strings for show ... ssn,connections + * make SCCP timers configurable + * build: move include/{mtp,sccp} to include/osmocom/ + * osmo-stp: add SCCP related VTY commands + * Importing history from osmo-gsm-manuals.git + * OsmoSTP: update VTY reference + * stp: update vty reference + * stp: update vty reference with added SCCP commands + + [ Stefan Sperling ] + * skip simple-client default as/asp when saving VTY config + * return error code from xua_srv_conn_cb() if conn is freed + * fix ipa_asp_fsm down state transition + + [ Max ] + * Make pointcode width function public + * Log ip:port for created SS7 server + * SS7: safeguard against wrong number of pointcode component + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 11:33:22 +0100 + libosmo-sccp (0.10.0) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 8680bba..44d0fc6 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ . This package contains the development files for the library. -Package: libosmo-sigtran0 +Package: libosmo-sigtran3 Section: libs Architecture: any Multi-Arch: same @@ -52,7 +52,7 @@ Architecture: any Section: debug Multi-Arch: same -Depends: libosmo-sigtran0 (= ${binary:Version}), +Depends: libosmo-sigtran3 (= ${binary:Version}), ${misc:Depends} Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -67,7 +67,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmo-sigtran0 (= ${binary:Version}), + libosmo-sigtran3 (= ${binary:Version}), libjs-jquery Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -82,7 +82,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmo-sigtran0 (= ${binary:Version}), + libosmo-sigtran3 (= ${binary:Version}), libosmocore-dev, libosmo-netif-dev Description: Development headers for the Osmocom SIGTRAN library @@ -97,7 +97,7 @@ Architecture: any Multi-Arch: same Section: net -Depends: libosmo-sigtran0, +Depends: libosmo-sigtran3, ${shlibs:Depends}, ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) diff --git a/debian/libosmo-sigtran0.install b/debian/libosmo-sigtran3.install similarity index 100% rename from debian/libosmo-sigtran0.install rename to debian/libosmo-sigtran3.install diff --git a/debian/rules b/debian/rules index 0bf9673..f443aee 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ dh $@ --with autoreconf override_dh_strip: - dh_strip -plibosmo-sigtran0 --dbg-package=libosmo-sigtran-dbg + dh_strip -plibosmo-sigtran3 --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 9cea642..56567d6 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=2:0:2 +LIBVERSION=3: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/12644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd Gerrit-Change-Number: 12644 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:12:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:12:32 +0000 Subject: Change in libosmo-sccp[master]: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12645 Change subject: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized ...................................................................... sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized This fixes the following compiler warning when using -Werror on gcc-8.2: sccp.c: In function ?sccp_system_incoming_ctx?: sccp.c:1039:10: error: ?result.destination_local_reference? may be used uninitialized in this function [-Werror=maybe-uninitialized] && memcmp(&conn->source_local_reference, result.destination_local_reference, sizeof(conn->source_local_reference)) == 0 sccp.c:1030:27: note: ?result.destination_local_reference? was declared here struct sccp_parse_result result; ^~~~~~ Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490 --- M src/sccp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/45/12645/1 diff --git a/src/sccp.c b/src/sccp.c index 8c3641c..ec0f3b7 100644 --- a/src/sccp.c +++ b/src/sccp.c @@ -1027,7 +1027,7 @@ /* Handle the release confirmed */ static int _sccp_handle_connection_release_complete(struct msgb *msgb) { - struct sccp_parse_result result; + struct sccp_parse_result result = {}; struct sccp_connection *conn; if (_sccp_parse_connection_release_complete(msgb, &result) != 0) -- To view, visit https://gerrit.osmocom.org/12645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490 Gerrit-Change-Number: 12645 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:17:50 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:17:50 +0000 Subject: Change in libosmo-sccp[master]: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12645 ) Change subject: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490 Gerrit-Change-Number: 12645 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 14:17:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:17:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:17:52 +0000 Subject: Change in libosmo-sccp[master]: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12645 ) Change subject: sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized ...................................................................... sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized This fixes the following compiler warning when using -Werror on gcc-8.2: sccp.c: In function ?sccp_system_incoming_ctx?: sccp.c:1039:10: error: ?result.destination_local_reference? may be used uninitialized in this function [-Werror=maybe-uninitialized] && memcmp(&conn->source_local_reference, result.destination_local_reference, sizeof(conn->source_local_reference)) == 0 sccp.c:1030:27: note: ?result.destination_local_reference? was declared here struct sccp_parse_result result; ^~~~~~ Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490 --- M src/sccp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/sccp.c b/src/sccp.c index 8c3641c..ec0f3b7 100644 --- a/src/sccp.c +++ b/src/sccp.c @@ -1027,7 +1027,7 @@ /* Handle the release confirmed */ static int _sccp_handle_connection_release_complete(struct msgb *msgb) { - struct sccp_parse_result result; + struct sccp_parse_result result = {}; struct sccp_connection *conn; if (_sccp_parse_connection_release_complete(msgb, &result) != 0) -- To view, visit https://gerrit.osmocom.org/12645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490 Gerrit-Change-Number: 12645 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:17:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:17:58 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E0=2E39-b723_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12644 ) Change subject: Bump version: 0.10.0.39-b723 ? 1.0.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd Gerrit-Change-Number: 12644 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 14:17:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:18:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:18:15 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E0=2E39-b723_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12644 ) Change subject: Bump version: 0.10.0.39-b723 ? 1.0.0 ...................................................................... Bump version: 0.10.0.39-b723 ? 1.0.0 Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd --- M debian/changelog M debian/control R debian/libosmo-sigtran3.install M debian/rules M src/Makefile.am 5 files changed, 65 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 135d08e..06496c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,61 @@ +libosmo-sccp (1.0.0) unstable; urgency=medium + + [ Harald Welte ] + * Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() + * debian/rules: Don't overwrite .tarball-version + * Revert "Install systemd services with autotools" + * osmo-stp.cfg: Ensure example config is well-formed + * First step towards an OsmoSTP manual + * STP: Update vty reference XML file + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua + * xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp + * Install systemd services with autotools + * Install systemd services with autotools + * debian/rules: Remove duplicated override_dh_auto_test section + * Install sample cfg file to /etc/osmocom + * debian: Document why enable-static is used in dh_auto_configure + + [ Neels Hofmeyr ] + * ipa_asp_fsm: init: expect IPA ID ACK, not GET + * cosmetic: sccp_scoc.c: fix timers definition units + * drop inaccurate comment from osmo_ss7_vty.c + * vty: fix 'show asp' from within 'asp' node + * allow less characters for SCCP address book entries + * add tests/vty: VTY UI transcript testing + * sccp_vty: define SCCP_STR once + * vty: tweak two printed strings + * vty: install 'show cs7' for sccp addrs on _ve nodes + * cosmetic: allocate ss7->sccp in one common function + * sccp_vty: fix doc strings for show ... ssn,connections + * make SCCP timers configurable + * build: move include/{mtp,sccp} to include/osmocom/ + * osmo-stp: add SCCP related VTY commands + * Importing history from osmo-gsm-manuals.git + * OsmoSTP: update VTY reference + * stp: update vty reference + * stp: update vty reference with added SCCP commands + + [ Stefan Sperling ] + * skip simple-client default as/asp when saving VTY config + * return error code from xua_srv_conn_cb() if conn is freed + * fix ipa_asp_fsm down state transition + + [ Max ] + * Make pointcode width function public + * Log ip:port for created SS7 server + * SS7: safeguard against wrong number of pointcode component + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 11:33:22 +0100 + libosmo-sccp (0.10.0) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 8680bba..44d0fc6 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ . This package contains the development files for the library. -Package: libosmo-sigtran0 +Package: libosmo-sigtran3 Section: libs Architecture: any Multi-Arch: same @@ -52,7 +52,7 @@ Architecture: any Section: debug Multi-Arch: same -Depends: libosmo-sigtran0 (= ${binary:Version}), +Depends: libosmo-sigtran3 (= ${binary:Version}), ${misc:Depends} Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -67,7 +67,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmo-sigtran0 (= ${binary:Version}), + libosmo-sigtran3 (= ${binary:Version}), libjs-jquery Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -82,7 +82,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmo-sigtran0 (= ${binary:Version}), + libosmo-sigtran3 (= ${binary:Version}), libosmocore-dev, libosmo-netif-dev Description: Development headers for the Osmocom SIGTRAN library @@ -97,7 +97,7 @@ Architecture: any Multi-Arch: same Section: net -Depends: libosmo-sigtran0, +Depends: libosmo-sigtran3, ${shlibs:Depends}, ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) diff --git a/debian/libosmo-sigtran0.install b/debian/libosmo-sigtran3.install similarity index 100% rename from debian/libosmo-sigtran0.install rename to debian/libosmo-sigtran3.install diff --git a/debian/rules b/debian/rules index 0bf9673..f443aee 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ dh $@ --with autoreconf override_dh_strip: - dh_strip -plibosmo-sigtran0 --dbg-package=libosmo-sigtran-dbg + dh_strip -plibosmo-sigtran3 --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 9cea642..56567d6 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=2:0:2 +LIBVERSION=3: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/12644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd Gerrit-Change-Number: 12644 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 14:20:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 14:20:23 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E90-ed0c-dirty_=E2=86=92_1=2E5=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12646 Change subject: Bump version: 1.4.0.90-ed0c-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.90-ed0c-dirty ? 1.5.0 Change-Id: I8f7c7b75f38ebd1ee48605596424af48cc1ad53d --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-mgcp-client5.install M src/libosmo-mgcp-client/Makefile.am 6 files changed, 114 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/46/12646/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 3969146..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,4 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp-client various Drop legacy API functions and mgcp_client_conf members diff --git a/configure.ac b/configure.ac index 6f6ad4b..15976e6 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,10 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.3.0) +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(LIBOSMONETIF, libosmo-netif >= 0.4.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index e731351..c1708fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-mgw (1.5.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gitignore: Filter *.pc + * configure: Find correct libgsm's gsm.h header + * vty: Fix typo writing bts-jitter-buffer-delay-{min,max} + * Remove libosmo-legacy-mgcp and osmo-bsc-mgcp + * debian: Remove dangling symlink to osmo-bsc-mgcp.service + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * mgcp: Fix osmux_cid_bitmap static array size calculation + * mgcp_osmux: Use define to calculate rtp_ssrc_winlen + * osmux: Avoid initing output without enabling osmux + * mgcp: Log endpoint nr consistently as hex + * osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled + * osmux: Don't process regular osmux frames if disabled by cfg + * osmux: Move parse_cid of legacy dummy frames to own function + * osmux: Make func handling dummy frames independent of endp type + * osmux: allow enabling osmux only on correct activating state + * osmux: Improve checks around activating and using enabled osmux + * osmux.h: Document enum osmux_state + * osmux: Avoid processing further frames if conn not found + + [ Philipp Maier ] + * mgcp_client_fsm: allow ptmap in mgcp_client_fsm as well + * mgcp_network: translate payload type numbers in RTP packets + * mgcp_client: use IETF source port as for MGCP + * mgcp_client: increment local port number when port is in use + * mgcp_test: release endpoints after use + * network: do not patch PT of RTCP packets + * network: check packets before further processing + * Cosmetic: remove misplaced line break + * mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) + * mgcp_sdp: restructure mgcp_write_response_sdp() (audio) + * mgcp_client: check local port only once + * mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() + * mgcp_protocol: increase buffer space for codec name in LCO + * osmo-mgw: Add vty reference manual + + [ Neels Hofmeyr ] + * fix handling of "Wrong domain name" error + * interpret domain '*' as 'allow any domain' + * cosmetic: log: fix "CallIDs does not match" + * fix 3G hack: allow any IP for loopback and 0.0.0.0 + * cosmetic: drop code dup in mgcp_client_fsm.c CRCX + * add X-Osmo-IGN MGCP header to ignore CallID + * X-Osmo-IGN: rather parse items by token, not char + * mgcp_test: fix log of conn_id presence + * mgcp_test: fix get_conn_id_from_response() CI length + * mgcp_client_test: cosmetically re-arrange reply_to() args + * mgcp_client_test: use "\r\n\r\n" instead of "\n\n" + * mgcp_client_test: also verify received conn_id + * mgcp_client_test: test long conn_id + * mgcp_client: error on too long conn id + * mgcp_common: rename to MGCP_CONN_ID_MAXLEN + * doc: fix mgcp_verify_ci() return val doc + * mgcp_verify_ci(): return meaningful error codes + * fix mgcp_verify_ci(): off-by-one in max len check + * generate shorter 'I:' conn IDs + * mgcp_conn_get(): compare conn Id ('I:') case insensitively + * mgcp_conn_get(): match conn Id ('I:') despite leading zeros + * cosmetic: mgcp_test: fix get_conn_id_from_response() + * comment: indicate struct type for mgcp_endpoint.conns + * log: avoid logging early media as error + * fix osmo-mgw -s; fixes osmo-mgw.service using -s + * Importing history from osmo-gsm-manuals.git + * OsmoMGW: update VTY reference + * OsmoMGW: document the 'X-Osmo-IGN' MGCP extension + * mgw: update vty reference + * drop/replace very weird logging in mgcp_client.c + * check_rtp: on IP:port errors, log the IP and port + * osmo-mgw: err-log: include expected domain name + * mgcp_client_vty: fix missing talloc_free + * mgcp_client: drop a bunch of dead code + * mgcp_client: logging tweaks + * mgcp_client: make domain part of endpoint configurable + * mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} + + [ Stefan Sperling ] + * add VTY commands which show specific mgcp endpoints + * add MGCP CRCX command statistics to osmo-mgw + * show RTP TX/RX stats in 'mgcp show stats' output + * use local variable for rate counters in handle_create_con() + * add more mgcp crxc error counters + * add MDCX command statistics to osmo-mgw + * add aggregated rtp connection stats to osmo-mgw + * add DLCX command statistics to osmo-mgw + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * check_rtp_origin(): Don't memcmp sockadd_in and in_addr + * check_rtp_origin(): Avoid using memcmp for comparing integer types + * vty-ref: Update URI of docbook 5.0 schema + + [ Daniel Willmann ] + * mgw: Add new VTY reference + * Add initial OsmoMGW manual + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * jenkins.sh: remove leftover MGCP env variable + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 15:02:18 +0100 + osmo-mgw (1.4.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index d51f463..6fb34c0 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client3 +Package: libosmo-mgcp-client5 Section: libs Architecture: any Multi-Arch: same @@ -31,5 +31,5 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client3 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client5 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities diff --git a/debian/libosmo-mgcp-client3.install b/debian/libosmo-mgcp-client5.install similarity index 100% rename from debian/libosmo-mgcp-client3.install rename to debian/libosmo-mgcp-client5.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index d3f8fff..e59da2f 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=4:0:1 +MGCP_CLIENT_LIBVERSION=5:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/12646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8f7c7b75f38ebd1ee48605596424af48cc1ad53d Gerrit-Change-Number: 12646 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 15:47:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 15:47:00 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E90-ed0c-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12646 ) Change subject: Bump version: 1.4.0.90-ed0c-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f7c7b75f38ebd1ee48605596424af48cc1ad53d Gerrit-Change-Number: 12646 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 15:47:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 15:47:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 15:47:01 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E90-ed0c-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12646 ) Change subject: Bump version: 1.4.0.90-ed0c-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.90-ed0c-dirty ? 1.5.0 Change-Id: I8f7c7b75f38ebd1ee48605596424af48cc1ad53d --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-mgcp-client5.install M src/libosmo-mgcp-client/Makefile.am 6 files changed, 114 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 3969146..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,4 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp-client various Drop legacy API functions and mgcp_client_conf members diff --git a/configure.ac b/configure.ac index 6f6ad4b..15976e6 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,10 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.3.0) +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(LIBOSMONETIF, libosmo-netif >= 0.4.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index e731351..c1708fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-mgw (1.5.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gitignore: Filter *.pc + * configure: Find correct libgsm's gsm.h header + * vty: Fix typo writing bts-jitter-buffer-delay-{min,max} + * Remove libosmo-legacy-mgcp and osmo-bsc-mgcp + * debian: Remove dangling symlink to osmo-bsc-mgcp.service + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * mgcp: Fix osmux_cid_bitmap static array size calculation + * mgcp_osmux: Use define to calculate rtp_ssrc_winlen + * osmux: Avoid initing output without enabling osmux + * mgcp: Log endpoint nr consistently as hex + * osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled + * osmux: Don't process regular osmux frames if disabled by cfg + * osmux: Move parse_cid of legacy dummy frames to own function + * osmux: Make func handling dummy frames independent of endp type + * osmux: allow enabling osmux only on correct activating state + * osmux: Improve checks around activating and using enabled osmux + * osmux.h: Document enum osmux_state + * osmux: Avoid processing further frames if conn not found + + [ Philipp Maier ] + * mgcp_client_fsm: allow ptmap in mgcp_client_fsm as well + * mgcp_network: translate payload type numbers in RTP packets + * mgcp_client: use IETF source port as for MGCP + * mgcp_client: increment local port number when port is in use + * mgcp_test: release endpoints after use + * network: do not patch PT of RTCP packets + * network: check packets before further processing + * Cosmetic: remove misplaced line break + * mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) + * mgcp_sdp: restructure mgcp_write_response_sdp() (audio) + * mgcp_client: check local port only once + * mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() + * mgcp_protocol: increase buffer space for codec name in LCO + * osmo-mgw: Add vty reference manual + + [ Neels Hofmeyr ] + * fix handling of "Wrong domain name" error + * interpret domain '*' as 'allow any domain' + * cosmetic: log: fix "CallIDs does not match" + * fix 3G hack: allow any IP for loopback and 0.0.0.0 + * cosmetic: drop code dup in mgcp_client_fsm.c CRCX + * add X-Osmo-IGN MGCP header to ignore CallID + * X-Osmo-IGN: rather parse items by token, not char + * mgcp_test: fix log of conn_id presence + * mgcp_test: fix get_conn_id_from_response() CI length + * mgcp_client_test: cosmetically re-arrange reply_to() args + * mgcp_client_test: use "\r\n\r\n" instead of "\n\n" + * mgcp_client_test: also verify received conn_id + * mgcp_client_test: test long conn_id + * mgcp_client: error on too long conn id + * mgcp_common: rename to MGCP_CONN_ID_MAXLEN + * doc: fix mgcp_verify_ci() return val doc + * mgcp_verify_ci(): return meaningful error codes + * fix mgcp_verify_ci(): off-by-one in max len check + * generate shorter 'I:' conn IDs + * mgcp_conn_get(): compare conn Id ('I:') case insensitively + * mgcp_conn_get(): match conn Id ('I:') despite leading zeros + * cosmetic: mgcp_test: fix get_conn_id_from_response() + * comment: indicate struct type for mgcp_endpoint.conns + * log: avoid logging early media as error + * fix osmo-mgw -s; fixes osmo-mgw.service using -s + * Importing history from osmo-gsm-manuals.git + * OsmoMGW: update VTY reference + * OsmoMGW: document the 'X-Osmo-IGN' MGCP extension + * mgw: update vty reference + * drop/replace very weird logging in mgcp_client.c + * check_rtp: on IP:port errors, log the IP and port + * osmo-mgw: err-log: include expected domain name + * mgcp_client_vty: fix missing talloc_free + * mgcp_client: drop a bunch of dead code + * mgcp_client: logging tweaks + * mgcp_client: make domain part of endpoint configurable + * mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} + + [ Stefan Sperling ] + * add VTY commands which show specific mgcp endpoints + * add MGCP CRCX command statistics to osmo-mgw + * show RTP TX/RX stats in 'mgcp show stats' output + * use local variable for rate counters in handle_create_con() + * add more mgcp crxc error counters + * add MDCX command statistics to osmo-mgw + * add aggregated rtp connection stats to osmo-mgw + * add DLCX command statistics to osmo-mgw + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * check_rtp_origin(): Don't memcmp sockadd_in and in_addr + * check_rtp_origin(): Avoid using memcmp for comparing integer types + * vty-ref: Update URI of docbook 5.0 schema + + [ Daniel Willmann ] + * mgw: Add new VTY reference + * Add initial OsmoMGW manual + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * jenkins.sh: remove leftover MGCP env variable + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 15:02:18 +0100 + osmo-mgw (1.4.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index d51f463..6fb34c0 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client3 +Package: libosmo-mgcp-client5 Section: libs Architecture: any Multi-Arch: same @@ -31,5 +31,5 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client3 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client5 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities diff --git a/debian/libosmo-mgcp-client3.install b/debian/libosmo-mgcp-client5.install similarity index 100% rename from debian/libosmo-mgcp-client3.install rename to debian/libosmo-mgcp-client5.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index d3f8fff..e59da2f 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=4:0:1 +MGCP_CLIENT_LIBVERSION=5:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/12646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8f7c7b75f38ebd1ee48605596424af48cc1ad53d Gerrit-Change-Number: 12646 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 18:34:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 18:34:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E55-607c-dirty_=E2=86=92_1=2E0=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12647 Change subject: Bump version: 0.2.1.55-607c-dirty ? 1.0.0 ...................................................................... Bump version: 0.2.1.55-607c-dirty ? 1.0.0 Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 --- M configure.ac M debian/changelog 2 files changed, 76 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/47/12647/1 diff --git a/configure.ac b/configure.ac index 99f7829..866da39 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +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(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 3763f55..d120866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,74 @@ +osmo-hlr (1.0.0) unstable; urgency=medium + + [ Stefan Sperling ] + * move creation of insert subscriber data messages to a common function + + [ Harald Welte ] + * Return proper GSUP error in case of too short IMSI + * disable blind subscriber insertion into every VLR/SGSN + * gsup_server: Add "priv" pointer and make it point to 'struct hlr' + * move osmo_gsup_addr_send() declaration from luop.h to gsup_router.h + * gsup_router: Use "#pragma once" and add missing #includes + * Add "show gsup-connections" VTY command + * import gsup_client.c as new libosmo-gsup-client + * gsup_client: rename gsup_client_* to osmo_gsup_client_* + * GSUP: Log GSUP route add/remove + * hlr: Export + Declare global g_hlr symbol + * USSD: Add Core USSD handling + VTY routing config to HLR + * USSD: Add basic dispatch + decode of GSUP-encapsulated SS/USSD + * hlr_ussd: Introduce LOGPSS() macro + * USSD: Send ReturnError component if USSD Code unknown / EUSE disconnected + * USSD: Further unification of log output; Use LOGPSS when possible + * osmo-hlr.cfg: Don't enable DEBUG logging by default + * USSD: Add new "DSS" logging category and use it appropriately + * USSD: fix null-pointer deref in "default-route" vty/config cmd + * Add osmo-euse-demo as minimalistic test of a External USSD (EUSE) handler + * USSD: Add support for internal USSD handlers + * debian: Add sub-package for libosmo-gsup-client + * pkg-config: Fix libosmo-gsup-client pkg-config file + * gitignore: Add .tarball-version + * debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 + * USSD: Fix "ussd default-route" + * libosmo-gsup-client: License is GPLv2-or-later + * osmo-hlr.cfg: Ensure well-formed config file example + + [ Martin Hauke ] + * sql/Makefile.am: Make docsdir completely configurable + * debian: Fix typo in package description + + [ Pau Espin Pedrol ] + * debian: Avoid installing duplicate cfg file in /etc + * sql/Makefile: Install hlr_data.sql as example together with hlr.sql + * sql/Makefile: Install sql files under doc/.../sql subdir + * sql/Makefile: Create empty /var/lib/osmocom directory at install time + * Install systemd services with autotools + * Move doc/Makefile.am to doc/examples/Makefile.am + * Install sample cfg file to /etc/osmocom + + [ Vadim Yanitskiy ] + * hlr.c: move deinitialization code from SIGINT handler + * hlr.c: free root talloc context on exit + * hlr.c: track the use of talloc NULL memory contexts + * src/db.c: fix: make sure the database is properly closed + * src/db.c: don't ignore the result of db_bootstrap() + * hlr_vty_subscr.c: fix subscriber creation command help + * Update .gitignore: add missing build products + * tests/Makefile.am: also remove temporary sqlite files + * hlr_ussd.h: add #pragma once include guard + * hlr_ussd.h: use proper libc headers + * Update .gitignore: ignore osmo-euse-demo + * hlr_ussd.h: drop meaningless forward declaration + * USSD/hlr_vty.c: print error if EUSE is not found + * hlr_ussd.c: fix: properly print a EUSE / IUSE name + * hlr_ussd.c: avoid using CR and NL in IUSE responses + + [ Neels Hofmeyr ] + * fix build: adjust test_nodes.vty to logging change + * tweak example config + * make: always allow running python tests manually + + -- Harald Welte Sun, 20 Jan 2019 19:29:58 +0100 + osmo-hlr (0.2.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 Gerrit-Change-Number: 12647 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 19:53:51 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 19:53:51 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E125-7c78_=E2=86=92_1=2E0=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12648 Change subject: Bump version: 0.4.0.125-7c78 ? 1.0.0 ...................................................................... Bump version: 0.4.0.125-7c78 ? 1.0.0 Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde --- M debian/changelog 1 file changed, 147 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/12648/1 diff --git a/debian/changelog b/debian/changelog index a9724d8..7461107 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,150 @@ +osmo-trx (1.0.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * doc: examples: Add umtrx sample config + * UHDDevice: Fix setup failure with LimeSuite > 18.04.1 + * examples: Set rt-prio 18 and print file basename + * lms: Several improvements and compilation/runtime fixes + * build: Add support for LimeSuite device backend + * LMSDevice: Set correct values for Max{Tx,Rx}Gain + * LMSDevice: Fix setup failure with LimeSuite > 18.04.1 + * lms: Makefile.am: Reorder params to fix link issue + * lms: Check LPBFW to set is within supported range + * debian: Add package osmo-trx-lms + * contrib: Add systemd services for all backends + * debian: Add cfg file examples for osmo-trx-{lms,uhd} + * Add -V param to print version + * lms: Allow values diff than 34dB to be set by setRxGain() + * Use correct paths when installing example files + * debian: Enable build of osmo-trx-lms + * debian: Explicitly enable osmo-trx-uhd build + * configure.ac: Fix typo in with-lms help string + * vty: Fix typo in gpsdo clock reference type + * configure.ac: Add --enable-werror option + * Logger: Disable pthread cancel point inside Logger destructor + * cosmetic: Fix trailing whitespace + * radioInterface: forward errors from RadioDevice to Transceiver in recv path + * lms: Return error on device read timeout + * osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error + * radioInterface: Fix variable storing integer return value + * configure.ac: Specify default language as C++ + * UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp + * SigProcLib: Use available copyTo Vector API instead of memcopy + * cosmetic: Fix trailing whitespace in several files + * radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array + * Vector: Copy arrays in a sane way for non-trivially copyable types + * jenkins.sh: Add --enable-werror flag to osmo-trx configure step + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * cosmetic: Use proper whitespace in several for loops + * Use pthread_setname_np to name threads + * CommonLibs/Makefile.am: Specify libcommon_la_LIBADD + * Transciever: Log values causing Tx underrun + * examples: Use logging level 'set-all' instead of 'all' + * jenkins.sh: Enable build of osmo-trx-lms + * ChannelizerBase: Fix ASan alloc-dealloc-mismatch + * UHDDevice: setRxGain on chan 0 when using multi-arfcn + * lms: Use LimeSuite.h log level defines instead of hardcoded values + * lms: Apply LMS->OSMO log level conversion + * Introduce OsmoTRX manual + * Introduce chapter trx_if.adoc and add it to OsmoTRX and OsmoBTS + * trx: Add reference to project wiki page in overfiew section + * trx: Add Hardware architecture support section + * trx: Add Hardware device support section + * osmotrx: Split Device specific section from backend one + * osmotrx: Write initial documentation for several supported devices + * osmotrx: configuration: Add section to document multi-arfcn feature + * osmotrx: Create a common chapter for section documenting backends + * osmotrx: Introduce code architecture chapter + * lms: Fix start after stop of device + * lms: Destroy streams on device stop + * radioInterface: Fix memleak during close() + * PointerFIFO: Fix memleak of ListNode + * lms: Make sure LMS_Close is called when Device is torn down + * osmo-trx: Change some lines to use libosmocore logging instead of cout + * lms: Close device on LMS_Init failure + * SigProcLib: Improve Vector buffer allocation mess + * lms: Allow setting Tx/RxGain for chan!=0 + * lms: Allow setting Tx/RxFreq for lchan!=0 + * lms: Improve Set{Rx,Tx}{Gain,Freq} logging + * transceiver: log chan on CTRL command received + * Add TRXCTRL log category + * transceiver: Log TRXCTRL iface responses towards osmo-bts-trx + * lms: Move {under,over}run checks into separate method + * lms: Do {under,over}run checks even if LMS_RecvStream fails + * Timeval: passed() returns true if time is equal + * Timeval: Move implementation to use clock_gettime and timespec + * Timeval: Move to osmo_clock_gettime + * TimevalTest: Make test deterministic with fake time + * lms: Fix build against LimeSuite > 18.10 + * configure.ac: check boost only if USRP1 support is enabled + + [ Vadim Yanitskiy ] + * trx_vty.c: fix: use CONFIG_NODE as parent by default + * device/lms/LMSDevice.cpp: fix compilation warning + * sigProcLib: introduce both TS1 and TS2 RACH synch. sequences + * sigProcLib: add a CorrType for extended (11-bit) RACH + + [ Harald Welte ] + * Initial work towards direct LimeSuite support in OsmoTRX + * update .gitignore to include osmo-trx-lms + * LMSDevice: Call LMS_Init() before setting sample rate + * LMSDevice: Print sample rate range + actual sample rate after setting it + * LMSDevice: Typo fix: s/Internal/External + * LMSDevice: Set low-pass filters to smallest possible option + * LMSDevice: Fix initial timestamp offset of 2500 + * LMS_Device: Set ts_offset to 0. + * LMSDevice: Reduce Rx logging verbosity: Only log unexpected timestamps + * move set_antennas() from UHD to generic radioDevice base class + * lms: Fix support for rx_paths / tx_paths + * lms: Call set_antennas() during open() method + * radioDevice: Move tx_sps from derived into base class + * radioDevice: better encapsulation in base class + * lms: Fix coding style + * lms: Fail in case of unsupported configuration + * usrp1: Fail in case of unsupported configuration + * Fix config file saving of {tx,rx}-path VTY config strings + * logging: Introduce new "DDEV" category for device-specific code + * update git-version-gen to generate proper version numbers + * ensure well-formed example config files + * SocketsTest.testReaderIP(): Zero terminate received buffer + * trx_validate_config(): Fix validation of rx_sps + * vty-ref: Update URI of docbook 5.0 schema + * lms: User correct scale factor for transmit samples + * lms: Set Rx gain to midpoint, as comment suggests. + * usrp1: Remove uninitialized skipRx logic + * usrp1: Fix formatting of log message (missing space) + * cosmetic: Don't call the SDR "USRP" in error message + * lms: Use a default Tx gain value of 64 dB. + + [ Zydrunas Tamosevicius ] + * lms: Use same timestamp offset like when using LimeSDR via UHD + * lms: Reduce log level of "send buffer of len ..." + * lms: fix LMS_StartStream() handling for multiple channels + * lms: Reduce Rx gain from 47 to 34 dB + + [ Alexander Couzens ] + * debian: add patches for debian8 + + [ Oliver Smith ] + * Add long parameters (--help, --version, ...) + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * jenkins.sh: run "make distcheck" + * contrib: fix makedistcheck with disabled systemd + * osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp + * LMSDevice: make use of dev-args in osmo-trx.cfg + * LMSDeviceTest: fix link errors on OBS + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + + [ d0gtail ] + * UHDDevice: log exception information on device open failure + + -- Harald Welte Sun, 20 Jan 2019 19:35:04 +0100 + osmo-trx (0.4.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde Gerrit-Change-Number: 12648 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 19:54:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 19:54:53 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E125-7c78_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12648 ) Change subject: Bump version: 0.4.0.125-7c78 ? 1.0.0 ...................................................................... Bump version: 0.4.0.125-7c78 ? 1.0.0 Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde --- M debian/changelog 1 file changed, 146 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/12648/2 -- To view, visit https://gerrit.osmocom.org/12648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde Gerrit-Change-Number: 12648 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 19:59:02 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 20 Jan 2019 19:59:02 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 4: Code-Review-1 Talking with tnt my comments pointed out a bug, so setting -1 on this one. -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 20 Jan 2019 19:59:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:04:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:04:33 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E55-607c-dirty_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12647 to look at the new patch set (#2). Change subject: Bump version: 0.2.1.55-607c-dirty ? 1.0.0 ...................................................................... Bump version: 0.2.1.55-607c-dirty ? 1.0.0 Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 --- M configure.ac M debian/changelog 2 files changed, 77 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/47/12647/2 -- To view, visit https://gerrit.osmocom.org/12647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 Gerrit-Change-Number: 12647 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:04:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:04:33 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: Since libosmocore 1.0.0, we only have one space Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12649 Change subject: test_nodes.vty: Since libosmocore 1.0.0, we only have one space ...................................................................... test_nodes.vty: Since libosmocore 1.0.0, we only have one space The output of "logging level" was wrongly indented with two speaces, and in commit 0d67f483e2d240089105a4d241cb8c9085e245af of libosmocore, first released as part of libosmcoore-1.0.0 it was fixed. This makes "make check" pass against libosmocore-1.0.0, but not against earlier releases. Change-Id: I2cc12b3f0df19d9055022db41f7f3f2789bd19c6 --- M tests/test_nodes.vty 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/12649/1 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 95e132d..a9d4ac4 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -108,10 +108,10 @@ ! log stderr ... - logging level main notice - logging level db notice - logging level auc notice - logging level ss info + logging level main notice + logging level db notice + logging level auc notice + logging level ss info ... hlr gsup -- To view, visit https://gerrit.osmocom.org/12649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2cc12b3f0df19d9055022db41f7f3f2789bd19c6 Gerrit-Change-Number: 12649 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:05:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:05:52 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E125-7c78_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12648 ) Change subject: Bump version: 0.4.0.125-7c78 ? 1.0.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde Gerrit-Change-Number: 12648 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:05:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:05:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:05:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E125-7c78_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12648 ) Change subject: Bump version: 0.4.0.125-7c78 ? 1.0.0 ...................................................................... Bump version: 0.4.0.125-7c78 ? 1.0.0 Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde --- M debian/changelog 1 file changed, 146 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index a9724d8..dc20ec8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,149 @@ +osmo-trx (1.0.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * doc: examples: Add umtrx sample config + * UHDDevice: Fix setup failure with LimeSuite > 18.04.1 + * examples: Set rt-prio 18 and print file basename + * lms: Several improvements and compilation/runtime fixes + * build: Add support for LimeSuite device backend + * LMSDevice: Set correct values for Max{Tx,Rx}Gain + * LMSDevice: Fix setup failure with LimeSuite > 18.04.1 + * lms: Makefile.am: Reorder params to fix link issue + * lms: Check LPBFW to set is within supported range + * debian: Add package osmo-trx-lms + * contrib: Add systemd services for all backends + * debian: Add cfg file examples for osmo-trx-{lms,uhd} + * Add -V param to print version + * lms: Allow values diff than 34dB to be set by setRxGain() + * Use correct paths when installing example files + * debian: Enable build of osmo-trx-lms + * debian: Explicitly enable osmo-trx-uhd build + * configure.ac: Fix typo in with-lms help string + * vty: Fix typo in gpsdo clock reference type + * configure.ac: Add --enable-werror option + * Logger: Disable pthread cancel point inside Logger destructor + * cosmetic: Fix trailing whitespace + * radioInterface: forward errors from RadioDevice to Transceiver in recv path + * lms: Return error on device read timeout + * osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error + * radioInterface: Fix variable storing integer return value + * configure.ac: Specify default language as C++ + * UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp + * SigProcLib: Use available copyTo Vector API instead of memcopy + * cosmetic: Fix trailing whitespace in several files + * radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array + * Vector: Copy arrays in a sane way for non-trivially copyable types + * jenkins.sh: Add --enable-werror flag to osmo-trx configure step + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * cosmetic: Use proper whitespace in several for loops + * Use pthread_setname_np to name threads + * CommonLibs/Makefile.am: Specify libcommon_la_LIBADD + * Transciever: Log values causing Tx underrun + * examples: Use logging level 'set-all' instead of 'all' + * jenkins.sh: Enable build of osmo-trx-lms + * ChannelizerBase: Fix ASan alloc-dealloc-mismatch + * UHDDevice: setRxGain on chan 0 when using multi-arfcn + * lms: Use LimeSuite.h log level defines instead of hardcoded values + * lms: Apply LMS->OSMO log level conversion + * Introduce OsmoTRX manual + * Introduce chapter trx_if.adoc and add it to OsmoTRX and OsmoBTS + * trx: Add reference to project wiki page in overfiew section + * trx: Add Hardware architecture support section + * trx: Add Hardware device support section + * osmotrx: Split Device specific section from backend one + * osmotrx: Write initial documentation for several supported devices + * osmotrx: configuration: Add section to document multi-arfcn feature + * osmotrx: Create a common chapter for section documenting backends + * osmotrx: Introduce code architecture chapter + * lms: Fix start after stop of device + * lms: Destroy streams on device stop + * radioInterface: Fix memleak during close() + * PointerFIFO: Fix memleak of ListNode + * lms: Make sure LMS_Close is called when Device is torn down + * osmo-trx: Change some lines to use libosmocore logging instead of cout + * lms: Close device on LMS_Init failure + * SigProcLib: Improve Vector buffer allocation mess + * lms: Allow setting Tx/RxGain for chan!=0 + * lms: Allow setting Tx/RxFreq for lchan!=0 + * lms: Improve Set{Rx,Tx}{Gain,Freq} logging + * transceiver: log chan on CTRL command received + * Add TRXCTRL log category + * transceiver: Log TRXCTRL iface responses towards osmo-bts-trx + * lms: Move {under,over}run checks into separate method + * lms: Do {under,over}run checks even if LMS_RecvStream fails + * Timeval: passed() returns true if time is equal + * Timeval: Move implementation to use clock_gettime and timespec + * Timeval: Move to osmo_clock_gettime + * TimevalTest: Make test deterministic with fake time + * lms: Fix build against LimeSuite > 18.10 + * configure.ac: check boost only if USRP1 support is enabled + + [ Vadim Yanitskiy ] + * trx_vty.c: fix: use CONFIG_NODE as parent by default + * device/lms/LMSDevice.cpp: fix compilation warning + * sigProcLib: introduce both TS1 and TS2 RACH synch. sequences + * sigProcLib: add a CorrType for extended (11-bit) RACH + + [ Harald Welte ] + * Initial work towards direct LimeSuite support in OsmoTRX + * update .gitignore to include osmo-trx-lms + * LMSDevice: Call LMS_Init() before setting sample rate + * LMSDevice: Print sample rate range + actual sample rate after setting it + * LMSDevice: Typo fix: s/Internal/External + * LMSDevice: Set low-pass filters to smallest possible option + * LMSDevice: Fix initial timestamp offset of 2500 + * LMS_Device: Set ts_offset to 0. + * LMSDevice: Reduce Rx logging verbosity: Only log unexpected timestamps + * move set_antennas() from UHD to generic radioDevice base class + * lms: Fix support for rx_paths / tx_paths + * lms: Call set_antennas() during open() method + * radioDevice: Move tx_sps from derived into base class + * radioDevice: better encapsulation in base class + * lms: Fix coding style + * lms: Fail in case of unsupported configuration + * usrp1: Fail in case of unsupported configuration + * Fix config file saving of {tx,rx}-path VTY config strings + * logging: Introduce new "DDEV" category for device-specific code + * update git-version-gen to generate proper version numbers + * ensure well-formed example config files + * SocketsTest.testReaderIP(): Zero terminate received buffer + * trx_validate_config(): Fix validation of rx_sps + * vty-ref: Update URI of docbook 5.0 schema + * lms: User correct scale factor for transmit samples + * lms: Set Rx gain to midpoint, as comment suggests. + * usrp1: Remove uninitialized skipRx logic + * usrp1: Fix formatting of log message (missing space) + * cosmetic: Don't call the SDR "USRP" in error message + + [ Zydrunas Tamosevicius ] + * lms: Use same timestamp offset like when using LimeSDR via UHD + * lms: Reduce log level of "send buffer of len ..." + * lms: fix LMS_StartStream() handling for multiple channels + * lms: Reduce Rx gain from 47 to 34 dB + + [ Alexander Couzens ] + * debian: add patches for debian8 + + [ Oliver Smith ] + * Add long parameters (--help, --version, ...) + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * jenkins.sh: run "make distcheck" + * contrib: fix makedistcheck with disabled systemd + * osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp + * LMSDevice: make use of dev-args in osmo-trx.cfg + * LMSDeviceTest: fix link errors on OBS + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + + [ d0gtail ] + * UHDDevice: log exception information on device open failure + + -- Harald Welte Sun, 20 Jan 2019 19:35:04 +0100 + osmo-trx (0.4.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibb888f55a1ab27088d5f21ee8ad699f4f747abde Gerrit-Change-Number: 12648 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:08:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:08:10 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: Since libosmocore 1.0.0, we only have one space In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12649 ) Change subject: test_nodes.vty: Since libosmocore 1.0.0, we only have one space ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2cc12b3f0df19d9055022db41f7f3f2789bd19c6 Gerrit-Change-Number: 12649 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:08:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:08:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:08:13 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E55-607c-dirty_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12647 ) Change subject: Bump version: 0.2.1.55-607c-dirty ? 1.0.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 Gerrit-Change-Number: 12647 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:08:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:08:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:08:14 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: Since libosmocore 1.0.0, we only have one space In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12649 ) Change subject: test_nodes.vty: Since libosmocore 1.0.0, we only have one space ...................................................................... test_nodes.vty: Since libosmocore 1.0.0, we only have one space The output of "logging level" was wrongly indented with two speaces, and in commit 0d67f483e2d240089105a4d241cb8c9085e245af of libosmocore, first released as part of libosmcoore-1.0.0 it was fixed. This makes "make check" pass against libosmocore-1.0.0, but not against earlier releases. Change-Id: I2cc12b3f0df19d9055022db41f7f3f2789bd19c6 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/12649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2cc12b3f0df19d9055022db41f7f3f2789bd19c6 Gerrit-Change-Number: 12649 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:08:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:08:14 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E55-607c-dirty_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12647 ) Change subject: Bump version: 0.2.1.55-607c-dirty ? 1.0.0 ...................................................................... Bump version: 0.2.1.55-607c-dirty ? 1.0.0 Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 --- M configure.ac M debian/changelog 2 files changed, 77 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 618ae23..6694f80 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +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(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 3763f55..ecb36d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +osmo-hlr (1.0.0) unstable; urgency=medium + + [ Stefan Sperling ] + * move creation of insert subscriber data messages to a common function + + [ Harald Welte ] + * Return proper GSUP error in case of too short IMSI + * disable blind subscriber insertion into every VLR/SGSN + * gsup_server: Add "priv" pointer and make it point to 'struct hlr' + * move osmo_gsup_addr_send() declaration from luop.h to gsup_router.h + * gsup_router: Use "#pragma once" and add missing #includes + * Add "show gsup-connections" VTY command + * import gsup_client.c as new libosmo-gsup-client + * gsup_client: rename gsup_client_* to osmo_gsup_client_* + * GSUP: Log GSUP route add/remove + * hlr: Export + Declare global g_hlr symbol + * USSD: Add Core USSD handling + VTY routing config to HLR + * USSD: Add basic dispatch + decode of GSUP-encapsulated SS/USSD + * hlr_ussd: Introduce LOGPSS() macro + * USSD: Send ReturnError component if USSD Code unknown / EUSE disconnected + * USSD: Further unification of log output; Use LOGPSS when possible + * osmo-hlr.cfg: Don't enable DEBUG logging by default + * USSD: Add new "DSS" logging category and use it appropriately + * USSD: fix null-pointer deref in "default-route" vty/config cmd + * Add osmo-euse-demo as minimalistic test of a External USSD (EUSE) handler + * USSD: Add support for internal USSD handlers + * debian: Add sub-package for libosmo-gsup-client + * pkg-config: Fix libosmo-gsup-client pkg-config file + * gitignore: Add .tarball-version + * debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 + * USSD: Fix "ussd default-route" + * libosmo-gsup-client: License is GPLv2-or-later + * osmo-hlr.cfg: Ensure well-formed config file example + * test_nodes.vty: Since libosmocore 1.0.0, we only have one space + + [ Martin Hauke ] + * sql/Makefile.am: Make docsdir completely configurable + * debian: Fix typo in package description + + [ Pau Espin Pedrol ] + * debian: Avoid installing duplicate cfg file in /etc + * sql/Makefile: Install hlr_data.sql as example together with hlr.sql + * sql/Makefile: Install sql files under doc/.../sql subdir + * sql/Makefile: Create empty /var/lib/osmocom directory at install time + * Install systemd services with autotools + * Move doc/Makefile.am to doc/examples/Makefile.am + * Install sample cfg file to /etc/osmocom + + [ Vadim Yanitskiy ] + * hlr.c: move deinitialization code from SIGINT handler + * hlr.c: free root talloc context on exit + * hlr.c: track the use of talloc NULL memory contexts + * src/db.c: fix: make sure the database is properly closed + * src/db.c: don't ignore the result of db_bootstrap() + * hlr_vty_subscr.c: fix subscriber creation command help + * Update .gitignore: add missing build products + * tests/Makefile.am: also remove temporary sqlite files + * hlr_ussd.h: add #pragma once include guard + * hlr_ussd.h: use proper libc headers + * Update .gitignore: ignore osmo-euse-demo + * hlr_ussd.h: drop meaningless forward declaration + * USSD/hlr_vty.c: print error if EUSE is not found + * hlr_ussd.c: fix: properly print a EUSE / IUSE name + * hlr_ussd.c: avoid using CR and NL in IUSE responses + + [ Neels Hofmeyr ] + * fix build: adjust test_nodes.vty to logging change + * tweak example config + * make: always allow running python tests manually + + -- Harald Welte Sun, 20 Jan 2019 19:29:58 +0100 + osmo-hlr (0.2.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I696beb6f0b82dfaf664f62066cffbcc94e31b700 Gerrit-Change-Number: 12647 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:14:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:14:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E199-5c93-dirty_=E2=86=92_1=2E0=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12650 Change subject: Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 ...................................................................... Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 Change-Id: Ie33252aef4144f9bb825d7c234970fd4e6083bb2 --- M configure.ac M debian/changelog 2 files changed, 242 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/12650/1 diff --git a/configure.ac b/configure.ac index e3fefea..15c4259 100644 --- a/configure.ac +++ b/configure.ac @@ -62,14 +62,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) +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(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) AC_ARG_ENABLE(sysmobts-calib, diff --git a/debian/changelog b/debian/changelog index 09e2a83..a33d21f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,237 @@ +osmo-bts (1.0.0) unstable; urgency=medium + + [ Stefan Sperling ] + * let osmo-bts log a special notice if OML connection is closed early + * log reception of PCU_IF_MSG_PAG_REQ messages from osmo-pcu + * update sysinfo copies in all lchans upon SACCH FILL + * preserve lchan-specific SI overrides on SACCH FILL + * fix timespec subtraction in compute_elapsed_us() + * fix conditions for sending fill frames during RTS IND + * send TCH/F fill frames in DTX mode (WIP) + * Revert "send TCH/F fill frames in DTX mode (WIP)" + * prevent potential NULL dereference in virtbts's tx_tchh_fn + * properly initialize si3 in test_is_ccch_for_agch_setup() + * add missing check of osmo_wqueue_enqueue() return value + + [ Harald Welte ] + * scheduler_trx: Add reminders to use libosmocore functions + * cosmetic: it's n_r in check_for_first_ciphrd(), not n_s + * Add min/max/std-dev measurement reporting for TOA256 + * debian/rules: Don't overwrite .tarball-version + * CBCH: Fix rejecting SMS-CB related RSL messages + * [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() + * CBCH: Move processing via L1SAP + * CBCH: Implement CBCH support for osmo-bts-{trx,virtual} + * CBCH: Use llist_first_entry_or_null() instead of reinventing it + * l1sap/scheduler: Consistently print chan_nr as hex number + * CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} + * get_lchan_by_chan_nr(): Fix resolution of CBCH + * CBCH: Add FIXME comments on queue overflow/underflow handling + * CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure + * CBCH: Fix CBCH implementation for osmo-bts-trx + * CBCH: Some more scheduler_mframe cleanup + * ensure all config file examples are well-formed + * lc15bts_mgr_vty: Ensure writing well-formed config files + * paging_test: Fix AGCH/PCH split test for second half of 102 multiframe + * Fix computing CCCH block number from frame number + * sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC + * scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * spelling: message discriminator, not descriminator + * osmobts-abis: Add Revision log regarding dynamic cannels + * Documentation on AMR RTP in case of DTX + * rtp-amr.adoc: TCH/AFS Uplink + * rtp-amr.adoc: TCH/AFS Downlink: Inhibiting + * rtp-amr: TCH/AHS Uplink: FACCH/H During DTX + * rtp-amr.adoc: New TCH/AHS downlink chapters + * rtp-amr.adoc: Fixes to Message Sequence Charts + * update osmo-bts-virtual documentation, now that code is merged + * vty-ref: Update URI of docbook 5.0 schema + * osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop + * osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 + * osmo-bts-trx/loops.c: Use lchan name based logging + * osmo-bts-trx/loops.c: Make code control flow more readable + + [ Philipp Maier ] + * rtp: make port range configurable, assign correct port numbers + * octphy: add support for 16x oversampling mode + * cosmetic: separate measurement testcase definitions + * cosmetic: unify measurement sample handling in one function + * measurement: make sure state is reset on chan act. + * measurement: make sure measurement interval end is detected + * measurement: fix measurement interval end detection + * osmo_mcast_sock: make sure SO_REUSEADDR is applied + * cosmetic: fix sourcecode formatting + * cosmetic: remove wrong comment + * measurement: add unit tests for is_meas_complete() + * measurement: fix sub frame table for TCH/H, SS1 + * measurement: add unit tests for ts45008_83_is_sub() + * measurement: fix is_meas_overdue() and increase testcoverage + * cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s + * cosmetic: test_is_meas_overdue() does not test is_meas_complete() + * measurement: substitue missing measurements + * measurement: add SUB measurements in test_lchan_meas_process_measurement + * paging: add unit-test to check different bs_ag_blks_res settings + * measurement: display fn_mod when measuremnet is added + * cosmetic: fix typo in comment + * measurement: remove missed interval end detection + * measurement: fix unit-test test_lchan_meas_process_measurement + + [ Pau Espin Pedrol ] + * bts.c: Log name of RR msg type instead of value + * bts.c: Add missing include for gsm48_rr_msg_name + * bts_agch_enqueue: Decrease queue len hard_limit from 1000 to 100 + * compact AGCH queue: Drop too msg diff than IMM_ASS_REJ + * Send DELETE_IND when dropping Imm Assign pending message + * lc15: Use correct type for hLayer1 field + * lc15: Fix incorrect cast of hLayer1 + * pcu_sock: Log event pcu_sock created + * l1_if.c: Move decl of vars used in conditional macro + * sysmo: vty: Add missing include for lchan_deactivate + * sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0 + * sysmo: l1if_mute_rf: Declare vars inside ifdef section + * sysmo: l1_if.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build + * sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build + * jenkins_*.sh: add --enable-werror to configure flags + * doc: Move calypsoBTS example into trx subdir + * build: Install example cfg files + * debian: Package installed example doc files + * Remove unneeded direct libortp dependency + * debian: Make osmo-bts-* packages conflict with old osmo-bts package + * debian: Create dbg package for osm-bts-virtual + * rsl: Use value_string to print encryption algo name + * l1sap: add_l1sap_header: Compact msgb_push ret assignment + * sched: Log RX->RTP packet like we do in add_l1sap_header + * scheduler: Log error on fn jump + * trx: scheduler: Keep RTP clock up to date while in DTXu pause + * Move systemd service to contrib/systemd + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * doc/examples/Makefile: Install bts-mgr cfg files used by systemd services + * lc15: vty: Add missing include for lchan_deactivate + * lc15: fsync requires fd instead of file stream + * lc15: rewrite and refactor code to print hwversion description + * lc15: led_sleep_cb: pass correct ptr to llist_move_tail + * abis: inp_s_cbfn: Improve logging signal related information + * lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected + * l1sap: Log name of chan_nr instead of hex value + * rsl_rx_chan-activ: Improve logging information + * gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN + * Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa + * {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 + * bts: Allocate TRX for BTS dynamically, deprecate -t + * bts-trx: trx_if: Use struct to store CTRL msg parsed responses + * bts-trx: setup timer once at creation time + * common: Implement OML for trx_set_available(1) + * bts-trx: Allow re-try without exit if POWERON fails in osmo-trx + * bts: Fix TRX0 param initialization + * rsl: Log lchan state during dynts PDCH->TCH + * rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK + * bts-trx: early return on POWERON success + * cosmetic: fix whitespace + * bts_model: Allow TS connect to be processed asynchronously + * OsmoBTS/chapters/configuration.adoc: Add bts index in example + * OsmoBTS: Update osmotrx ip to diff between local and remote + * rtp-amr: Describe requirement to recieve all PH-DATA.ind events + * rtp-amr: Fix typo and trailing whitespace + * Allow easily disabling GFDL references + * OsmoBTS: bts-models: Add Lime Microsystems devices as supported osmo-trx + * Introduce chapter trx_if.adoc and add it to OsmoTRX and OsmoBTS + * bts: Fix typo + * oc2g: Fix headers missing during make distcheck + * bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT + * sysmobts_mgr: Prepare code for gpsd < 2.96 support + * sysmobts_mgr: Add support for gpsd < 2.96 + * rsl: Send PDCH ACT NACK if TCH chan is still active + + [ Vadim Yanitskiy ] + * Clarify frame loss counter for l1sched_chan_state + * osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg + * common/rsl.c: tweak log message in lapdm_rll_tx_cb() + * contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' + * common/pcu_sock.c: cosmetic: explicitly address lchan + * common/scheduler.c: track TDMA frame loss per logical channels + * common/vty.c: fix deprecated osmo_str2lower() usage + * Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() + + [ Neels Hofmeyr ] + * cosmetic: abis.c: typo "exixt" + * fix ip.access dyn TS for osmo-bts-trx + * fix RSL Chan Mode Modif for dyn TS + * vty: mark 'rtp bind-ip' deprecated, not hidden + * Importing history from osmo-gsm-manuals + * OsmoBTS: typo x2 ('Objects Classes' -> 'Object Classes') + * OsmoBTS: fix typos, streamline language style + * OsmoBTS: s/content of this attribute/this attribute/ + * OsmoBTS: explain IEs marked 'ignored' *and* 'Received' + * abis/oml.doc: remove duplicate sentence part + * OsmoBTS: typos + * OsmoBTS: wording tweak + * OsmoBTS: hardware support: remove dup, tweak wording + * Document dynamic channels on Abis, both IPA and Osmocom style + * OsmoBTS/abis/rsl: fix subtitle for ladder diagram of osmo dyn switchover + * OsmoBTS/abis/dyn_ts_osmocom_style.msc: adjust PDCH Act ack + * OsmoBTS/abis/rsl.adoc: fix missing section header + * OsmoBTS/chapters/dynamic-timeslots.adoc: Remove obsolete links + * osmobts-usermanual.adoc: fix link to abis.adoc chapter + * OsmoBTS/chapters/configuration.adoc: fix index numbering + * OsmoBTS/abis/rsl: cosmetic: 'IPA style' + * OsmoBTS/abis/rsl: add missing info for Osmocom Dyn Channels + * make clean: also remove generated image files + * add 'make check' target + * OsmoBTS/abis/rsl: combine separate dyn ts sections + * fix 'make clean': shell glob, ignore failure + * OsmoBTS/abis/rsl: split dyn TS ladder diagrams to fit on page + * fix build: abis: re-add dependencies + * dynamic timeslots: add BSC level config instructions + * refactor Makefile build rules, don't use the FORCE + + [ Keith Whyte ] + * log: add error log for RSL Chan Mode Modif + * fix handling of odd pchans in bts_supports_cm() + + [ Omar Ramadan ] + * Add OC-2G BTS sources + + [ Max ] + * osmo-bts-trx: print TRX socket addresses in 'show transceiver' + * Fix type mismatch + * Drop unused function + * Add OsmoBTS control interface description + * Move RTP AMR doc to top level + * Add DTX implementation details to RTP AMR + * Sync DTX FSM with OsmoBTS code + + [ Holger Hans Peter Freyther ] + * OsmoBTS: Fix the author name and mail address + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Daniel Willmann ] + * Add section about configuring power-ramping + * OsmoBTS: Print VTY command in fixed-width font + * OsmoBTS: Fix typo + + [ Alexander Couzens ] + * OsmoBTS: add vty reference documentation + * OsmoBTS: generate osmobts-abis.pdf again + + [ Ivaylo Kostov ] + * BSC,BTS: add diagrams of PCU-BTS-NITB-SGSN relationships + + [ Philipp ] + * Describe how to run multiple instances of osmo-nitb and osmo-bts + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins_*.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:13:37 +0100 + osmo-bts (0.8.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie33252aef4144f9bb825d7c234970fd4e6083bb2 Gerrit-Change-Number: 12650 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:15:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:15:22 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: tests: Rework the convolve_test ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 4 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:25:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:25:44 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E293-605c_=E2=86=92_1=2E4=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12651 Change subject: Bump version: 1.3.0.293-605c ? 1.4.0 ...................................................................... Bump version: 1.3.0.293-605c ? 1.4.0 Change-Id: Iaedf16a3a03868c5ca6b1afe9fbac7b042905d51 --- M debian/changelog 1 file changed, 322 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/12651/1 diff --git a/debian/changelog b/debian/changelog index 2e07507..a4f4d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,325 @@ +osmo-bsc (1.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * inter-BSC HO: add neighbor_ident API to manage neighbor-BSS-cells + * inter-BSC HO: neighbor_ident API: drop 9bit BSIC + * doc: update/fix FSM charts + * fix / clarify rsl dtap cache + * rename gsm_04_08_utils.[hc] to gsm_04_08_rr + * cosmetic: move RR functions from bsc_api.c to gsm_04_08_rr.c + * add gsm_timers, for Tnnn definitions usable by FSMs + * large refactoring: use FSMs for lchans; add inter-BSC HO + * fix nanobts: timeslot FSM: use flags to remember OML,RSL status + * fix: dispatch TS_EV_RSL_DOWN when losing RSL + * timeslot FSM: fix infinite recursion on failure to send PDCH ACT + * timeslot FSM: permit entering broken state from anywhere + * cosmetic: FSMs: allow ignorable events + * fix BSC_CTR_ASSIGNMENT doc strings + * lchan_fsm: split off lchan_rtp_fsm, establish RTP a bit earlier + * lchan_fsm: add in_release_handler flag + * allocate larger lchans if no SDCCH are available + * create separate logging categories for lchan,ts,as FSMs + * cosmetic: constify gsm_bts_num() net arg + * vty: 'handover any': pick more random chans, use lchan_select_by_type() + * cosmetic: dissolve bsc_api.c + * cosmetic: reduce bsc_api.h + * cosmetic: rename bsc_api.h to gsm_08_08.h + * cosmetic: rename osmo_bsc_api.c to gsm_08_08.c + * cosmetic: gscon: don't re-enter ST_CLEARING + * use __FILE__, not __BASE_FILE__ + * fix lchan_rtp_fsm: missing event handling + * MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default + * cosmetic: neighbor_ident_vty.c: add and use common string defs + * neighbor_ident_vty.c: fix CI format, should be 16bit + * inter-BSC HO incoming: continue despite missing Classmark + * inter-BSC HO incoming: drop old/wrong RTP port code + * lchan_fsm: lchan_fail_to(): store target state early + * cosmetic: lchan_fsm failure: log about state transitions + * lchan_fsm: safer 'concluded' flag + * log: lchan_rtp_fsm: add missing '\n' + * log: 'sending BSSMAP HO Request ACK' + * inter-BSC HO: send failure msg directly + * log: tweaks and more context in osmo_bsc_sigtran_send() + * fix dependency bug: include mgcp_client/, not mgcp/ + * cosmetic: lchan activ: no need to clear mr again + * cosmetic: lchan activ: drop todo comments + * lchan: pick proper power and ta values + * SCCPlite Assignment Complete: include Speech Codec (Chosen) + * inter-BSC HO incoming: send BSSMAP HO Complete directly + * inter-BSC HO outgoing: fix L3 forwarding + * ho fsm: handle RR HO Failure for inter-BSC outgoing + * lchan_fsm: allow late RTP release events without erroring + * ts,lchan_fsm: do not attempt to allocate CBCH subslots + * Implement RR Classmark Enquiry + * fix LCLS during Assignment: actually use new TCH lchan + * cosmetic: drop param from send_assignment_complete() + * vty: add SCCP related vty commands + * make: allow vty-tests without configure + * test neighbor ident vty docs + * neighbor vty: drop keyword 'add' + * neighbor vty: rather 'no neighbor', not 'neighbor del' + * neighbor vty: allow setting local neighbors by CGI + * vty: write local neighbors by bts nr, not lac-ci + * fix counters for inter-BSC outgoing + * gscon_forget_lchan(): no Clear Request after Clear Command + * gscon_forget_lchan(): Clear Request iff no lchans remain + * subscr conn: properly forget lchan before release + * lchan_fsm: fix failure handling: notify conn when released + * handover_decision_2.c: tweak comments + * handover_decision_2.c: tweak ho candidate logging + * handover_decision_2.c: find_alternative_lchan: drop goto + * handover_decision_2.c: drop redundant debug_candidate() args + * lchan_fsm: notify conn of released lchan upon RF Release + * handover_fsm: adjust inter-BSC HO failure handling to spec + * remote-BSS neighbors: allow only one cell ID + * handover_decision_2.c: refactor trigger_*() + * handover_decision_2.c: implement HO to remote BSS + * abis_rsl.c: fix uninitialized RSL cause issues + * handover_fsm: fix missing newline for log statement + * handover_fsm: fix failure logging of uninitialized chan mode + * fix build: revert bad neighbor_ident.vty change + * vty doc: drop "(HO algo 2 only)" strings + * lchan_fsm_cleanup: drop redundant 'forget_lchan' call + * lchan: rf release: make sure conn is NULL + * dbug log: verbosely detach conn<->lchan + * fix: send RR Release (e.g. after BSSMAP Clear Cmd) + * abis_rsl.c: drop unused enum sacch_deact + * lchan: release in error: fix missing messages / events + * lchan release: always Deact SACCH + * cosmetic: lchan: introduce sub-struct lchan->release.* + * cosmetic: abis_rsl.c: drop uneccesary braces + * lchan: set cause for 4 instances of release_in_error = true + * coverity: gscon_forget_lchan: squelch forward-null + * always directly send BSSMAP Clear Request + * send Immediate Assignment Reject only before Immediate Assignment + * Importing history from osmo-gsm-manuals + * minor tweak + * make clean: also remove generated image files + * add 'make check' target + * OsmoBSC+NITB/running: fix title levels, one too deep + * OsmoBSC: include bts-examples.adoc from OsmoNITB + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + * OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA + * common / OsmoBSC: drop unused alink.adoc + * OsmoBSC: update VTY reference + * bsc: document handover + * bsc: handover: clarify default of all-cells-are-neighbors + * bsc: handover: mention the need to resend SI for telnet neighbor cfg + * author info: add "former" to Holger's job title + * OsmoBSC: update VTY reference + * follow-up: logging tweak for Immediate Assignment + * set gscon FSM instances' log level to DEBUG + * make sure early lchan act failure resets the lchan + * comments: describe some lchan details + * use mgcp-client configured endpoint domain name + + [ Philipp Maier ] + * endpoint_fsm: add missing return in mgcp_pick_codec + * gscon: use BSS-common payload types on BSS side + * sigtran: fix memleak in osmo_bsc_sigtran_send() + * GSCON: avoid sending connection oriented data when not connected + * GSCON: call api of a_reset.c with msc object directly + * lcls: do not LCLS call legs with different codecs + * doc: update mgw settings in example config file + * assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() + * codec_pref: fix typo in comment + * codec_pref: add AMR configuration bits to make_scl_config() in unit-test + * codec_pref: fix missing breaks in switch-case statement + * LCLS: fix codec mismatch detection + * gsm_data: remove unused struct member full_rate. + * gsm_data: remove unused struct member chan_mode + * assignment_fsm: only include speech codec (choosen) on AoIP networks + * gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() + * codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION + * lcls: log channel type and lchan names on LCLS codec mismatch + * codec_pref: handle S0-S15 in ASSIGNMENT REQUEST + * gsm_08_08: abort complete L3 3 msg gen when no codecs are set + * osmo_bsc_msc: Set reasonable codec list defaults + * codec_pref: check codec configuration before start + * codec_pref: cosmetic: seperate half/full rate determination + * codec_pref: also check physical channels + * gsm_08_08: allow zero length speech codec lists in compl l3 info. + * gsm_08_08: do not include zero length speech codec list. + * gsm_data: set meaningful default values for amr modes + * codec_pref: also check amr codec rates in check_codec_pref() + * gsm_04_08: improve gsm48_multirate_config() + * bsc_vty: check amr mode parameters + * lchan_fsm: generate proper multirate configuration IE on RSL + * gsm_data: make cgi_for_msc available for other modules + * handover_fsm: send HANDOVER PERFORMED msg on internal ho + * paging: fix nullpointer deref + * chan_alloc: remove references to lchan_alloc() + + [ Harald Welte ] + * Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() + * handover_fsm.c: Fix -Werror=format-security errors + * cbch: Don't send cell-broadcast command on BTS without CBCH channel + * gsm48_lchan2chan_desc() belongs to gsm_data.h + * Introduce gsm48_lchan2chan_desc_as_configured() + * CBCH: Fix SI4 CBCH IE generation + * CBCH: Fix gsm_bts_get_cbch() + * nanoBTS: Allow BCCH with CBCH on TS0 + * range_enc_determine_range(): Don't dereference array on size=0 + * handover_start_inter_bsc_in(): Uninitialized variable + * ipaccess-config: Fix open() return value checking + * bssmap_handle_cipher_mode(): Don't sent reject if !conn + * subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC + * acc_ramp: An unsigned int is always >= 0 + * ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * add Ericsson OM2000 message sequence charts (one for each MO) + * OM2000 message sequence charts: specify MO in node name + * OM2000 MSC: Fix spelling + * Add chapter on Cell Broadcast Support in Osmocom (to BSC+NITB manual) + * BSC: Add series of message sequence charts about MGCP handling + * mgw: Fix endpoint names for new MGW + * MGW: Include MGCP endpoint naming scheme of old IPA/SCCPlite approach + * add message sequence chart MS/BTS/BSC/MSC for 3GPP aoIP MO call + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * bsc: Use libosmocore API to track osmo_signal structs + * abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr + * abis_nm: Fix trailing whitespacing + * Fix heap-use-after-free due to OML link destruction + * abis_nm_ipaccess_rsl_connect: Log bts and trx nr + * codec_pref: Log unsupported codec name used + * codec_pref: Log HR2 specifically as never specified + * codec_pref.c: Add comment in expected switch case without break + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * osmo-bsc: Add default case for switch(enum) + * abis_nm_get_ts: Return TS of correct TRX, not always TRX0 + * ipaccess-config: Use enum value for OML IP + * abis_nm: Rename m_id_len to ease review of forthcoming patches + * abis_nm: Split handling of Attribute Response Info into its own func + * abis_nm: Split reported attr list parsing from Attribute Response Info into its own func + * abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS + * abis_nm: Add support to parse some nanoBTS Attribute Response attributes + * abis_nm: Add support to parse OML IP and Unit Id in Get Attributes + * abis_nm: Support parsing nanoBTS format for Get Attributes Info + * abis_nm: parse_attr_resp_info_unreported: Fix offset calculation + * examples: Remove neighbor-list invalid for default setup + * bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization + * bsc: vty: Use enum value in neighbor-list check + * bsc: gsm0808: Fix return code in bsc_compl_l3 + * osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init + * bsc: Prefix log string with related SI type during call to list_arfcn + * bsc: si: Fix SI2bis L2 pseudo length + * bsc: si: Fix SI2ter L2 pseudo length + * bsc: Enable force-combined-si on nanoBTS by default + * bsc: band_compatible: Return band non-compatible for invalid arfcn + * bsc: vty: Verify and warn on invalid arfcn passed + * abis_nm: Introduce new signal S_NM_GET_ATTR_REP + * ipaccess-config: Fix whitespace + * ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID + * ipaccess-config: cosmetic: Remove unneeded comment with hex values + * gsm0408_rcvmsg: Release lchan if L3 fails to complete + * ipaccess-config: Introduce -q quiet param + * Add osmux-reference document + * osmux-reference: Use packetdiag to draw packet header structures + * osmux-reference: Add sequence charts + * osmux-reference: Add traffic saving plot + * osmux-reference-docinfo: Add latest changes to revhistory + * osmux: Fix description for Dummy frames FT field + * Allow easily disabling GFDL references + * cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets + * bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested + * bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation + * bsc: ts_for_each_lchan: Improve documentation + * bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init + * bsc: Fix lchan iteration for dyn TS during PDCH Deact + * bsc: timelost_fsm: Remove unneeded set of out variable on failure + * bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan + * bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan + * bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms + * bsc: timeslot_fsm: Fix count in ts_lchans_waiting + * bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event + * bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED + * bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT + * bsc: lchan_fsm: Fix invalid duplicated transition + * paging: Add VTY options to calculate T3113 timeout dynamically + * paging: fix whitespace + * paging: Properly enclose logging imsi filter scope + * bsc_main: filter_fn: Compare imsi values instead of subscr pointers + * bsc: Set subscr log context during complete_layer3 + * bsc: rsl: Set subscr log context during meas report + * bsc: dtap: Set subscr log context + * bsc: bssap: Set subscr log context during paging + * Add VTY option to avoid sending empty Full BCCH Info for disabled SI + + [ Stefan Sperling ] + * check for overlong unix socket paths + * fix unaligned access in abis_nm_rx_ipacc() + * re-order condition checks for clarity + * show dynamic timeslot details in 'show timeslot' vty command + * check return value of gsm48_multirate_config() + * add missing 'break' in switch statement + * unlink socket path correctly in rf_create_socket() + + [ Martin Hauke ] + * cosmetics: Fix typo in bsc_vty.c + * ipaccess-config: Generate valid JSON output when using the -G parameter + * ipaccess-config: Fix indentation of the usage output + + [ Oliver Smith ] + * osmo_bsc_main.c: initialize rate counters + * vty 'show bts'/'show trx': display IPs and ports + * cosmetic: fix spec ref for gsm0808_cipher_mode() + * cipher mode reject: send proper cause codes + * vty: add 'show rejected-bts' + * ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP + * copy NITB's osmobsc-usermanual.adoc to OsmoBSC + * build manuals included from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Daniel Willmann ] + * debian: Require libcdk and install meas_vis osmo-bsc-meas-utils + * OsmoBSC/HLR/MSC: Fix default config file name + * gsm_04_08: Free GSM subscr conn if paging response can't be matched + * VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet + + [ Max ] + * vty: don't show GPRS details if not configured + * LCLS: move MGCP MDCX into separate function + * Make IP address helper accessible via header file + * constify rsl_tx_ipacc_*cx() parameters + * LCLS: expand logging to print the name of the mode in use + * LCLS: tighten GCR check + * LCLS: explicitly check for mode before closing the loop + * LCLS: move mode check into separate function + * LCLS: make config and control redable in 'sh conns' + * RSL: restructure MDCX functions + * LCLS: add bts-loop variant + * vty: add command to show TRX selectively + * Add OsmoBSC control interface description + * Add OsmoBSC control interface description + * OsmoBSC: update CTRL docs + * LCLS: update parameter representation + * LCLS: log config/control update + * IPA: log OML/RSL link drop reason + * LCLS: use enum values instead of magic numbers + * Print BTS number on GPRS options error + * Log MDCX ACK for established lchan + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Ivaylo Kostov ] + * BSC,BTS: add diagrams of PCU-BTS-NITB-SGSN relationships + + [ Alexander Couzens ] + * OsmoBSC: add rate counter documentation + + [ Vadim Yanitskiy ] + * osmo_bsc_bssap.c: fix incorrect link_id assignment + + -- Harald Welte Sun, 20 Jan 2019 21:21:24 +0100 + osmo-bsc (1.3.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/12651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaedf16a3a03868c5ca6b1afe9fbac7b042905d51 Gerrit-Change-Number: 12651 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:38:22 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:38:22 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E199-5c93-dirty_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12650 ) Change subject: Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie33252aef4144f9bb825d7c234970fd4e6083bb2 Gerrit-Change-Number: 12650 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:38:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:38:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:38:25 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E199-5c93-dirty_=E2=86=92_1=2E0=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12650 ) Change subject: Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 ...................................................................... Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 Change-Id: Ie33252aef4144f9bb825d7c234970fd4e6083bb2 --- M configure.ac M debian/changelog 2 files changed, 242 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index e3fefea..15c4259 100644 --- a/configure.ac +++ b/configure.ac @@ -62,14 +62,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) +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(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) AC_ARG_ENABLE(sysmobts-calib, diff --git a/debian/changelog b/debian/changelog index 09e2a83..a33d21f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,237 @@ +osmo-bts (1.0.0) unstable; urgency=medium + + [ Stefan Sperling ] + * let osmo-bts log a special notice if OML connection is closed early + * log reception of PCU_IF_MSG_PAG_REQ messages from osmo-pcu + * update sysinfo copies in all lchans upon SACCH FILL + * preserve lchan-specific SI overrides on SACCH FILL + * fix timespec subtraction in compute_elapsed_us() + * fix conditions for sending fill frames during RTS IND + * send TCH/F fill frames in DTX mode (WIP) + * Revert "send TCH/F fill frames in DTX mode (WIP)" + * prevent potential NULL dereference in virtbts's tx_tchh_fn + * properly initialize si3 in test_is_ccch_for_agch_setup() + * add missing check of osmo_wqueue_enqueue() return value + + [ Harald Welte ] + * scheduler_trx: Add reminders to use libosmocore functions + * cosmetic: it's n_r in check_for_first_ciphrd(), not n_s + * Add min/max/std-dev measurement reporting for TOA256 + * debian/rules: Don't overwrite .tarball-version + * CBCH: Fix rejecting SMS-CB related RSL messages + * [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() + * CBCH: Move processing via L1SAP + * CBCH: Implement CBCH support for osmo-bts-{trx,virtual} + * CBCH: Use llist_first_entry_or_null() instead of reinventing it + * l1sap/scheduler: Consistently print chan_nr as hex number + * CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} + * get_lchan_by_chan_nr(): Fix resolution of CBCH + * CBCH: Add FIXME comments on queue overflow/underflow handling + * CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure + * CBCH: Fix CBCH implementation for osmo-bts-trx + * CBCH: Some more scheduler_mframe cleanup + * ensure all config file examples are well-formed + * lc15bts_mgr_vty: Ensure writing well-formed config files + * paging_test: Fix AGCH/PCH split test for second half of 102 multiframe + * Fix computing CCCH block number from frame number + * sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC + * scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * spelling: message discriminator, not descriminator + * osmobts-abis: Add Revision log regarding dynamic cannels + * Documentation on AMR RTP in case of DTX + * rtp-amr.adoc: TCH/AFS Uplink + * rtp-amr.adoc: TCH/AFS Downlink: Inhibiting + * rtp-amr: TCH/AHS Uplink: FACCH/H During DTX + * rtp-amr.adoc: New TCH/AHS downlink chapters + * rtp-amr.adoc: Fixes to Message Sequence Charts + * update osmo-bts-virtual documentation, now that code is merged + * vty-ref: Update URI of docbook 5.0 schema + * osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop + * osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 + * osmo-bts-trx/loops.c: Use lchan name based logging + * osmo-bts-trx/loops.c: Make code control flow more readable + + [ Philipp Maier ] + * rtp: make port range configurable, assign correct port numbers + * octphy: add support for 16x oversampling mode + * cosmetic: separate measurement testcase definitions + * cosmetic: unify measurement sample handling in one function + * measurement: make sure state is reset on chan act. + * measurement: make sure measurement interval end is detected + * measurement: fix measurement interval end detection + * osmo_mcast_sock: make sure SO_REUSEADDR is applied + * cosmetic: fix sourcecode formatting + * cosmetic: remove wrong comment + * measurement: add unit tests for is_meas_complete() + * measurement: fix sub frame table for TCH/H, SS1 + * measurement: add unit tests for ts45008_83_is_sub() + * measurement: fix is_meas_overdue() and increase testcoverage + * cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s + * cosmetic: test_is_meas_overdue() does not test is_meas_complete() + * measurement: substitue missing measurements + * measurement: add SUB measurements in test_lchan_meas_process_measurement + * paging: add unit-test to check different bs_ag_blks_res settings + * measurement: display fn_mod when measuremnet is added + * cosmetic: fix typo in comment + * measurement: remove missed interval end detection + * measurement: fix unit-test test_lchan_meas_process_measurement + + [ Pau Espin Pedrol ] + * bts.c: Log name of RR msg type instead of value + * bts.c: Add missing include for gsm48_rr_msg_name + * bts_agch_enqueue: Decrease queue len hard_limit from 1000 to 100 + * compact AGCH queue: Drop too msg diff than IMM_ASS_REJ + * Send DELETE_IND when dropping Imm Assign pending message + * lc15: Use correct type for hLayer1 field + * lc15: Fix incorrect cast of hLayer1 + * pcu_sock: Log event pcu_sock created + * l1_if.c: Move decl of vars used in conditional macro + * sysmo: vty: Add missing include for lchan_deactivate + * sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0 + * sysmo: l1if_mute_rf: Declare vars inside ifdef section + * sysmo: l1_if.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build + * sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build + * jenkins_*.sh: add --enable-werror to configure flags + * doc: Move calypsoBTS example into trx subdir + * build: Install example cfg files + * debian: Package installed example doc files + * Remove unneeded direct libortp dependency + * debian: Make osmo-bts-* packages conflict with old osmo-bts package + * debian: Create dbg package for osm-bts-virtual + * rsl: Use value_string to print encryption algo name + * l1sap: add_l1sap_header: Compact msgb_push ret assignment + * sched: Log RX->RTP packet like we do in add_l1sap_header + * scheduler: Log error on fn jump + * trx: scheduler: Keep RTP clock up to date while in DTXu pause + * Move systemd service to contrib/systemd + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * doc/examples/Makefile: Install bts-mgr cfg files used by systemd services + * lc15: vty: Add missing include for lchan_deactivate + * lc15: fsync requires fd instead of file stream + * lc15: rewrite and refactor code to print hwversion description + * lc15: led_sleep_cb: pass correct ptr to llist_move_tail + * abis: inp_s_cbfn: Improve logging signal related information + * lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected + * l1sap: Log name of chan_nr instead of hex value + * rsl_rx_chan-activ: Improve logging information + * gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN + * Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa + * {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 + * bts: Allocate TRX for BTS dynamically, deprecate -t + * bts-trx: trx_if: Use struct to store CTRL msg parsed responses + * bts-trx: setup timer once at creation time + * common: Implement OML for trx_set_available(1) + * bts-trx: Allow re-try without exit if POWERON fails in osmo-trx + * bts: Fix TRX0 param initialization + * rsl: Log lchan state during dynts PDCH->TCH + * rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK + * bts-trx: early return on POWERON success + * cosmetic: fix whitespace + * bts_model: Allow TS connect to be processed asynchronously + * OsmoBTS/chapters/configuration.adoc: Add bts index in example + * OsmoBTS: Update osmotrx ip to diff between local and remote + * rtp-amr: Describe requirement to recieve all PH-DATA.ind events + * rtp-amr: Fix typo and trailing whitespace + * Allow easily disabling GFDL references + * OsmoBTS: bts-models: Add Lime Microsystems devices as supported osmo-trx + * Introduce chapter trx_if.adoc and add it to OsmoTRX and OsmoBTS + * bts: Fix typo + * oc2g: Fix headers missing during make distcheck + * bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT + * sysmobts_mgr: Prepare code for gpsd < 2.96 support + * sysmobts_mgr: Add support for gpsd < 2.96 + * rsl: Send PDCH ACT NACK if TCH chan is still active + + [ Vadim Yanitskiy ] + * Clarify frame loss counter for l1sched_chan_state + * osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg + * common/rsl.c: tweak log message in lapdm_rll_tx_cb() + * contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' + * common/pcu_sock.c: cosmetic: explicitly address lchan + * common/scheduler.c: track TDMA frame loss per logical channels + * common/vty.c: fix deprecated osmo_str2lower() usage + * Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() + + [ Neels Hofmeyr ] + * cosmetic: abis.c: typo "exixt" + * fix ip.access dyn TS for osmo-bts-trx + * fix RSL Chan Mode Modif for dyn TS + * vty: mark 'rtp bind-ip' deprecated, not hidden + * Importing history from osmo-gsm-manuals + * OsmoBTS: typo x2 ('Objects Classes' -> 'Object Classes') + * OsmoBTS: fix typos, streamline language style + * OsmoBTS: s/content of this attribute/this attribute/ + * OsmoBTS: explain IEs marked 'ignored' *and* 'Received' + * abis/oml.doc: remove duplicate sentence part + * OsmoBTS: typos + * OsmoBTS: wording tweak + * OsmoBTS: hardware support: remove dup, tweak wording + * Document dynamic channels on Abis, both IPA and Osmocom style + * OsmoBTS/abis/rsl: fix subtitle for ladder diagram of osmo dyn switchover + * OsmoBTS/abis/dyn_ts_osmocom_style.msc: adjust PDCH Act ack + * OsmoBTS/abis/rsl.adoc: fix missing section header + * OsmoBTS/chapters/dynamic-timeslots.adoc: Remove obsolete links + * osmobts-usermanual.adoc: fix link to abis.adoc chapter + * OsmoBTS/chapters/configuration.adoc: fix index numbering + * OsmoBTS/abis/rsl: cosmetic: 'IPA style' + * OsmoBTS/abis/rsl: add missing info for Osmocom Dyn Channels + * make clean: also remove generated image files + * add 'make check' target + * OsmoBTS/abis/rsl: combine separate dyn ts sections + * fix 'make clean': shell glob, ignore failure + * OsmoBTS/abis/rsl: split dyn TS ladder diagrams to fit on page + * fix build: abis: re-add dependencies + * dynamic timeslots: add BSC level config instructions + * refactor Makefile build rules, don't use the FORCE + + [ Keith Whyte ] + * log: add error log for RSL Chan Mode Modif + * fix handling of odd pchans in bts_supports_cm() + + [ Omar Ramadan ] + * Add OC-2G BTS sources + + [ Max ] + * osmo-bts-trx: print TRX socket addresses in 'show transceiver' + * Fix type mismatch + * Drop unused function + * Add OsmoBTS control interface description + * Move RTP AMR doc to top level + * Add DTX implementation details to RTP AMR + * Sync DTX FSM with OsmoBTS code + + [ Holger Hans Peter Freyther ] + * OsmoBTS: Fix the author name and mail address + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Daniel Willmann ] + * Add section about configuring power-ramping + * OsmoBTS: Print VTY command in fixed-width font + * OsmoBTS: Fix typo + + [ Alexander Couzens ] + * OsmoBTS: add vty reference documentation + * OsmoBTS: generate osmobts-abis.pdf again + + [ Ivaylo Kostov ] + * BSC,BTS: add diagrams of PCU-BTS-NITB-SGSN relationships + + [ Philipp ] + * Describe how to run multiple instances of osmo-nitb and osmo-bts + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins_*.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:13:37 +0100 + osmo-bts (0.8.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie33252aef4144f9bb825d7c234970fd4e6083bb2 Gerrit-Change-Number: 12650 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:41:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:41:41 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E2=2E44-6da8-dirty_=E2=86=92_1=2E3=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12652 Change subject: Bump version: 1.2.2.44-6da8-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.2.44-6da8-dirty ? 1.3.0 Change-Id: Ie12af1d57df178a9ab27937ef0b764c98dd96e32 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp4.install M debian/rules M gtp/Makefile.am 6 files changed, 67 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/52/12652/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index bbad169..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 -libmisc tun_t tun_t structure has grown due to switch from in_addr to in46_addr (g#11870) diff --git a/debian/changelog b/debian/changelog index 3db4bd7..21bd8ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-ggsn (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * ggsn: ctrl iface: listen on IP configured by VTY + * gtp: Log type name of unexpected signalling message + * gtp: Allow recv DEL CTX REQ in sgsn and DEL CTX RSP in ggsn + * gtp: Log ignore CTX DEL REQ due to no teardown and only 1 ctx active + * gtp: Add new API to avoid freeing pdp contexts during DEL CTX REQ + * gtp: Add new replacement cb_recovery2 for cb_recovery + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Stefan Sperling ] + * fix unaligned access in build_ipcp_pco() + * fix support for multiple IPCP in PDP protocol configuration options + * check ioctl() call return value in tun_new() + * fix allocation of ippool's hash table + * replace bogus memcpy() call in ippool_newip() + * initialize local variable addr in ippool_new() + * fix format string error in ippool_printaddr() + * fix a format string directives in queue_seqset() + * properly store IPv6 addresses in struct tun_t + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * osmo-ggsn.cfg: Ensure well-formed config file example + * sgsnemu: Fix printing of tun device name + * ippool.c: Use "%td" format string for ptrdiff_t + * initial version of OsmoGGSN user manual + * OsmoGGSN: Add VTY reference manual + * GGSN: Document how 'ip tuntap' is used for non-root; call netdev 'apn0' + * vty-ref: Update URI of docbook 5.0 schema + + [ Alexander Couzens ] + * libgtp: implement gtp_clear_queues to clear req/resp queue + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + * refactor Makefile build rules, don't use the FORCE + * GGSN: don't say 'NITB' + * OsmoGGSN: more info on non-root operation / tun creation + * OsmoGGSN: multiple instances: mention GTP port + * OsmoGGSN: add Routing section for IP forward and masquerading + * OsmoGGSN: typo: priveleges + * OsmoGGSN VTY ref: prep: convert newlines to unix + * OsmoGGSN vty: update VTY reference + * OsmoGGSN: fix VTY additions' node IDs + * OsmoGGSN: update vty reference + * ggsn: update vty reference + + [ Max ] + * Expand OsmoGGSN manual + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:34:22 +0100 + osmo-ggsn (1.2.2) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index c8aa0b7..1524438 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp3 +Package: libgtp4 Architecture: any Multi-Arch: same Section: libs @@ -41,7 +41,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp3 (= ${binary:Version}) + libgtp4 (= ${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 @@ -54,7 +54,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${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 @@ -65,7 +65,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${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/libgtp3.install b/debian/libgtp4.install similarity index 100% rename from debian/libgtp3.install rename to debian/libgtp4.install diff --git a/debian/rules b/debian/rules index fa087ed..bca65bb 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 -plibgtp3 --dbg-package=libgtp-dbg + dh_strip -plibgtp4 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 449292c..d6c8c62 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=3:0:0 +LIBVERSION=4:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/12652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie12af1d57df178a9ab27937ef0b764c98dd96e32 Gerrit-Change-Number: 12652 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:44:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:44:52 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E293-605c_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12651 ) Change subject: Bump version: 1.3.0.293-605c ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaedf16a3a03868c5ca6b1afe9fbac7b042905d51 Gerrit-Change-Number: 12651 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:44:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:44:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E293-605c_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12651 ) Change subject: Bump version: 1.3.0.293-605c ? 1.4.0 ...................................................................... Bump version: 1.3.0.293-605c ? 1.4.0 Change-Id: Iaedf16a3a03868c5ca6b1afe9fbac7b042905d51 --- M debian/changelog 1 file changed, 322 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 2e07507..a4f4d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,325 @@ +osmo-bsc (1.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * inter-BSC HO: add neighbor_ident API to manage neighbor-BSS-cells + * inter-BSC HO: neighbor_ident API: drop 9bit BSIC + * doc: update/fix FSM charts + * fix / clarify rsl dtap cache + * rename gsm_04_08_utils.[hc] to gsm_04_08_rr + * cosmetic: move RR functions from bsc_api.c to gsm_04_08_rr.c + * add gsm_timers, for Tnnn definitions usable by FSMs + * large refactoring: use FSMs for lchans; add inter-BSC HO + * fix nanobts: timeslot FSM: use flags to remember OML,RSL status + * fix: dispatch TS_EV_RSL_DOWN when losing RSL + * timeslot FSM: fix infinite recursion on failure to send PDCH ACT + * timeslot FSM: permit entering broken state from anywhere + * cosmetic: FSMs: allow ignorable events + * fix BSC_CTR_ASSIGNMENT doc strings + * lchan_fsm: split off lchan_rtp_fsm, establish RTP a bit earlier + * lchan_fsm: add in_release_handler flag + * allocate larger lchans if no SDCCH are available + * create separate logging categories for lchan,ts,as FSMs + * cosmetic: constify gsm_bts_num() net arg + * vty: 'handover any': pick more random chans, use lchan_select_by_type() + * cosmetic: dissolve bsc_api.c + * cosmetic: reduce bsc_api.h + * cosmetic: rename bsc_api.h to gsm_08_08.h + * cosmetic: rename osmo_bsc_api.c to gsm_08_08.c + * cosmetic: gscon: don't re-enter ST_CLEARING + * use __FILE__, not __BASE_FILE__ + * fix lchan_rtp_fsm: missing event handling + * MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default + * cosmetic: neighbor_ident_vty.c: add and use common string defs + * neighbor_ident_vty.c: fix CI format, should be 16bit + * inter-BSC HO incoming: continue despite missing Classmark + * inter-BSC HO incoming: drop old/wrong RTP port code + * lchan_fsm: lchan_fail_to(): store target state early + * cosmetic: lchan_fsm failure: log about state transitions + * lchan_fsm: safer 'concluded' flag + * log: lchan_rtp_fsm: add missing '\n' + * log: 'sending BSSMAP HO Request ACK' + * inter-BSC HO: send failure msg directly + * log: tweaks and more context in osmo_bsc_sigtran_send() + * fix dependency bug: include mgcp_client/, not mgcp/ + * cosmetic: lchan activ: no need to clear mr again + * cosmetic: lchan activ: drop todo comments + * lchan: pick proper power and ta values + * SCCPlite Assignment Complete: include Speech Codec (Chosen) + * inter-BSC HO incoming: send BSSMAP HO Complete directly + * inter-BSC HO outgoing: fix L3 forwarding + * ho fsm: handle RR HO Failure for inter-BSC outgoing + * lchan_fsm: allow late RTP release events without erroring + * ts,lchan_fsm: do not attempt to allocate CBCH subslots + * Implement RR Classmark Enquiry + * fix LCLS during Assignment: actually use new TCH lchan + * cosmetic: drop param from send_assignment_complete() + * vty: add SCCP related vty commands + * make: allow vty-tests without configure + * test neighbor ident vty docs + * neighbor vty: drop keyword 'add' + * neighbor vty: rather 'no neighbor', not 'neighbor del' + * neighbor vty: allow setting local neighbors by CGI + * vty: write local neighbors by bts nr, not lac-ci + * fix counters for inter-BSC outgoing + * gscon_forget_lchan(): no Clear Request after Clear Command + * gscon_forget_lchan(): Clear Request iff no lchans remain + * subscr conn: properly forget lchan before release + * lchan_fsm: fix failure handling: notify conn when released + * handover_decision_2.c: tweak comments + * handover_decision_2.c: tweak ho candidate logging + * handover_decision_2.c: find_alternative_lchan: drop goto + * handover_decision_2.c: drop redundant debug_candidate() args + * lchan_fsm: notify conn of released lchan upon RF Release + * handover_fsm: adjust inter-BSC HO failure handling to spec + * remote-BSS neighbors: allow only one cell ID + * handover_decision_2.c: refactor trigger_*() + * handover_decision_2.c: implement HO to remote BSS + * abis_rsl.c: fix uninitialized RSL cause issues + * handover_fsm: fix missing newline for log statement + * handover_fsm: fix failure logging of uninitialized chan mode + * fix build: revert bad neighbor_ident.vty change + * vty doc: drop "(HO algo 2 only)" strings + * lchan_fsm_cleanup: drop redundant 'forget_lchan' call + * lchan: rf release: make sure conn is NULL + * dbug log: verbosely detach conn<->lchan + * fix: send RR Release (e.g. after BSSMAP Clear Cmd) + * abis_rsl.c: drop unused enum sacch_deact + * lchan: release in error: fix missing messages / events + * lchan release: always Deact SACCH + * cosmetic: lchan: introduce sub-struct lchan->release.* + * cosmetic: abis_rsl.c: drop uneccesary braces + * lchan: set cause for 4 instances of release_in_error = true + * coverity: gscon_forget_lchan: squelch forward-null + * always directly send BSSMAP Clear Request + * send Immediate Assignment Reject only before Immediate Assignment + * Importing history from osmo-gsm-manuals + * minor tweak + * make clean: also remove generated image files + * add 'make check' target + * OsmoBSC+NITB/running: fix title levels, one too deep + * OsmoBSC: include bts-examples.adoc from OsmoNITB + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + * OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA + * common / OsmoBSC: drop unused alink.adoc + * OsmoBSC: update VTY reference + * bsc: document handover + * bsc: handover: clarify default of all-cells-are-neighbors + * bsc: handover: mention the need to resend SI for telnet neighbor cfg + * author info: add "former" to Holger's job title + * OsmoBSC: update VTY reference + * follow-up: logging tweak for Immediate Assignment + * set gscon FSM instances' log level to DEBUG + * make sure early lchan act failure resets the lchan + * comments: describe some lchan details + * use mgcp-client configured endpoint domain name + + [ Philipp Maier ] + * endpoint_fsm: add missing return in mgcp_pick_codec + * gscon: use BSS-common payload types on BSS side + * sigtran: fix memleak in osmo_bsc_sigtran_send() + * GSCON: avoid sending connection oriented data when not connected + * GSCON: call api of a_reset.c with msc object directly + * lcls: do not LCLS call legs with different codecs + * doc: update mgw settings in example config file + * assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() + * codec_pref: fix typo in comment + * codec_pref: add AMR configuration bits to make_scl_config() in unit-test + * codec_pref: fix missing breaks in switch-case statement + * LCLS: fix codec mismatch detection + * gsm_data: remove unused struct member full_rate. + * gsm_data: remove unused struct member chan_mode + * assignment_fsm: only include speech codec (choosen) on AoIP networks + * gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() + * codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION + * lcls: log channel type and lchan names on LCLS codec mismatch + * codec_pref: handle S0-S15 in ASSIGNMENT REQUEST + * gsm_08_08: abort complete L3 3 msg gen when no codecs are set + * osmo_bsc_msc: Set reasonable codec list defaults + * codec_pref: check codec configuration before start + * codec_pref: cosmetic: seperate half/full rate determination + * codec_pref: also check physical channels + * gsm_08_08: allow zero length speech codec lists in compl l3 info. + * gsm_08_08: do not include zero length speech codec list. + * gsm_data: set meaningful default values for amr modes + * codec_pref: also check amr codec rates in check_codec_pref() + * gsm_04_08: improve gsm48_multirate_config() + * bsc_vty: check amr mode parameters + * lchan_fsm: generate proper multirate configuration IE on RSL + * gsm_data: make cgi_for_msc available for other modules + * handover_fsm: send HANDOVER PERFORMED msg on internal ho + * paging: fix nullpointer deref + * chan_alloc: remove references to lchan_alloc() + + [ Harald Welte ] + * Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() + * handover_fsm.c: Fix -Werror=format-security errors + * cbch: Don't send cell-broadcast command on BTS without CBCH channel + * gsm48_lchan2chan_desc() belongs to gsm_data.h + * Introduce gsm48_lchan2chan_desc_as_configured() + * CBCH: Fix SI4 CBCH IE generation + * CBCH: Fix gsm_bts_get_cbch() + * nanoBTS: Allow BCCH with CBCH on TS0 + * range_enc_determine_range(): Don't dereference array on size=0 + * handover_start_inter_bsc_in(): Uninitialized variable + * ipaccess-config: Fix open() return value checking + * bssmap_handle_cipher_mode(): Don't sent reject if !conn + * subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC + * acc_ramp: An unsigned int is always >= 0 + * ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * add Ericsson OM2000 message sequence charts (one for each MO) + * OM2000 message sequence charts: specify MO in node name + * OM2000 MSC: Fix spelling + * Add chapter on Cell Broadcast Support in Osmocom (to BSC+NITB manual) + * BSC: Add series of message sequence charts about MGCP handling + * mgw: Fix endpoint names for new MGW + * MGW: Include MGCP endpoint naming scheme of old IPA/SCCPlite approach + * add message sequence chart MS/BTS/BSC/MSC for 3GPP aoIP MO call + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * bsc: Use libosmocore API to track osmo_signal structs + * abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr + * abis_nm: Fix trailing whitespacing + * Fix heap-use-after-free due to OML link destruction + * abis_nm_ipaccess_rsl_connect: Log bts and trx nr + * codec_pref: Log unsupported codec name used + * codec_pref: Log HR2 specifically as never specified + * codec_pref.c: Add comment in expected switch case without break + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * osmo-bsc: Add default case for switch(enum) + * abis_nm_get_ts: Return TS of correct TRX, not always TRX0 + * ipaccess-config: Use enum value for OML IP + * abis_nm: Rename m_id_len to ease review of forthcoming patches + * abis_nm: Split handling of Attribute Response Info into its own func + * abis_nm: Split reported attr list parsing from Attribute Response Info into its own func + * abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS + * abis_nm: Add support to parse some nanoBTS Attribute Response attributes + * abis_nm: Add support to parse OML IP and Unit Id in Get Attributes + * abis_nm: Support parsing nanoBTS format for Get Attributes Info + * abis_nm: parse_attr_resp_info_unreported: Fix offset calculation + * examples: Remove neighbor-list invalid for default setup + * bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization + * bsc: vty: Use enum value in neighbor-list check + * bsc: gsm0808: Fix return code in bsc_compl_l3 + * osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init + * bsc: Prefix log string with related SI type during call to list_arfcn + * bsc: si: Fix SI2bis L2 pseudo length + * bsc: si: Fix SI2ter L2 pseudo length + * bsc: Enable force-combined-si on nanoBTS by default + * bsc: band_compatible: Return band non-compatible for invalid arfcn + * bsc: vty: Verify and warn on invalid arfcn passed + * abis_nm: Introduce new signal S_NM_GET_ATTR_REP + * ipaccess-config: Fix whitespace + * ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID + * ipaccess-config: cosmetic: Remove unneeded comment with hex values + * gsm0408_rcvmsg: Release lchan if L3 fails to complete + * ipaccess-config: Introduce -q quiet param + * Add osmux-reference document + * osmux-reference: Use packetdiag to draw packet header structures + * osmux-reference: Add sequence charts + * osmux-reference: Add traffic saving plot + * osmux-reference-docinfo: Add latest changes to revhistory + * osmux: Fix description for Dummy frames FT field + * Allow easily disabling GFDL references + * cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets + * bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested + * bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation + * bsc: ts_for_each_lchan: Improve documentation + * bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init + * bsc: Fix lchan iteration for dyn TS during PDCH Deact + * bsc: timelost_fsm: Remove unneeded set of out variable on failure + * bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan + * bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan + * bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms + * bsc: timeslot_fsm: Fix count in ts_lchans_waiting + * bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event + * bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED + * bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT + * bsc: lchan_fsm: Fix invalid duplicated transition + * paging: Add VTY options to calculate T3113 timeout dynamically + * paging: fix whitespace + * paging: Properly enclose logging imsi filter scope + * bsc_main: filter_fn: Compare imsi values instead of subscr pointers + * bsc: Set subscr log context during complete_layer3 + * bsc: rsl: Set subscr log context during meas report + * bsc: dtap: Set subscr log context + * bsc: bssap: Set subscr log context during paging + * Add VTY option to avoid sending empty Full BCCH Info for disabled SI + + [ Stefan Sperling ] + * check for overlong unix socket paths + * fix unaligned access in abis_nm_rx_ipacc() + * re-order condition checks for clarity + * show dynamic timeslot details in 'show timeslot' vty command + * check return value of gsm48_multirate_config() + * add missing 'break' in switch statement + * unlink socket path correctly in rf_create_socket() + + [ Martin Hauke ] + * cosmetics: Fix typo in bsc_vty.c + * ipaccess-config: Generate valid JSON output when using the -G parameter + * ipaccess-config: Fix indentation of the usage output + + [ Oliver Smith ] + * osmo_bsc_main.c: initialize rate counters + * vty 'show bts'/'show trx': display IPs and ports + * cosmetic: fix spec ref for gsm0808_cipher_mode() + * cipher mode reject: send proper cause codes + * vty: add 'show rejected-bts' + * ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP + * copy NITB's osmobsc-usermanual.adoc to OsmoBSC + * build manuals included from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Daniel Willmann ] + * debian: Require libcdk and install meas_vis osmo-bsc-meas-utils + * OsmoBSC/HLR/MSC: Fix default config file name + * gsm_04_08: Free GSM subscr conn if paging response can't be matched + * VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet + + [ Max ] + * vty: don't show GPRS details if not configured + * LCLS: move MGCP MDCX into separate function + * Make IP address helper accessible via header file + * constify rsl_tx_ipacc_*cx() parameters + * LCLS: expand logging to print the name of the mode in use + * LCLS: tighten GCR check + * LCLS: explicitly check for mode before closing the loop + * LCLS: move mode check into separate function + * LCLS: make config and control redable in 'sh conns' + * RSL: restructure MDCX functions + * LCLS: add bts-loop variant + * vty: add command to show TRX selectively + * Add OsmoBSC control interface description + * Add OsmoBSC control interface description + * OsmoBSC: update CTRL docs + * LCLS: update parameter representation + * LCLS: log config/control update + * IPA: log OML/RSL link drop reason + * LCLS: use enum values instead of magic numbers + * Print BTS number on GPRS options error + * Log MDCX ACK for established lchan + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Ivaylo Kostov ] + * BSC,BTS: add diagrams of PCU-BTS-NITB-SGSN relationships + + [ Alexander Couzens ] + * OsmoBSC: add rate counter documentation + + [ Vadim Yanitskiy ] + * osmo_bsc_bssap.c: fix incorrect link_id assignment + + -- Harald Welte Sun, 20 Jan 2019 21:21:24 +0100 + osmo-bsc (1.3.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/12651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaedf16a3a03868c5ca6b1afe9fbac7b042905d51 Gerrit-Change-Number: 12651 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:45:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:45:01 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E2=2E44-6da8-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12652 ) Change subject: Bump version: 1.2.2.44-6da8-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie12af1d57df178a9ab27937ef0b764c98dd96e32 Gerrit-Change-Number: 12652 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 20 Jan 2019 20:45:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 20:45:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 20:45:02 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E2=2E44-6da8-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12652 ) Change subject: Bump version: 1.2.2.44-6da8-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.2.44-6da8-dirty ? 1.3.0 Change-Id: Ie12af1d57df178a9ab27937ef0b764c98dd96e32 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp4.install M debian/rules M gtp/Makefile.am 6 files changed, 67 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index bbad169..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 -libmisc tun_t tun_t structure has grown due to switch from in_addr to in46_addr (g#11870) diff --git a/debian/changelog b/debian/changelog index 3db4bd7..21bd8ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-ggsn (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * ggsn: ctrl iface: listen on IP configured by VTY + * gtp: Log type name of unexpected signalling message + * gtp: Allow recv DEL CTX REQ in sgsn and DEL CTX RSP in ggsn + * gtp: Log ignore CTX DEL REQ due to no teardown and only 1 ctx active + * gtp: Add new API to avoid freeing pdp contexts during DEL CTX REQ + * gtp: Add new replacement cb_recovery2 for cb_recovery + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Stefan Sperling ] + * fix unaligned access in build_ipcp_pco() + * fix support for multiple IPCP in PDP protocol configuration options + * check ioctl() call return value in tun_new() + * fix allocation of ippool's hash table + * replace bogus memcpy() call in ippool_newip() + * initialize local variable addr in ippool_new() + * fix format string error in ippool_printaddr() + * fix a format string directives in queue_seqset() + * properly store IPv6 addresses in struct tun_t + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * osmo-ggsn.cfg: Ensure well-formed config file example + * sgsnemu: Fix printing of tun device name + * ippool.c: Use "%td" format string for ptrdiff_t + * initial version of OsmoGGSN user manual + * OsmoGGSN: Add VTY reference manual + * GGSN: Document how 'ip tuntap' is used for non-root; call netdev 'apn0' + * vty-ref: Update URI of docbook 5.0 schema + + [ Alexander Couzens ] + * libgtp: implement gtp_clear_queues to clear req/resp queue + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + * refactor Makefile build rules, don't use the FORCE + * GGSN: don't say 'NITB' + * OsmoGGSN: more info on non-root operation / tun creation + * OsmoGGSN: multiple instances: mention GTP port + * OsmoGGSN: add Routing section for IP forward and masquerading + * OsmoGGSN: typo: priveleges + * OsmoGGSN VTY ref: prep: convert newlines to unix + * OsmoGGSN vty: update VTY reference + * OsmoGGSN: fix VTY additions' node IDs + * OsmoGGSN: update vty reference + * ggsn: update vty reference + + [ Max ] + * Expand OsmoGGSN manual + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:34:22 +0100 + osmo-ggsn (1.2.2) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index c8aa0b7..1524438 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp3 +Package: libgtp4 Architecture: any Multi-Arch: same Section: libs @@ -41,7 +41,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp3 (= ${binary:Version}) + libgtp4 (= ${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 @@ -54,7 +54,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${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 @@ -65,7 +65,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${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/libgtp3.install b/debian/libgtp4.install similarity index 100% rename from debian/libgtp3.install rename to debian/libgtp4.install diff --git a/debian/rules b/debian/rules index fa087ed..bca65bb 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 -plibgtp3 --dbg-package=libgtp-dbg + dh_strip -plibgtp4 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 449292c..d6c8c62 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=3:0:0 +LIBVERSION=4:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/12652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie12af1d57df178a9ab27937ef0b764c98dd96e32 Gerrit-Change-Number: 12652 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 21:46:23 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 20 Jan 2019 21:46:23 +0000 Subject: Change in libosmo-abis[master]: Set local IP in ipa_server_link properly Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12653 Change subject: Set local IP in ipa_server_link properly ...................................................................... Set local IP in ipa_server_link properly When creating IPA link for server we might be called without explicit address (which is legit - it means bind to all available addresses). However in this case we won't have 'addr' field of ipa_server_link initialized properly. Fix this by following changes: * don't copy NULL value as address * use socket's local IP when no address set explicitly Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 --- M src/input/ipa.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/53/12653/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index 09e3426..9853ffa 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -248,6 +248,7 @@ static int ipa_server_fd_cb(struct osmo_fd *ofd, unsigned int what) { int fd, ret; + char ipbuf[INET6_ADDRSTRLEN + 1]; struct sockaddr_in sa; socklen_t sa_len = sizeof(sa); struct ipa_server_link *link = ofd->data; @@ -258,6 +259,13 @@ "peer, reason=`%s'\n", strerror(errno)); return fd; } + + if (!link->addr) { + ret = osmo_sock_get_local_ip(fd, ipbuf, INET6_ADDRSTRLEN + 1); + if (ret == 0) + link->addr = talloc_strdup(link, ipbuf); + } + LOGP(DLINP, LOGL_NOTICE, "accept()ed new link from %s to port %u\n", inet_ntoa(sa.sin_addr), link->port); @@ -290,7 +298,8 @@ ipa_link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; ipa_link->ofd.cb = ipa_server_fd_cb; ipa_link->ofd.data = ipa_link; - ipa_link->addr = talloc_strdup(ipa_link, addr); + if (addr) + ipa_link->addr = talloc_strdup(ipa_link, addr); ipa_link->port = port; ipa_link->accept_cb = accept_cb; ipa_link->line = line; -- To view, visit https://gerrit.osmocom.org/12653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 Gerrit-Change-Number: 12653 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 21:46:24 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 20 Jan 2019 21:46:24 +0000 Subject: Change in libosmo-abis[master]: Log peer's port in accept callback Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12654 Change subject: Log peer's port in accept callback ...................................................................... Log peer's port in accept callback * log port from which we accept() the connection in addition to address * use macro helper for logging Change-Id: I186974dae1819af8c92f9ea9eeb966ec7c9c9f55 --- M src/input/ipa.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/54/12654/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index 9853ffa..e41ec42 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -266,8 +266,8 @@ link->addr = talloc_strdup(link, ipbuf); } - LOGP(DLINP, LOGL_NOTICE, "accept()ed new link from %s to port %u\n", - inet_ntoa(sa.sin_addr), link->port); + LOGIPA(link, LOGL_NOTICE, "accept()ed new link from %s:%u\n", + inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); ret = link->accept_cb(link, fd); if (ret < 0) { -- To view, visit https://gerrit.osmocom.org/12654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I186974dae1819af8c92f9ea9eeb966ec7c9c9f55 Gerrit-Change-Number: 12654 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 21:50:05 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 20 Jan 2019 21:50:05 +0000 Subject: Change in openbsc[master]: Remove meas_* utils Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12655 Change subject: Remove meas_* utils ...................................................................... Remove meas_* utils The counterparts in OsmoBSC repo are actively maintained and (partially) packaged for .deb - let's drop old versions to minimize user confusion. Change-Id: Ia0cedaad4b717c8c5198842e2acd610f8e03f957 --- M openbsc/src/utils/Makefile.am D openbsc/src/utils/meas_db.c D openbsc/src/utils/meas_db.h D openbsc/src/utils/meas_json.c D openbsc/src/utils/meas_pcap2db.c D openbsc/src/utils/meas_udp2db.c D openbsc/src/utils/meas_vis.c 7 files changed, 0 insertions(+), 1,199 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/55/12655/1 diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 26494e1..76a73a3 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -18,30 +18,10 @@ $(COVERAGE_LDFLAGS) \ $(NULL) -noinst_HEADERS = \ - meas_db.h \ - $(NULL) - bin_PROGRAMS = \ bs11_config \ isdnsync \ - meas_json \ $(NULL) -if HAVE_SQLITE3 -bin_PROGRAMS += \ - osmo-meas-udp2db \ - $(NULL) -if HAVE_PCAP -bin_PROGRAMS += \ - osmo-meas-pcap2db \ - $(NULL) -endif -endif -if HAVE_LIBCDK -bin_PROGRAMS += \ - meas_vis \ - $(NULL) -endif if BUILD_SMPP noinst_PROGRAMS = \ @@ -77,71 +57,3 @@ $(LIBOSMOGSM_LIBS) \ $(LIBSMPP34_LIBS) \ $(NULL) - -meas_vis_SOURCES = \ - meas_vis.c \ - $(NULL) - -meas_vis_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - -lcdk \ - -lncurses \ - $(NULL) - -meas_vis_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(NULL) - -osmo_meas_pcap2db_SOURCES = \ - meas_pcap2db.c \ - meas_db.c \ - $(NULL) - -osmo_meas_pcap2db_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(SQLITE3_LIBS) \ - -lpcap \ - $(NULL) - -osmo_meas_pcap2db_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - -osmo_meas_udp2db_SOURCES = \ - meas_udp2db.c \ - meas_db.c \ - $(NULL) - -osmo_meas_udp2db_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(SQLITE3_LIBS) \ - $(NULL) - -osmo_meas_udp2db_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - -meas_json_SOURCES = \ - meas_json.c \ - $(NULL) - -meas_json_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -meas_json_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - diff --git a/openbsc/src/utils/meas_db.c b/openbsc/src/utils/meas_db.c deleted file mode 100644 index d81efca..0000000 --- a/openbsc/src/utils/meas_db.c +++ /dev/null @@ -1,330 +0,0 @@ -/* Routines for storing measurement reports in SQLite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 "meas_db.h" - -#define INS_MR "INSERT INTO meas_rep (time, imsi, name, scenario, nr, bs_power, ms_timing_offset, fpc, ms_l1_pwr, ms_l1_ta) VALUES (?,?,?,?,?,?,?,?,?,?)" -#define INS_UD "INSERT INTO meas_rep_unidir (meas_id, rx_lev_full, rx_lev_sub, rx_qual_full, rx_qual_sub, dtx, uplink) VALUES (?,?,?,?,?,?,?)" -#define UPD_MR "UPDATE meas_rep SET ul_unidir=?, dl_unidir=? WHERE id=?" - -struct meas_db_state { - sqlite3 *db; - sqlite3_stmt *stmt_ins_ud; - sqlite3_stmt *stmt_ins_mr; - sqlite3_stmt *stmt_upd_mr; -}; - -/* macros to check for SQLite3 result codes */ -#define _SCK_OK(db, call, exp) \ - do { \ - int rc = call; \ - if (rc != exp) { \ - fprintf(stderr,"SQL Error in line %u: %s\n", \ - __LINE__, sqlite3_errmsg(db)); \ - goto err_io; \ - } \ - } while (0) -#define SCK_OK(db, call) _SCK_OK(db, call, SQLITE_OK) -#define SCK_DONE(db, call) _SCK_OK(db, call, SQLITE_DONE) - -static int _insert_ud(struct meas_db_state *st, unsigned long meas_id, int dtx, - int uplink, const struct gsm_meas_rep_unidir *ud) -{ - unsigned long rowid; - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 1, meas_id)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 2, - rxlev2dbm(ud->full.rx_lev))); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 3, - rxlev2dbm(ud->sub.rx_lev))); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 4, ud->full.rx_qual)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 5, ud->sub.rx_qual)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 6, dtx)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 7, uplink)); - - SCK_DONE(st->db, sqlite3_step(st->stmt_ins_ud)); - - SCK_OK(st->db, sqlite3_reset(st->stmt_ins_ud)); - - return sqlite3_last_insert_rowid(st->db); -err_io: - exit(1); -} - -/* insert a measurement report into the database */ -int meas_db_insert(struct meas_db_state *st, const char *imsi, - const char *name, unsigned long timestamp, - const char *scenario, - const struct gsm_meas_rep *mr) -{ - int rc; - sqlite3_int64 rowid, ul_rowid, dl_rowid; - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 1, timestamp)); - - if (imsi) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 2, - imsi, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 2)); - - if (name) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 3, - name, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 3)); - - if (scenario) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 4, - scenario, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 4)); - - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 5, mr->nr)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 6, mr->bs_power)); - - if (mr->flags & MEAS_REP_F_MS_TO) - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 7, mr->ms_timing_offset)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 7)); - - if (mr->flags & MEAS_REP_F_FPC) - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 8, 1)); - else - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 8, 0)); - - if (mr->flags & MEAS_REP_F_MS_L1) { - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 9, - mr->ms_l1.pwr)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 10, - mr->ms_l1.ta)); - } - - SCK_DONE(st->db, sqlite3_step(st->stmt_ins_mr)); - SCK_OK(st->db, sqlite3_reset(st->stmt_ins_mr)); - - rowid = sqlite3_last_insert_rowid(st->db); - - /* insert uplink measurement */ - ul_rowid = _insert_ud(st, rowid, mr->flags & MEAS_REP_F_UL_DTX, - 1, &mr->ul); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 1, ul_rowid)); - - /* insert downlink measurement, if present */ - if (mr->flags & MEAS_REP_F_DL_VALID) { - dl_rowid = _insert_ud(st, rowid, mr->flags & MEAS_REP_F_DL_DTX, - 0, &mr->dl); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 2, dl_rowid)); - } else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_upd_mr, 2)); - - /* update meas_rep with the id's of the unidirectional - * measurements */ - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 3, rowid)); - SCK_DONE(st->db, sqlite3_step(st->stmt_upd_mr)); - SCK_OK(st->db, sqlite3_reset(st->stmt_upd_mr)); - - return 0; - -err_io: - return -EIO; -} - -int meas_db_begin(struct meas_db_state *st) -{ - SCK_OK(st->db, sqlite3_exec(st->db, "BEGIN", NULL, NULL, NULL)); - - return 0; - -err_io: - return -EIO; -} - -int meas_db_commit(struct meas_db_state *st) -{ - SCK_OK(st->db, sqlite3_exec(st->db, "COMMIT", NULL, NULL, NULL)); - - return 0; - -err_io: - return -EIO; -} - -static const char *create_stmts[] = { - "CREATE TABLE IF NOT EXISTS meas_rep (" - "id INTEGER PRIMARY KEY AUTOINCREMENT," - "time TIMESTAMP," - "imsi TEXT," - "name TEXT," - "scenario TEXT," - "nr INTEGER," - "bs_power INTEGER NOT NULL," - "ms_timing_offset INTEGER," - "fpc INTEGER NOT NULL DEFAULT 0," - "ul_unidir INTEGER REFERENCES meas_rep_unidir(id)," - "dl_unidir INTEGER REFERENCES meas_rep_unidir(id)," - "ms_l1_pwr INTEGER," - "ms_l1_ta INTEGER" - ")", - "CREATE TABLE IF NOT EXISTS meas_rep_unidir (" - "id INTEGER PRIMARY KEY AUTOINCREMENT," - "meas_id INTEGER NOT NULL REFERENCES meas_rep(id)," - "rx_lev_full INTEGER NOT NULL," - "rx_lev_sub INTEGER NOT NULL," - "rx_qual_full INTEGER NOT NULL," - "rx_qual_sub INTEGER NOT NULL," - "dtx BOOLEAN NOT NULL DEFAULT 0," - "uplink BOOLEAN NOT NULL" - ")", - "CREATE VIEW IF NOT EXISTS path_loss AS " - "SELECT " - "meas_rep.id, " - "datetime(time,'unixepoch') AS timestamp, " - "imsi, " - "name, " - "scenario, " - "ms_timing_offset, " - "ms_l1_ta, " - "fpc, " - "ms_l1_pwr, " - "ud_ul.rx_lev_full AS ul_rx_lev_full, " - "ms_l1_pwr-ud_ul.rx_lev_full AS ul_path_loss_full, " - "ud_ul.rx_lev_sub ul_rx_lev_sub, " - "ms_l1_pwr-ud_ul.rx_lev_sub AS ul_path_loss_sub, " - "ud_ul.rx_qual_full AS ul_rx_qual_full, " - "ud_ul.rx_qual_sub AS ul_rx_qual_sub, " - "bs_power, " - "ud_dl.rx_lev_full AS dl_rx_lev_full, " - "bs_power-ud_dl.rx_lev_full AS dl_path_loss_full, " - "ud_dl.rx_lev_sub AS dl_rx_lev_sub, " - "bs_power-ud_dl.rx_lev_sub AS dl_path_loss_sub, " - "ud_dl.rx_qual_full AS dl_rx_qual_full, " - "ud_dl.rx_qual_sub AS dl_rx_qual_sub " - "FROM " - "meas_rep, " - "meas_rep_unidir AS ud_dl, " - "meas_rep_unidir AS ud_ul " - "WHERE " - "ud_ul.id = meas_rep.ul_unidir AND " - "ud_dl.id = meas_rep.dl_unidir", - "CREATE VIEW IF NOT EXISTS overview AS " - "SELECT " - "id," - "timestamp," - "imsi," - "name," - "scenario," - "ms_l1_pwr," - "ul_rx_lev_full," - "ul_path_loss_full," - "ul_rx_qual_full," - "bs_power," - "dl_rx_lev_full," - "dl_path_loss_full," - "dl_rx_qual_full " - "FROM path_loss", -}; - -static int check_create_tbl(struct meas_db_state *st) -{ - int i, rc; - - for (i = 0; i < ARRAY_SIZE(create_stmts); i++) { - SCK_OK(st->db, sqlite3_exec(st->db, create_stmts[i], - NULL, NULL, NULL)); - } - - return 0; -err_io: - return -EIO; -} - - -#define PREP_CHK(db, stmt, ptr) \ - do { \ - int rc; \ - rc = sqlite3_prepare_v2(db, stmt, strlen(stmt)+1, \ - ptr, NULL); \ - if (rc != SQLITE_OK) { \ - fprintf(stderr, "Error during prepare of '%s': %s\n", \ - stmt, sqlite3_errmsg(db)); \ - goto err_io; \ - } \ - } while (0) - -struct meas_db_state *meas_db_open(void *ctx, const char *fname) -{ - int rc; - struct meas_db_state *st = talloc_zero(ctx, struct meas_db_state); - - if (!st) - return NULL; - - rc = sqlite3_open_v2(fname, &st->db, - SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, - NULL); - if (rc != SQLITE_OK) { - fprintf(stderr, "Unable to open DB: %s\n", - sqlite3_errmsg(st->db)); - goto err_io; - } - - rc = check_create_tbl(st); - - PREP_CHK(st->db, INS_MR, &st->stmt_ins_mr); - PREP_CHK(st->db, INS_UD, &st->stmt_ins_ud); - PREP_CHK(st->db, UPD_MR, &st->stmt_upd_mr); - - return st; -err_io: - talloc_free(st); - return NULL; -} - -void meas_db_close(struct meas_db_state *st) -{ - if (sqlite3_finalize(st->stmt_ins_mr) != SQLITE_OK) - fprintf(stderr, "DB insert measurement report finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_finalize(st->stmt_ins_ud) != SQLITE_OK) - fprintf(stderr, "DB insert unidir finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_finalize(st->stmt_upd_mr) != SQLITE_OK) - fprintf(stderr, "DB update measurement report finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_close(st->db) != SQLITE_OK) - fprintf(stderr, "Unable to close DB, abandoning.\n"); - - talloc_free(st); - -} diff --git a/openbsc/src/utils/meas_db.h b/openbsc/src/utils/meas_db.h deleted file mode 100644 index 889e902..0000000 --- a/openbsc/src/utils/meas_db.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENBSC_MEAS_DB_H -#define OPENBSC_MEAS_DB_H - -struct meas_db_state; - -struct meas_db_state *meas_db_open(void *ctx, const char *fname); -void meas_db_close(struct meas_db_state *st); - -int meas_db_begin(struct meas_db_state *st); -int meas_db_commit(struct meas_db_state *st); - -int meas_db_insert(struct meas_db_state *st, const char *imsi, - const char *name, unsigned long timestamp, - const char *scenario, - const struct gsm_meas_rep *mr); - -#endif diff --git a/openbsc/src/utils/meas_json.c b/openbsc/src/utils/meas_json.c deleted file mode 100644 index 51eb6c7..0000000 --- a/openbsc/src/utils/meas_json.c +++ /dev/null @@ -1,190 +0,0 @@ -/* Convert measurement report feed into JSON feed printed to stdout. - * Each measurement report is printed as a separae JSON root entry. - * All measurement reports are separated by a new line. - */ - -/* (C) 2015 by Alexander Chemeris - * With parts of code adopted from different places in OpenBSC. - * - * 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 -#include -#include - -static void print_meas_rep_uni_json(struct gsm_meas_rep_unidir *mru) -{ - printf("\"RXL-FULL\":%d, \"RXL-SUB\":%d, ", - rxlev2dbm(mru->full.rx_lev), - rxlev2dbm(mru->sub.rx_lev)); - printf("\"RXQ-FULL\":%d, \"RXQ-SUB\":%d", - mru->full.rx_qual, mru->sub.rx_qual); -} - -static void print_meas_rep_json(struct gsm_meas_rep *mr) -{ - int i; - - printf("\"NR\":%d", mr->nr); - - if (mr->flags & MEAS_REP_F_DL_DTX) - printf(", \"DTXd\":true"); - - printf(", \"UL_MEAS\":{"); - print_meas_rep_uni_json(&mr->ul); - printf("}"); - printf(", \"BS_POWER\":%d", mr->bs_power); - if (mr->flags & MEAS_REP_F_MS_TO) - printf(", \"MS_TO\":%d", mr->ms_timing_offset); - - if (mr->flags & MEAS_REP_F_MS_L1) { - printf(", \"L1_MS_PWR\":%d", mr->ms_l1.pwr); - printf(", \"L1_FPC\":%s", - mr->flags & MEAS_REP_F_FPC ? "true" : "false"); - printf(", \"L1_TA\":%u", mr->ms_l1.ta); - } - - if (mr->flags & MEAS_REP_F_UL_DTX) - printf(", \"DTXu\":true"); - if (mr->flags & MEAS_REP_F_BA1) - printf(", \"BA1\":true"); - if (mr->flags & MEAS_REP_F_DL_VALID) { - printf(", \"DL_MEAS\":{"); - print_meas_rep_uni_json(&mr->dl); - printf("}"); - } - - if (mr->num_cell == 7) - return; - printf(", \"NUM_NEIGH\":%u, \"NEIGH\":[", mr->num_cell); - for (i = 0; i < mr->num_cell; i++) { - struct gsm_meas_rep_cell *mrc = &mr->cell[i]; - if (i!=0) printf(", "); - printf("{\"IDX\":%u, \"ARFCN\":%u, \"BSIC\":%u, \"POWER\":%d}", - mrc->neigh_idx, mrc->arfcn, mrc->bsic, rxlev2dbm(mrc->rxlev)); - } - printf("]"); -} - -static void print_chan_info_json(struct meas_feed_meas *mfm) -{ - printf("\"lchan_type\":\"%s\", \"pchan_type\":\"%s\", " - "\"bts_nr\":%d, \"trx_nr\":%d, \"ts_nr\":%d, \"ss_nr\":%d", - gsm_lchant_name(mfm->lchan_type), gsm_pchan_name(mfm->pchan_type), - mfm->bts_nr, mfm->trx_nr, mfm->ts_nr, mfm->ss_nr); -} - -static void print_meas_feed_json(struct meas_feed_meas *mfm) -{ - time_t now = time(NULL); - - printf("{"); - printf("\"time\":%ld, \"imsi\":\"%s\", \"name\":\"%s\", \"scenario\":\"%s\", ", - now, mfm->imsi, mfm->name, mfm->scenario); - - switch (mfm->hdr.version) { - case 1: - printf("\"chan_info\":{"); - print_chan_info_json(mfm); - printf("}, "); - /* no break, fall to version 0 */ - case 0: - printf("\"meas_rep\":{"); - print_meas_rep_json(&mfm->mr); - printf("}"); - break; - } - - printf("}\n"); - -} - -static int handle_meas(struct msgb *msg) -{ - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - - print_meas_feed_json(mfm); - - return 0; -} - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - switch (mfh->msg_type) { - case MEAS_FEED_MEAS: - handle_meas(msg); - break; - default: - break; - } - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - -int main(int argc, char **argv) -{ - int rc; - struct osmo_fd udp_ofd; - - udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) - exit(1); - - while (1) { - osmo_select_main(0); - }; - - exit(0); -} diff --git a/openbsc/src/utils/meas_pcap2db.c b/openbsc/src/utils/meas_pcap2db.c deleted file mode 100644 index b874ac4..0000000 --- a/openbsc/src/utils/meas_pcap2db.c +++ /dev/null @@ -1,138 +0,0 @@ -/* read PCAP file with meas_feed data and write it to sqlite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 - -#include - -#include - -#include - -#include "meas_db.h" - -static struct meas_db_state *db; - -static void handle_mfm(const struct pcap_pkthdr *h, - const struct meas_feed_meas *mfm) -{ - const char *scenario; - - if (strlen(mfm->scenario)) - scenario = mfm->scenario; - else - scenario = NULL; - - meas_db_insert(db, mfm->imsi, mfm->name, h->ts.tv_sec, - scenario, &mfm->mr); -} - -static void pcap_cb(u_char *user, const struct pcap_pkthdr *h, - const u_char *bytes) -{ - const char *cur = bytes; - const struct iphdr *ip; - const struct udphdr *udp; - const struct meas_feed_meas *mfm; - uint16_t udplen; - - if (h->caplen < 14+20+8) - return; - - /* Check if there is IPv4 in the Ethernet */ - if (cur[12] != 0x08 || cur[13] != 0x00) - return; - - cur += 14; /* ethernet header */ - ip = (struct iphdr *) cur; - - if (ip->version != 4) - return; - cur += ip->ihl * 4; - - if (ip->protocol != IPPROTO_UDP) - return; - - udp = (struct udphdr *) cur; - - if (udp->dest != htons(8888)) - return; - - udplen = ntohs(udp->len); - if (udplen != sizeof(*udp) + sizeof(*mfm)) - return; - cur += sizeof(*udp); - - mfm = (const struct meas_feed_meas *) cur; - - handle_mfm(h, mfm); -} - -int main(int argc, char **argv) -{ - char errbuf[PCAP_ERRBUF_SIZE+1]; - char *pcap_fname, *db_fname; - pcap_t *pc; - int rc; - - if (argc < 3) { - fprintf(stderr, "You need to specify PCAP and database file\n"); - exit(2); - } - - pcap_fname = argv[1]; - db_fname = argv[2]; - - pc = pcap_open_offline(pcap_fname, errbuf); - if (!pc) { - fprintf(stderr, "Cannot open %s: %s\n", pcap_fname, errbuf); - exit(1); - } - - db = meas_db_open(NULL, db_fname); - if (!db) - exit(0); - - rc = meas_db_begin(db); - if (rc < 0) { - fprintf(stderr, "Error during BEGIN\n"); - exit(1); - } - - pcap_loop(pc, 0 , pcap_cb, NULL); - - meas_db_commit(db); - - exit(0); -} diff --git a/openbsc/src/utils/meas_udp2db.c b/openbsc/src/utils/meas_udp2db.c deleted file mode 100644 index 5032d0c..0000000 --- a/openbsc/src/utils/meas_udp2db.c +++ /dev/null @@ -1,126 +0,0 @@ -/* liesten to meas_feed on UDP and write it to sqlite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 - -#include - -#include - -#include "meas_db.h" - -static struct osmo_fd udp_ofd; -static struct meas_db_state *db; - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - const char *scenario; - time_t now = time(NULL); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - if (mfh->msg_type != MEAS_FEED_MEAS) - return -EINVAL; - - if (strlen(mfm->scenario)) - scenario = mfm->scenario; - else - scenario = NULL; - - meas_db_insert(db, mfm->imsi, mfm->name, now, - scenario, &mfm->mr); - - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - -int main(int argc, char **argv) -{ - char *db_fname; - int rc; - - msgb_talloc_ctx_init(NULL, 0); - - if (argc < 2) { - fprintf(stderr, "You have to specify the database file name\n"); - exit(2); - } - - db_fname = argv[1]; - - udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, - IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) { - fprintf(stderr, "Unable to create UDP listen socket\n"); - exit(1); - } - - db = meas_db_open(NULL, db_fname); - if (!db) { - fprintf(stderr, "Unable to open database\n"); - exit(1); - } - - /* FIXME: timer-based BEGIN/COMMIT */ - - while (1) { - osmo_select_main(0); - }; - - meas_db_close(db); - - exit(0); -} - diff --git a/openbsc/src/utils/meas_vis.c b/openbsc/src/utils/meas_vis.c deleted file mode 100644 index 77194de..0000000 --- a/openbsc/src/utils/meas_vis.c +++ /dev/null @@ -1,310 +0,0 @@ -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include -#include - -#include - -#include - -struct ms_state_uni { - CDKSLIDER *cdk; - CDKLABEL *cdk_label; - - time_t last_update; - char label[32]; - char *_lbl[1]; -}; - - -struct ms_state { - struct llist_head list; - - char name[31+1]; - char imsi[15+1]; - struct gsm_meas_rep mr; - - struct ms_state_uni ul; - struct ms_state_uni dl; -}; - -struct state { - struct osmo_fd udp_ofd; - struct llist_head ms_list; - - CDKSCREEN *cdkscreen; - WINDOW *curses_win; - - CDKLABEL *cdk_title; - char *title; - - CDKLABEL *cdk_header; - char header[256]; -}; - -static struct state g_st; - -struct ms_state *find_ms(const char *imsi) -{ - struct ms_state *ms; - - llist_for_each_entry(ms, &g_st.ms_list, list) { - if (!strcmp(ms->imsi, imsi)) - return ms; - } - return NULL; -} - -static struct ms_state *find_alloc_ms(const char *imsi) -{ - struct ms_state *ms; - - ms = find_ms(imsi); - if (!ms) { - ms = talloc_zero(NULL, struct ms_state); - osmo_strlcpy(ms->imsi, imsi, sizeof(ms->imsi)); - ms->ul._lbl[0] = ms->ul.label; - ms->dl._lbl[0] = ms->dl.label; - llist_add_tail(&ms->list, &g_st.ms_list); - } - - return ms; -} - -static int handle_meas(struct msgb *msg) -{ - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - struct ms_state *ms = find_alloc_ms(mfm->imsi); - time_t now = time(NULL); - - osmo_strlcpy(ms->name, mfm->name, sizeof(ms->name)); - memcpy(&ms->mr, &mfm->mr, sizeof(ms->mr)); - ms->ul.last_update = now; - if (ms->mr.flags & MEAS_REP_F_DL_VALID) - ms->dl.last_update = now; - - /* move to head of list */ - llist_del(&ms->list); - llist_add(&ms->list, &g_st.ms_list); - - return 0; -} - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - switch (mfh->msg_type) { - case MEAS_FEED_MEAS: - handle_meas(msg); - break; - default: - break; - } - - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - - -static void destroy_dir(struct ms_state_uni *uni) -{ - if (uni->cdk) { - destroyCDKSlider(uni->cdk); - uni->cdk = NULL; - } - if (uni->cdk_label) { - destroyCDKLabel(uni->cdk_label); - uni->cdk_label = NULL; - } -} - -#define DIR_UL 0 -#define DIR_DL 1 -static const char *dir_str[2] = { - [DIR_UL] = "UL", - [DIR_DL] = "DL", -}; - -static int colpair_by_qual(uint8_t rx_qual) -{ - if (rx_qual == 0) - return 24; - else if (rx_qual <= 4) - return 32; - else - return 16; -} - -static int colpair_by_lev(int rx_lev) -{ - if (rx_lev < -95) - return 16; - else if (rx_lev < -80) - return 32; - else - return 24; -} - - -void write_uni(struct ms_state *ms, struct ms_state_uni *msu, - struct gsm_rx_lev_qual *lq, int dir, int row) -{ - - char label[128]; - time_t now = time(NULL); - int qual_col = colpair_by_qual(lq->rx_qual); - int lev_col = colpair_by_lev(rxlev2dbm(lq->rx_lev)); - int color, pwr; - - if (dir == DIR_UL) { - pwr = ms->mr.ms_l1.pwr; - } else { - pwr = ms->mr.bs_power; - } - - color = A_REVERSE | COLOR_PAIR(lev_col) | ' '; - snprintf(label, sizeof(label), "%s %s ", ms->imsi, dir_str[dir]); - msu->cdk = newCDKSlider(g_st.cdkscreen, 0, row, NULL, label, color, - COLS-40, rxlev2dbm(lq->rx_lev), -110, -47, - 1, 2, FALSE, FALSE); - //IsVisibleObj(ms->ul.cdk) = FALSE; - snprintf(msu->label, sizeof(msu->label), "%1d %3d %2u %2d %4u", - qual_col, lq->rx_qual, qual_col, pwr, - ms->mr.ms_l1.ta, ms->mr.ms_timing_offset, - now - msu->last_update); - msu->cdk_label = newCDKLabel(g_st.cdkscreen, RIGHT, row, - msu->_lbl, 1, FALSE, FALSE); -} - -static void update_sliders(void) -{ - int num_vis_sliders = 0; - struct ms_state *ms; -#define HEADER_LINES 2 - - /* remove all sliders */ - llist_for_each_entry(ms, &g_st.ms_list, list) { - destroy_dir(&ms->ul); - destroy_dir(&ms->dl); - - } - - llist_for_each_entry(ms, &g_st.ms_list, list) { - struct gsm_rx_lev_qual *lq; - unsigned int row = HEADER_LINES + num_vis_sliders*3; - - if (ms->mr.flags & MEAS_REP_F_UL_DTX) - lq = &ms->mr.ul.sub; - else - lq = &ms->mr.ul.full; - write_uni(ms, &ms->ul, lq, DIR_UL, row); - - if (ms->mr.flags & MEAS_REP_F_DL_DTX) - lq = &ms->mr.dl.sub; - else - lq = &ms->mr.dl.full; - write_uni(ms, &ms->dl, lq, DIR_DL, row+1); - - num_vis_sliders++; - if (num_vis_sliders >= LINES/3) - break; - } - - refreshCDKScreen(g_st.cdkscreen); - -} - -const struct value_string col_strs[] = { - { COLOR_WHITE, "white" }, - { COLOR_RED, "red" }, - { COLOR_GREEN, "green" }, - { COLOR_YELLOW, "yellow" }, - { COLOR_BLUE, "blue" }, - { COLOR_MAGENTA,"magenta" }, - { COLOR_CYAN, "cyan" }, - { COLOR_BLACK, "black" }, - { 0, NULL } -}; - -int main(int argc, char **argv) -{ - int rc; - char *header[1]; - char *title[1]; - - msgb_talloc_ctx_init(NULL, 0); - - printf("sizeof(gsm_meas_rep)=%u\n", sizeof(struct gsm_meas_rep)); - printf("sizeof(meas_feed_meas)=%u\n", sizeof(struct meas_feed_meas)); - - INIT_LLIST_HEAD(&g_st.ms_list); - g_st.curses_win = initscr(); - g_st.cdkscreen = initCDKScreen(g_st.curses_win); - initCDKColor(); - - g_st.title = "OpenBSC link quality monitor"; - title[0] = g_st.title; - g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1, FALSE, FALSE); - - snprintf(g_st.header, sizeof(g_st.header), "Q Pwr TA TO Time"); - header[0] = g_st.header; - g_st.cdk_header = newCDKLabel(g_st.cdkscreen, RIGHT, 1, header, 1, FALSE, FALSE); - -#if 0 - int i; - for (i = 0; i < 64; i++) { - short f, b; - pair_content(i, &f, &b); - attron(COLOR_PAIR(i)); - printw("%u: %u (%s) ", i, f, get_value_string(col_strs, f)); - printw("%u (%s)\n\r", b, get_value_string(col_strs, b)); - } - refresh(); - getch(); - exit(0); -#endif - - g_st.udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&g_st.udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) - exit(1); - - while (1) { - osmo_select_main(0); - update_sliders(); - }; - - exit(0); -} -- To view, visit https://gerrit.osmocom.org/12655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0cedaad4b717c8c5198842e2acd610f8e03f957 Gerrit-Change-Number: 12655 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 21:50:05 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 20 Jan 2019 21:50:05 +0000 Subject: Change in openbsc[master]: Remove openbsc-dev package Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12656 Change subject: Remove openbsc-dev package ...................................................................... Remove openbsc-dev package There're no external utilities which rely on it anymore so we can simplify our packaging by removing it. Change-Id: I9a96c217999416099aa7ce690845f56fc132274c --- M debian/control D debian/openbsc-dev.install M openbsc/Makefile.am M openbsc/configure.ac D openbsc/openbsc.pc.in 5 files changed, 0 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/56/12656/1 diff --git a/debian/control b/debian/control index a841acf..a78ff3e 100644 --- a/debian/control +++ b/debian/control @@ -69,17 +69,6 @@ ${misc:Depends} Description: OsmoBSC-MGCP: Osmocom's Legacy Media Gateway. -Package: openbsc-dev -Architecture: all -Depends: ${misc:Depends} -Description: Header file needed by tools tightly integrated - Some other programs depend on gsm_data_shared.h and gsm_data_shared.c - from OpenBSC. This package installs these files to your file system so - that the other packages can build-depend on this package. - . - The directory structure is copied after the structure in the repository - and the header and .c file are installed into /usr/src/osmocom/openbsc/. - Package: osmocom-bsc-sccplite-dbg Architecture: any Section: debug diff --git a/debian/openbsc-dev.install b/debian/openbsc-dev.install deleted file mode 100644 index b669b0f..0000000 --- a/debian/openbsc-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ -openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/ -usr/lib/*/pkgconfig/openbsc.pc diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index 19999b1..f42e6d0 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -16,9 +16,6 @@ contrib \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = openbsc.pc - BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 64285e0..109bad8 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -243,7 +243,6 @@ AM_CONFIG_HEADER(bscconfig.h) AC_OUTPUT( - openbsc.pc include/openbsc/Makefile include/Makefile src/Makefile diff --git a/openbsc/openbsc.pc.in b/openbsc/openbsc.pc.in deleted file mode 100644 index 17e265d..0000000 --- a/openbsc/openbsc.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/ - -Name: OpenBSC -Description: OpenBSC base station controller -Requires: -Version: @VERSION@ -Cflags: -I${includedir} -- To view, visit https://gerrit.osmocom.org/12656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a96c217999416099aa7ce690845f56fc132274c Gerrit-Change-Number: 12656 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 21:50:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 20 Jan 2019 21:50:06 +0000 Subject: Change in openbsc[master]: Remove osmocom-ipaccess-utils-dbg package Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12657 Change subject: Remove osmocom-ipaccess-utils-dbg package ...................................................................... Remove osmocom-ipaccess-utils-dbg package The rest was dropped in I9c04f9b469e60802461a2a6e421d3ba27e6dafa1. Change-Id: If56c288121bd26fead9a921c1f04f9958468e1b6 --- M debian/control 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/57/12657/1 diff --git a/debian/control b/debian/control index a78ff3e..557467e 100644 --- a/debian/control +++ b/debian/control @@ -85,14 +85,6 @@ Description: Debug symbols for the OpenBSC NITB Make debugging possible -Package: osmocom-ipaccess-utils-dbg -Architecture: any -Section: debug -Priority: extra -Depends: osmocom-ipaccess-utils (= ${binary:Version}), ${misc:Depends} -Description: Debug symbols for the OpenBSC ip.access utils - Make debugging possible - Package: osmocom-bs11-utils-dbg Architecture: any Section: debug -- To view, visit https://gerrit.osmocom.org/12657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If56c288121bd26fead9a921c1f04f9958468e1b6 Gerrit-Change-Number: 12657 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:20:32 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:20:32 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b(), osmo_hexdump_buf() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12658 Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b(), osmo_hexdump_buf() ...................................................................... add osmo_hexdump_b(), osmo_hexdump_nospc_b(), osmo_hexdump_buf() Add osmo_hexdump_b() and osmo_hexdump_nospc_b() to use a second static buffer, allowing more than one hexdump per printf()-like call. Add osmo_hexdump_buf() as an all-purpose hexdump function, which all other osmo_hexdump_*() implementations now call. It absorbs the static _osmo_hexdump(). Add tests for osmo_hexdump_buf(). Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. Naming: before, I named functions that use a secondary string buffer with a '2' suffix, like osmo_plmn_name() and osmo_plmn_name2(). This time, I decided to use a '_b' suffix, osmo_hexdump_b(), instead. The reason is, by now I think that '2' is a bad choice for secondary-buffer functions: the '2' suffix is already used for introducing a newer API version of function signatures. If we, for example, introduce an osmo_hexdump() that has no final delimiter after the last byte, that would qualify for osmo_hexdump2(); and that would confuse with the implementation simply using a secondary buffer. Sometimes during code review, I assume that the existence of a foo2() function means the patch submitter should use foo2() instead of foo(), and am annoyed by my previous choice of overloading the '2' suffix with a secondary meaning besides "this is newer API". Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 186 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/12658/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 987080e..ffe6cdd 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -55,7 +55,12 @@ char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); char *osmo_hexdump(const unsigned char *buf, int len); +char *osmo_hexdump_b(const unsigned char *buf, int len); char *osmo_hexdump_nospc(const unsigned char *buf, int len); +char *osmo_hexdump_nospc_b(const unsigned char *buf, int len); +char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last); + char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) __attribute__((__deprecated__)); #define osmo_static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1] __attribute__((__unused__)); diff --git a/src/utils.c b/src/utils.c index d1da4fa..06c2f8a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -217,32 +217,58 @@ } static char hexd_buff[4096]; +static char hexd_buff2[4096]; static const char hex_chars[] = "0123456789abcdef"; -static char *_osmo_hexdump(const unsigned char *buf, int len, char *delim) +/*! Convert binary sequence to hexadecimal ASCII string. + * \param[out] out_buf Output buffer to write the resulting string to. + * \param[in] out_buf_size sizeof(out_buf). + * \param[in] buf Input buffer, pointer to sequence of bytes. + * \param[in] len Length of input buf in number of bytes. + * \param[in] delim String to separate each byte; NULL or "" for no delim. + * \param[in] delim_after_last If true, end the string in delim (true: "1a:ef:d9:", false: "1a:ef:d9"); + * if out_buf has insufficient space, the string will always end in a delim. + * \returns out_buf, containing a zero-terminated string, or NULL if out_buf == NULL or out_buf_size < 1. + * + * This function will print a sequence of bytes as hexadecimal numbers, adding one delim between each byte (e.g. for + * delim passed as ":", return a string like "1a:ef:d9"). + * + * The delim_after_last argument exists to be able to exactly show the original osmo_hexdump() behavior, which always + * ends the string with a delimiter. + */ +char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last) { int i; - char *cur = hexd_buff; + char *cur = out_buf; + size_t delim_len; - hexd_buff[0] = 0; + if (!out_buf || !out_buf_size) + return NULL; + + delim = delim ? : ""; + delim_len = strlen(delim); + for (i = 0; i < len; i++) { const char *delimp = delim; - int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); - if (len_remain < 3) + int len_remain = out_buf_size - (cur - out_buf) - 1; + if (len_remain < (2 + delim_len) + && !(!delim_after_last && i == (len - 1) && len_remain >= 2)) break; *cur++ = hex_chars[buf[i] >> 4]; *cur++ = hex_chars[buf[i] & 0xf]; + if (i == (len - 1) && !delim_after_last) + break; + while (len_remain > 1 && *delimp) { *cur++ = *delimp++; len_remain--; } - - *cur = 0; } - hexd_buff[sizeof(hexd_buff)-1] = 0; - return hexd_buff; + *cur = '\0'; + return out_buf; } /*! Convert a sequence of unpacked bits to ASCII string @@ -292,7 +318,18 @@ */ char *osmo_hexdump(const unsigned char *buf, int len) { - return _osmo_hexdump(buf, len, " "); + return osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, " ", true); +} + +/*! Same as osmo_hexdump() but use a separate static buffer. + * Allows passing a second osmo_hexdump() as print format argument. + * \param[in] buf pointer to sequence of bytes. + * \param[in] len length of buf in number of bytes. + * \returns pointer to zero-terminated string. + */ +char *osmo_hexdump_b(const unsigned char *buf, int len) +{ + return osmo_hexdump_buf(hexd_buff2, sizeof(hexd_buff2), buf, len, " ", true); } /*! Convert binary sequence to hexadecimal ASCII string @@ -308,7 +345,18 @@ */ char *osmo_hexdump_nospc(const unsigned char *buf, int len) { - return _osmo_hexdump(buf, len, ""); + return osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); +} + +/*! Same as osmo_hexdump_nospc() but use a separate static buffer. + * Allows passing a second osmo_hexdump() as print format argument. + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + */ +char *osmo_hexdump_nospc_b(const unsigned char *buf, int len) +{ + return osmo_hexdump_buf(hexd_buff2, sizeof(hexd_buff2), buf, len, "", true); } /* Compat with previous typo to preserve abi */ diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index a773b3f..822861f 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -37,6 +37,7 @@ static void hexdump_test(void) { uint8_t data[4098]; + char buf[256]; int i; for (i = 0; i < ARRAY_SIZE(data); ++i) @@ -44,10 +45,34 @@ printf("Plain dump\n"); printf("%s\n", osmo_hexdump(data, 4)); + printf("%s\n", osmo_hexdump_nospc(data, 4)); printf("Corner case\n"); printf("%s\n", osmo_hexdump(data, ARRAY_SIZE(data))); printf("%s\n", osmo_hexdump_nospc(data, ARRAY_SIZE(data))); + +#define _HEXDUMP_BUF_TEST(SIZE, DELIM, DELIM_AFTER) \ + buf[0] = '!'; \ + buf[1] = '\0'; \ + printf("osmo_hexdump_buf(buf, " #SIZE ", data, 4, %s, " #DELIM_AFTER ")\n = \"%s\"\n", \ + DELIM ? #DELIM : "NULL", \ + osmo_hexdump_buf(buf, SIZE, data, 4, DELIM, DELIM_AFTER)) +#define HEXDUMP_BUF_TEST(DELIM) \ + _HEXDUMP_BUF_TEST(sizeof(buf), DELIM, false); \ + _HEXDUMP_BUF_TEST(sizeof(buf), DELIM, true); \ + _HEXDUMP_BUF_TEST(6, DELIM, false); \ + _HEXDUMP_BUF_TEST(7, DELIM, false); \ + _HEXDUMP_BUF_TEST(8, DELIM, false); \ + _HEXDUMP_BUF_TEST(6, DELIM, true); \ + _HEXDUMP_BUF_TEST(7, DELIM, true); \ + _HEXDUMP_BUF_TEST(8, DELIM, true) + + HEXDUMP_BUF_TEST("[delim]"); + HEXDUMP_BUF_TEST(" "); + HEXDUMP_BUF_TEST(":"); + HEXDUMP_BUF_TEST("::"); + HEXDUMP_BUF_TEST(""); + HEXDUMP_BUF_TEST(NULL); } static void hexparse_test(void) diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index 65e32ed..8d7ced8 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -1,8 +1,105 @@ Plain dump 00 01 02 03 +00010203 Corner case 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfe +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "[delim]", false) + = "00[delim]01[delim]02[delim]03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "[delim]", true) + = "00[delim]01[delim]02[delim]03[delim]" +osmo_hexdump_buf(buf, 6, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 7, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 8, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 6, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, 7, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, 8, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, " ", false) + = "00 01 02 03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, " ", true) + = "00 01 02 03 " +osmo_hexdump_buf(buf, 6, data, 4, " ", false) + = "00 " +osmo_hexdump_buf(buf, 7, data, 4, " ", false) + = "00 01 " +osmo_hexdump_buf(buf, 8, data, 4, " ", false) + = "00 01 " +osmo_hexdump_buf(buf, 6, data, 4, " ", true) + = "00 " +osmo_hexdump_buf(buf, 7, data, 4, " ", true) + = "00 01 " +osmo_hexdump_buf(buf, 8, data, 4, " ", true) + = "00 01 " +osmo_hexdump_buf(buf, sizeof(buf), data, 4, ":", false) + = "00:01:02:03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, ":", true) + = "00:01:02:03:" +osmo_hexdump_buf(buf, 6, data, 4, ":", false) + = "00:" +osmo_hexdump_buf(buf, 7, data, 4, ":", false) + = "00:01:" +osmo_hexdump_buf(buf, 8, data, 4, ":", false) + = "00:01:" +osmo_hexdump_buf(buf, 6, data, 4, ":", true) + = "00:" +osmo_hexdump_buf(buf, 7, data, 4, ":", true) + = "00:01:" +osmo_hexdump_buf(buf, 8, data, 4, ":", true) + = "00:01:" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "::", false) + = "00::01::02::03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "::", true) + = "00::01::02::03::" +osmo_hexdump_buf(buf, 6, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 7, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 8, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 6, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, 7, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, 8, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "", false) + = "00010203" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "", true) + = "00010203" +osmo_hexdump_buf(buf, 6, data, 4, "", false) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, "", false) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, "", false) + = "000102" +osmo_hexdump_buf(buf, 6, data, 4, "", true) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, "", true) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, "", true) + = "000102" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, NULL, false) + = "00010203" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, NULL, true) + = "00010203" +osmo_hexdump_buf(buf, 6, data, 4, NULL, false) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, NULL, false) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, NULL, false) + = "000102" +osmo_hexdump_buf(buf, 6, data, 4, NULL, true) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, NULL, true) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, NULL, true) + = "000102" Hexparse 0..255 in lower case rc = 256 -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:20:32 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:20:32 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12659 Change subject: add osmo_classmark_* API ...................................................................... add osmo_classmark_* API osmo-bsc and osmo-msc implement identical Classmark structures. It makes sense to define once near the gsm48 protocol definitions. Also move along some generic Classmark API from osmo-msc. Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 171 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/12659/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 234fa79..1e782d5 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -56,6 +56,22 @@ #endif } __attribute__ ((packed)); +struct osmo_classmark { + bool classmark1_set; + struct gsm48_classmark1 classmark1; + uint8_t classmark2_len; + uint8_t classmark2[3]; + uint8_t classmark3_len; + uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ +}; + +bool osmo_classmark_is_r99(const struct osmo_classmark *cm); +bool osmo_classmark1_is_r99(const struct gsm48_classmark1 *cm1); +bool osmo_classmark2_is_r99(const uint8_t *cm2, uint8_t cm2_len); +int osmo_classmark_supports_a5(const struct osmo_classmark *cm, uint8_t a5); +const char *osmo_classmark_a5_name(const struct osmo_classmark *cm); +void osmo_classmark_update(const struct osmo_classmark *src, struct osmo_classmark *dst); + /* Chapter 10.5.2.1b.3 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 795e98b..dd193a3 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1156,4 +1156,152 @@ {} }; +bool osmo_classmark1_is_r99(const struct gsm48_classmark1 *cm1) +{ + return cm1->rev_lev >= 2; +} + +bool osmo_classmark2_is_r99(const uint8_t *cm2, uint8_t cm2_len) +{ + uint8_t rev_lev; + if (!cm2_len) + return false; + rev_lev = (cm2[0] >> 5) & 0x3; + return rev_lev >= 2; +} + +/*! Return true if any of Classmark 1 or Classmark 2 are present and indicate R99 capability. + * \param[in] cm Classmarks. + * \returns True if R99 or later, false if pre-R99 or no Classmarks are present. + */ +bool osmo_classmark_is_r99(const struct osmo_classmark *cm) +{ + if (cm->classmark1_set) + return osmo_classmark1_is_r99(&cm->classmark1); + return osmo_classmark2_is_r99(cm->classmark2, cm->classmark2_len); +} + +/*! Return a string representation of A5 cipher algorithms indicated by Classmark 1, 2 and 3. + * \param[in] cm Classmarks. + * \returns A statically allocated string like "cm1{a5/1=supported} cm2{0x23= A5/2 A5/3} no-cm3" + */ +const char *osmo_classmark_a5_name(const struct osmo_classmark *cm) +{ + static char buf[128]; + char cm1[42]; + char cm2[42]; + char cm3[42]; + + if (cm->classmark1_set) + snprintf(cm1, sizeof(cm1), "cm1{a5/1=%s}", + cm->classmark1.a5_1 ? "not-supported":"supported" /* inverted logic */); + else + snprintf(cm1, sizeof(cm1), "no-cm1"); + + if (cm->classmark2_len >= 3) + snprintf(cm2, sizeof(cm2), " cm2{0x%x=%s%s}", + cm->classmark2[2], + cm->classmark2[2] & 0x1 ? " A5/2" : "", + cm->classmark2[2] & 0x2 ? " A5/3" : ""); + else + snprintf(cm2, sizeof(cm2), " no-cm2"); + + if (cm->classmark3_len >= 1) + snprintf(cm3, sizeof(cm3), " cm3{0x%x=%s%s%s%s}", + cm->classmark3[0], + cm->classmark3[0] & (1 << 0) ? " A5/4" : "", + cm->classmark3[0] & (1 << 1) ? " A5/5" : "", + cm->classmark3[0] & (1 << 2) ? " A5/6" : "", + cm->classmark3[0] & (1 << 3) ? " A5/7" : ""); + else + snprintf(cm3, sizeof(cm3), " no-cm3"); + + snprintf(buf, sizeof(buf), "%s%s%s", cm1, cm2, cm3); + return buf; +} + +/*! Overwrite dst with the Classmark information present in src. + * Add an new Classmark and overwrite in dst what src has to offer, but where src has no Classmark information, leave + * dst unchanged. (For Classmark 2 and 3, dst will exactly match any non-zero Classmark length from src, hence may end + * up with a shorter Classmark after this call.) + * \param[in] src The new Classmark information to read from. + * \param[out] dst The target Classmark storage to be updated. + */ +void osmo_classmark_update(const struct osmo_classmark *src, struct osmo_classmark *dst) +{ + if (src->classmark1_set) { + dst->classmark1 = src->classmark1; + dst->classmark1_set = true; + } + if (src->classmark2_len) { + dst->classmark2_len = src->classmark2_len; + memcpy(dst->classmark2, src->classmark2, sizeof(dst->classmark2)); + } + if (src->classmark3_len) { + dst->classmark3_len = src->classmark3_len; + memcpy(dst->classmark3, src->classmark3, sizeof(dst->classmark3)); + } +} + + +/*! Determine if the given Classmark (1/2/3) value permits a given A5/n cipher. + * \param[in] cm Classmarks. + * \param[in] a5 The N in A5/N for which to query whether support is indicated. + * \return 1 when the given A5/n is permitted, 0 when not (or a5 > 7), and negative if the respective MS Classmark is + * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not available. The + * idea is that when e.g. A5/3 is requested and the corresponding Classmark 3 is not available, that the caller + * can react by obtaining Classmark 3 and calling again once it is available. + */ +int osmo_classmark_supports_a5(const struct osmo_classmark *cm, uint8_t a5) +{ + switch (a5) { + case 0: + /* all phones must implement A5/0, see 3GPP TS 43.020 4.9 */ + return 1; + case 1: + /* 3GPP TS 43.020 4.9 requires A5/1 to be suppored by all phones and actually states: + * "The network shall not provide service to an MS which indicates that it does not + * support the ciphering algorithm A5/1.". However, let's be more tolerant based + * on policy here */ + /* See 3GPP TS 24.008 10.5.1.7 */ + if (!cm->classmark1_set) { + return -1; + } else { + if (cm->classmark1.a5_1) + return 0; /* Inverted logic for this bit! */ + else + return 1; + } + break; + case 2: + case 3: + /* See 3GPP TS 24.008 10.5.1.6 */ + if (cm->classmark2_len < 3) { + return -2; + } else { + if (cm->classmark2[2] & (1 << (a5-2))) + return 1; + else + return 0; + } + break; + case 4: + case 5: + case 6: + case 7: + /* See 3GPP TS 24.008 10.5.1.7 */ + if (cm->classmark3_len < 1) { + return -3; + } else { + if (cm->classmark3[0] & (1 << (a5-4))) + return 1; + else + return 0; + } + break; + default: + return 0; + } +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index da6fba1..54e32da 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -581,5 +581,12 @@ osmo_lu_type_names; osmo_cm_service_type_names; +osmo_classmark_is_r99; +osmo_classmark1_is_r99; +osmo_classmark2_is_r99; +osmo_classmark_supports_a5; +osmo_classmark_a5_name; +osmo_classmark_update; + local: *; }; -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:38:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:38:04 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#9). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 648 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/9 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:38:13 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:38:13 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/#/c/11504/7/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/7/src/gsm/gsm0808_utils.c at 1450 PS7, Line 1450: { > Is there any use-case where this would be called directly instead of gsm0808_cell_ids_match() and gs [?] >From my POV it is a useful addition, but you have a point -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 20 Jan 2019 22:38:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:40:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:40:58 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12485 ) Change subject: LCLS: constify helper parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 20 Jan 2019 22:40:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 22:58:39 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 20 Jan 2019 22:58:39 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 30: (1 comment) vty_dump_one_conn() in msc_vty.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/msc_vty.c at 564 PS30, Line 564: conn->via_ran == OSMO_RAT_UTRAN_IU ? "Iu" : "A", here maybe rather use osmo_rat_type_name(), otherwise all SGs conns are shown as "A". -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 20 Jan 2019 22:58:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 20 23:17:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 Jan 2019 23:17:58 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E10-9e66-dirty_=E2=86=92_0=2E4=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12660 Change subject: Bump version: 0.3.0.10-9e66-dirty ? 0.4.0 ...................................................................... Bump version: 0.3.0.10-9e66-dirty ? 0.4.0 Change-Id: Ib2943b7fd0a1f7ca79f761116cba30aa3aa29b88 --- M debian/changelog M src/Makefile.am 2 files changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/60/12660/1 diff --git a/debian/changelog b/debian/changelog index 1ec6437..26f7525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +osmo-iuh (0.4.0) unstable; urgency=medium + + [ Bernhard M. Wiedemann ] + * asn1tostruct: allow to override build date + + [ Alexander Couzens ] + * hnbgw: remove close_cb() to fix a crash when releasing a hnbgw + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * hnbgw_tx_hnb_register_rej(): Missing return statement + + [ Neels Hofmeyr ] + * fix decoding of incoming X.213 NSAP addr + * hnbgw: vty: add SCCP related vty commands + * fix transport layer addr again, for nano3g + + [ Pau Espin Pedrol ] + * debian: package osmo-hnbgw.service + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Stefan Sperling ] + * add a VTY command which shows a specific HNB + + [ Oliver Smith ] + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:46:05 +0100 + osmo-iuh (0.3.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/src/Makefile.am b/src/Makefile.am index 7802384..586c689 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=2:0:0 +RANAP_LIBVERSION=2:1:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/12660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2943b7fd0a1f7ca79f761116cba30aa3aa29b88 Gerrit-Change-Number: 12660 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 21 01:09:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:09:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c451bc7531ce_39fdea667c581772@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 240s] configure:10923: 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 [ 240s] configure:10923: $? = 0 [ 240s] configure:10923: result: yes [ 240s] configure:10923: checking for inttypes.h [ 240s] configure:10923: 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 [ 240s] configure:10923: $? = 0 [ 240s] configure:10923: result: yes [ 240s] configure:10923: checking for stdint.h [ 240s] configure:10923: 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 [ 240s] configure:10923: $? = 0 [ 240s] configure:10923: result: yes [ 240s] configure:10923: checking for unistd.h [ 240s] configure:10923: 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 [ 240s] configure:10923: $? = 0 [ 240s] configure:10923: result: yes [ 240s] configure:10937: checking for dlfcn.h [ 240s] configure:10937: 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 [ 240s] configure:10937: $? = 0 [ 240s] configure:10937: result: yes [ 240s] configure:11141: checking for objdir [ 240s] configure:11156: result: .libs [ 240s] configure:11420: checking if gcc supports -fno-rtti -fno-exceptions [ 240s] configure:11438: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fno-rtti -fno-exceptions conftest.c >&5 [ 242s] cc1: warning: command line option '-fno-rtti'[ 217.676215] sysrq: SysRq : Power Off [ 242s] [ 217.680558] reboot: Power down [ 242s] ### VM INTERACTION END ### [ 242s] [ 242s] obs-arm-3 failed "build osmo-trx_1.0.0.dsc" at Mon Jan 21 01:09:02 UTC 2019. [ 242s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:09:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:09:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c451bc6eabc8_39fdea667c581646@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/armv7l Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 231s] #define HAVE_MEMORY_H 1 [ 231s] #define HAVE_STRINGS_H 1 [ 231s] #define HAVE_INTTYPES_H 1 [ 231s] #define HAVE_STDINT_H 1 [ 231s] #define HAVE_UNISTD_H 1 [ 231s] #define HAVE_DLFCN_H 1 [ 231s] #define LT_OBJDIR ".libs/" [ 231s] #define STDC_HEADERS 1 [ 231s] #define HAVE_BYTESWAP_H 1 [ 231s] #define TIME_WITH_SYS_TIME 1 [ 231s] [ 231s] configure: exit 1 [ 231s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 231s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 231s] make[1]: *** [override_dh_auto_configure] Error 2 [ 231s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 231s] debian/rules:6: recipe for target 'build' failed [ 231s] make: *** [build] Error 2 [ 231s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 231s] [ 231s] armbuild13 failed "build osmo-trx_1.0.0.dsc" at Mon Jan 21 01:08:54 UTC 2019. [ 231s] [ 231s] ### VM INTERACTION START ### [ 233s] [ 195.623631] SysRq : Power Off [ 233s] [ 195.625146] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] armbuild13 failed "build osmo-trx_1.0.0.dsc" at Mon Jan 21 01:08:58 UTC 2019. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:13:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:13:04 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c451cb589eab_39fdea667c5818b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.10/i586 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 111s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 111s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 111s] ^~~~~~~~~~~~~~~~~ [ 111s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 111s] make[4]: *** [gsm_04_80.o] Error 1 [ 111s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 111s] Makefile:447: recipe for target 'all-recursive' failed [ 111s] make[3]: *** [all-recursive] Error 1 [ 111s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 111s] Makefile:518: recipe for target 'all-recursive' failed [ 111s] make[2]: *** [all-recursive] Error 1 [ 111s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 111s] Makefile:427: recipe for target 'all' failed [ 111s] make[1]: *** [all] Error 2 [ 111s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 111s] dh_auto_build: make -j1 returned exit code 2 [ 111s] debian/rules:13: recipe for target 'build' failed [ 111s] make: *** [build] Error 2 [ 111s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 111s] [ 111s] lamb24 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:47 UTC 2019. [ 111s] [ 111s] ### VM INTERACTION START ### [ 114s] [ 103.716586] sysrq: SysRq : Power Off [ 114s] [ 103.724402] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] lamb24 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:50 UTC 2019. [ 114s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:13:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:13:04 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c451cb5cff1a_39fdea667c5819df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.04/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 109s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 109s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 109s] ^ [ 109s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 109s] make[4]: *** [gsm_04_80.o] Error 1 [ 109s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 109s] Makefile:447: recipe for target 'all-recursive' failed [ 109s] make[3]: *** [all-recursive] Error 1 [ 109s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 109s] Makefile:518: recipe for target 'all-recursive' failed [ 109s] make[2]: *** [all-recursive] Error 1 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 109s] Makefile:427: recipe for target 'all' failed [ 109s] make[1]: *** [all] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 109s] dh_auto_build: make -j1 returned exit code 2 [ 109s] debian/rules:13: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] lamb14 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:47 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 102.412689] sysrq: SysRq : Power Off [ 112s] [ 102.420844] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb14 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:50 UTC 2019. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:13:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:13:04 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c451cb628d42_39fdea667c58206b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_8.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 104s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 104s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 104s] ^ [ 104s] Makefile:472: recipe for target 'gsm_04_80.o' failed [ 104s] make[4]: *** [gsm_04_80.o] Error 1 [ 104s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 104s] Makefile:435: recipe for target 'all-recursive' failed [ 104s] make[3]: *** [all-recursive] Error 1 [ 104s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 104s] Makefile:507: recipe for target 'all-recursive' failed [ 104s] make[2]: *** [all-recursive] Error 1 [ 104s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 104s] Makefile:415: recipe for target 'all' failed [ 104s] make[1]: *** [all] Error 2 [ 104s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 104s] dh_auto_build: make -j1 returned exit code 2 [ 104s] debian/rules:13: recipe for target 'build' failed [ 104s] make: *** [build] Error 2 [ 104s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 104s] [ 104s] lamb04 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:54 UTC 2019. [ 104s] [ 104s] ### VM INTERACTION START ### [ 105s] Powering off. [ 105s] [ 94.298430] reboot: Power down [ 105s] ### VM INTERACTION END ### [ 105s] [ 105s] lamb04 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:12:56 UTC 2019. [ 105s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:14:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:14:13 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c451cf2ce126_39fdea667c5821b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_16.10/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 145s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 145s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 145s] ^~~~~~~~~~~~~~~~~ [ 145s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 145s] make[4]: *** [gsm_04_80.o] Error 1 [ 145s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 145s] Makefile:447: recipe for target 'all-recursive' failed [ 145s] make[3]: *** [all-recursive] Error 1 [ 145s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 145s] Makefile:518: recipe for target 'all-recursive' failed [ 145s] make[2]: *** [all-recursive] Error 1 [ 145s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 145s] Makefile:427: recipe for target 'all' failed [ 145s] make[1]: *** [all] Error 2 [ 145s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 145s] dh_auto_build: make -j1 returned exit code 2 [ 145s] debian/rules:13: recipe for target 'build' failed [ 145s] make: *** [build] Error 2 [ 145s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 145s] [ 145s] cloud112 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:00 UTC 2019. [ 145s] [ 145s] ### VM INTERACTION START ### [ 148s] [ 124.580786] sysrq: SysRq : Power Off [ 148s] [ 124.591069] reboot: Power down [ 150s] ### VM INTERACTION END ### [ 150s] [ 150s] cloud112 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:05 UTC 2019. [ 150s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:14:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:14:30 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c451d11361ab_39fdea667c5822e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/i586 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 107s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 107s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 107s] ^~~~~~~~~~~~~~~~~ [ 107s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 107s] make[4]: *** [gsm_04_80.o] Error 1 [ 107s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 107s] Makefile:447: recipe for target 'all-recursive' failed [ 107s] make[3]: *** [all-recursive] Error 1 [ 107s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 107s] Makefile:518: recipe for target 'all-recursive' failed [ 107s] make[2]: *** [all-recursive] Error 1 [ 107s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 107s] Makefile:427: recipe for target 'all' failed [ 107s] make[1]: *** [all] Error 2 [ 107s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 107s] dh_auto_build: make -j1 returned exit code 2 [ 107s] debian/rules:13: recipe for target 'build' failed [ 107s] make: *** [build] Error 2 [ 107s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 107s] [ 107s] lamb51 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:12 UTC 2019. [ 107s] [ 107s] ### VM INTERACTION START ### [ 110s] [ 98.888362] sysrq: SysRq : Power Off [ 110s] [ 98.896264] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] lamb51 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:15 UTC 2019. [ 110s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:14:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:14:47 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c451d119db18_39fdea667c58235f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.04/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 114s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 114s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 114s] ^~~~~~~~~~~~~~~~~ [ 114s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 114s] make[4]: *** [gsm_04_80.o] Error 1 [ 114s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 114s] Makefile:447: recipe for target 'all-recursive' failed [ 114s] make[3]: *** [all-recursive] Error 1 [ 114s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 114s] Makefile:518: recipe for target 'all-recursive' failed [ 114s] make[2]: *** [all-recursive] Error 1 [ 114s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 114s] Makefile:427: recipe for target 'all' failed [ 114s] make[1]: *** [all] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 114s] dh_auto_build: make -j1 returned exit code 2 [ 114s] debian/rules:13: recipe for target 'build' failed [ 114s] make: *** [build] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 115s] [ 115s] build32 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:33 UTC 2019. [ 115s] [ 115s] ### VM INTERACTION START ### [ 118s] [ 105.041393] sysrq: SysRq : Power Off [ 118s] [ 105.044548] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] build32 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:37 UTC 2019. [ 118s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:14:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:14:47 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c451d139ac9b_39fdea667c582418@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.04/i586 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 127s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 127s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 127s] ^~~~~~~~~~~~~~~~~ [ 127s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 127s] make[4]: *** [gsm_04_80.o] Error 1 [ 127s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 127s] Makefile:447: recipe for target 'all-recursive' failed [ 127s] make[3]: *** [all-recursive] Error 1 [ 127s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 127s] Makefile:518: recipe for target 'all-recursive' failed [ 127s] make[2]: *** [all-recursive] Error 1 [ 127s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 127s] Makefile:427: recipe for target 'all' failed [ 127s] make[1]: *** [all] Error 2 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 127s] dh_auto_build: make -j1 returned exit code 2 [ 127s] debian/rules:13: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] build30 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:33 UTC 2019. [ 127s] [ 127s] ### VM INTERACTION START ### [ 130s] [ 112.275384] sysrq: SysRq : Power Off [ 130s] [ 112.278695] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] build30 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:38 UTC 2019. [ 131s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:15:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:15:04 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c451d3217247_39fdea667c582559@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.10/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 138s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 138s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 138s] ^~~~~~~~~~~~~~~~~ [ 138s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 138s] make[4]: *** [gsm_04_80.o] Error 1 [ 138s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 138s] Makefile:447: recipe for target 'all-recursive' failed [ 138s] make[3]: *** [all-recursive] Error 1 [ 138s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 138s] Makefile:518: recipe for target 'all-recursive' failed [ 138s] make[2]: *** [all-recursive] Error 1 [ 138s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 138s] Makefile:427: recipe for target 'all' failed [ 138s] make[1]: *** [all] Error 2 [ 138s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 138s] dh_auto_build: make -j1 returned exit code 2 [ 138s] debian/rules:13: recipe for target 'build' failed [ 138s] make: *** [build] Error 2 [ 138s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 138s] [ 138s] cloud128 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:41 UTC 2019. [ 138s] [ 138s] ### VM INTERACTION START ### [ 141s] [ 120.997056] sysrq: SysRq : Power Off [ 141s] [ 121.010285] reboot: Power down [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] cloud128 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:14:47 UTC 2019. [ 143s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:15:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:15:21 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c451d3292fc1_39fdea667c5826fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 134s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 134s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 134s] ^~~~~~~~~~~~~~~~~ [ 134s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 134s] make[4]: *** [gsm_04_80.o] Error 1 [ 134s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 134s] Makefile:447: recipe for target 'all-recursive' failed [ 134s] make[3]: *** [all-recursive] Error 1 [ 134s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 134s] Makefile:518: recipe for target 'all-recursive' failed [ 134s] make[2]: *** [all-recursive] Error 1 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 134s] Makefile:427: recipe for target 'all' failed [ 134s] make[1]: *** [all] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 134s] dh_auto_build: make -j1 returned exit code 2 [ 134s] debian/rules:13: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] cloud118 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:15:06 UTC 2019. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 114.572670] sysrq: SysRq : Power Off [ 137s] [ 114.577157] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] cloud118 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:15:11 UTC 2019. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:18:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:18:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c451e0161d17_39fdea667c582734@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 86s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 86s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 86s] ^ [ 86s] Makefile:492: recipe for target 'gsm_04_80.o' failed [ 86s] make[4]: *** [gsm_04_80.o] Error 1 [ 86s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 86s] Makefile:409: recipe for target 'all-recursive' failed [ 86s] make[3]: *** [all-recursive] Error 1 [ 86s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 86s] Makefile:445: recipe for target 'all-recursive' failed [ 86s] make[2]: *** [all-recursive] Error 1 [ 86s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 86s] Makefile:376: recipe for target 'all' failed [ 86s] make[1]: *** [all] Error 2 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 86s] dh_auto_build: make -j1 returned exit code 2 [ 86s] debian/rules:45: recipe for target 'build' failed [ 86s] make: *** [build] Error 2 [ 86s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 86s] [ 86s] lamb51 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:18:23 UTC 2019. [ 86s] [ 86s] ### VM INTERACTION START ### [ 87s] Powering off. [ 87s] [ 76.569923] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] lamb51 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:18:24 UTC 2019. [ 87s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:18:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:18:30 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c451e01b6685_39fdea667c58284@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/aarch64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 223s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 223s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 223s] ^~~~~~~~~~~~~~~~~ [ 223s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 223s] make[4]: *** [gsm_04_80.o] Error 1 [ 223s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 223s] Makefile:447: recipe for target 'all-recursive' failed [ 223s] make[3]: *** [all-recursive] Error 1 [ 223s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 223s] Makefile:518: recipe for target 'all-recursive' failed [ 223s] make[2]: *** [all-recursive] Error 1 [ 223s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 223s] Makefile:427: recipe for target 'all' failed [ 223s] make[1]: *** [all] Error 2 [ 223s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 223s] dh_auto_build: make -j1 returned exit code 2 [ 223s] debian/rules:13: recipe for target 'build' failed [ 223s] make: *** [build] Error 2 [ 223s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 223s] [ 223s] obs-arm-3 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:18:24 UTC 2019. [ 223s] [ 223s] ### VM INTERACTION START ### [ 226s] [ 203.049309] sysrq: SysRq : Power Off [ 226s] [ 203.053631] reboot: Power down [ 226s] ### VM INTERACTION END ### [ 226s] [ 226s] obs-arm-3 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:18:28 UTC 2019. [ 226s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:19:38 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:19:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c451e3e768d4_39fdea667c582992@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 133s] 06 [ 133s] [ 133s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 133s] - [ 133s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 133s] 07 [ 133s] [ 133s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 133s] + [ 133s] result (UNBLOCK) = 1 [ 133s] [ 133s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 133s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 133s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 133s] make[1]: *** [override_dh_auto_test] Error 1 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] debian/rules:45: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] cloud128 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:19:18 UTC 2019. [ 133s] [ 133s] ### VM INTERACTION START ### [ 134s] Powering off. [ 134s] [ 111.338367] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] cloud128 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:19:21 UTC 2019. [ 135s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:20:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:20:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c451e5dae542_39fdea667c5831d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 61s] | #define HAVE_STRING_H 1 [ 61s] | #define HAVE_MEMORY_H 1 [ 61s] | #define HAVE_STRINGS_H 1 [ 61s] | #define HAVE_INTTYPES_H 1 [ 61s] | #define HAVE_STDINT_H 1 [ 61s] | #define HAVE_UNISTD_H 1 [ 61s] | #define HAVE_DLFCN_H 1 [ 61s] | #define LT_OBJDIR ".libs/" [ 61s] | #define STDC_HEADERS 1 [ 61s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 61s] | [ 61s] | configure: exit 0 [ 61s] [ 61s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 61s] make[1]: *** [override_dh_auto_test] Error 1 [ 61s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 61s] debian/rules:45: recipe for target 'build' failed [ 61s] make: *** [build] Error 2 [ 61s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 61s] [ 61s] build81 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:20:06 UTC 2019. [ 61s] [ 61s] ### VM INTERACTION START ### [ 63s] Powering off. [ 63s] [ 54.450993] reboot: Power down [ 63s] ### VM INTERACTION END ### [ 63s] [ 63s] build81 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:20:08 UTC 2019. [ 63s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:20:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:20:13 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c451e5d57348_39fdea667c5830f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/armv7l Package network:osmocom:latest/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 223s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 223s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 223s] ^~~~~~~~~~~~~~~~~ [ 223s] Makefile:484: recipe for target 'gsm_04_80.o' failed [ 223s] make[4]: *** [gsm_04_80.o] Error 1 [ 223s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 223s] Makefile:447: recipe for target 'all-recursive' failed [ 223s] make[3]: *** [all-recursive] Error 1 [ 223s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 223s] Makefile:518: recipe for target 'all-recursive' failed [ 223s] make[2]: *** [all-recursive] Error 1 [ 223s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 223s] Makefile:427: recipe for target 'all' failed [ 223s] make[1]: *** [all] Error 2 [ 223s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 223s] dh_auto_build: make -j1 returned exit code 2 [ 223s] debian/rules:13: recipe for target 'build' failed [ 223s] make: *** [build] Error 2 [ 223s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 223s] [ 223s] armbuild14 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:19:56 UTC 2019. [ 223s] [ 223s] ### VM INTERACTION START ### [ 226s] [ 192.552406] sysrq: SysRq : Power Off [ 226s] [ 192.554160] reboot: Power down [ 226s] ### VM INTERACTION END ### [ 226s] [ 226s] armbuild14 failed "build openbsc_1.1.0.dsc" at Mon Jan 21 01:19:59 UTC 2019. [ 226s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:20:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:20:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c451e7c70a1f_39fdea667c583289@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_8.0/i586 Package network:osmocom:latest/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 87s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 87s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 87s] ^ [ 87s] Makefile:492: recipe for target 'gsm_04_80.o' failed [ 87s] make[4]: *** [gsm_04_80.o] Error 1 [ 87s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 87s] Makefile:409: recipe for target 'all-recursive' failed [ 87s] make[3]: *** [all-recursive] Error 1 [ 87s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 87s] Makefile:445: recipe for target 'all-recursive' failed [ 87s] make[2]: *** [all-recursive] Error 1 [ 87s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 87s] Makefile:376: recipe for target 'all' failed [ 87s] make[1]: *** [all] Error 2 [ 87s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 87s] dh_auto_build: make -j1 returned exit code 2 [ 87s] debian/rules:45: recipe for target 'build' failed [ 87s] make: *** [build] Error 2 [ 87s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 87s] [ 87s] lamb54 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:20:29 UTC 2019. [ 87s] [ 87s] ### VM INTERACTION START ### [ 88s] Powering off. [ 88s] [ 77.490057] reboot: Power down [ 88s] ### VM INTERACTION END ### [ 88s] [ 88s] lamb54 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:20:31 UTC 2019. [ 88s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:21:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:21:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c451e9bb9e7_39fdea667c5833c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 115s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 115s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 115s] ^ [ 115s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 115s] make[4]: *** [gsm_04_80.o] Error 1 [ 115s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 115s] Makefile:421: recipe for target 'all-recursive' failed [ 115s] make[3]: *** [all-recursive] Error 1 [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 115s] Makefile:457: recipe for target 'all-recursive' failed [ 115s] make[2]: *** [all-recursive] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 115s] Makefile:389: recipe for target 'all' failed [ 115s] make[1]: *** [all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 115s] dh_auto_build: make -j1 returned exit code 2 [ 115s] debian/rules:45: recipe for target 'build' failed [ 115s] make: *** [build] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 115s] [ 115s] cloud120 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:21:08 UTC 2019. [ 115s] [ 115s] ### VM INTERACTION START ### [ 118s] [ 96.592491] sysrq: SysRq : Power Off [ 118s] [ 96.606589] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] cloud120 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:21:12 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:22:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:22:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c451ef0da4e0_39fdea667c5834d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 74s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 74s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 74s] ^ [ 74s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 74s] make[4]: *** [gsm_04_80.o] Error 1 [ 74s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 74s] Makefile:421: recipe for target 'all-recursive' failed [ 74s] make[3]: *** [all-recursive] Error 1 [ 74s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 74s] Makefile:457: recipe for target 'all-recursive' failed [ 74s] make[2]: *** [all-recursive] Error 1 [ 74s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 74s] Makefile:389: recipe for target 'all' failed [ 74s] make[1]: *** [all] Error 2 [ 74s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 74s] dh_auto_build: make -j1 returned exit code 2 [ 74s] debian/rules:45: recipe for target 'build' failed [ 74s] make: *** [build] Error 2 [ 74s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 74s] [ 74s] sheep83 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:22:16 UTC 2019. [ 74s] [ 74s] ### VM INTERACTION START ### [ 77s] [ 70.843937] sysrq: SysRq : Power Off [ 77s] [ 70.850038] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] sheep83 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:22:19 UTC 2019. [ 77s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:22:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:22:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c451ef136bab_39fdea667c5835a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 91s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 91s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 91s] ^~~~~~~~~~~~~~~~~ [ 91s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 91s] make[4]: *** [gsm_04_80.o] Error 1 [ 91s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 91s] Makefile:421: recipe for target 'all-recursive' failed [ 91s] make[3]: *** [all-recursive] Error 1 [ 91s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 91s] Makefile:457: recipe for target 'all-recursive' failed [ 91s] make[2]: *** [all-recursive] Error 1 [ 91s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 91s] Makefile:389: recipe for target 'all' failed [ 91s] make[1]: *** [all] Error 2 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] dh_auto_build: make -j1 returned exit code 2 [ 91s] debian/rules:45: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] lamb14 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:22:36 UTC 2019. [ 91s] [ 91s] ### VM INTERACTION START ### [ 94s] [ 83.448948] sysrq: SysRq : Power Off [ 94s] [ 83.457073] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] lamb14 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:22:39 UTC 2019. [ 94s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:23:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:23:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c451f0fa701c_39fdea667c5836e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 109s] | #define HAVE_STRING_H 1 [ 109s] | #define HAVE_MEMORY_H 1 [ 109s] | #define HAVE_STRINGS_H 1 [ 109s] | #define HAVE_INTTYPES_H 1 [ 109s] | #define HAVE_STDINT_H 1 [ 109s] | #define HAVE_UNISTD_H 1 [ 109s] | #define HAVE_DLFCN_H 1 [ 109s] | #define LT_OBJDIR ".libs/" [ 109s] | #define STDC_HEADERS 1 [ 109s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 109s] | [ 109s] | configure: exit 0 [ 109s] [ 109s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 109s] make[1]: *** [override_dh_auto_test] Error 1 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] debian/rules:45: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:22:53 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 102.632723] sysrq: SysRq : Power Off [ 112s] [ 102.639892] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:22:57 UTC 2019. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:23:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:23:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c451f103657_39fdea667c5837f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 110s] | #define HAVE_STRING_H 1 [ 110s] | #define HAVE_MEMORY_H 1 [ 110s] | #define HAVE_STRINGS_H 1 [ 110s] | #define HAVE_INTTYPES_H 1 [ 110s] | #define HAVE_STDINT_H 1 [ 110s] | #define HAVE_UNISTD_H 1 [ 110s] | #define HAVE_DLFCN_H 1 [ 110s] | #define LT_OBJDIR ".libs/" [ 110s] | #define STDC_HEADERS 1 [ 110s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 110s] | [ 110s] | configure: exit 0 [ 110s] [ 110s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 110s] make[1]: *** [override_dh_auto_test] Error 1 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] debian/rules:45: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] lamb03 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:22:54 UTC 2019. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 103.219243] sysrq: SysRq : Power Off [ 113s] [ 103.227298] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] lamb03 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:22:58 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:23:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:23:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c451f1056650_39fdea667c5838d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 192s] | #define HAVE_STRING_H 1 [ 192s] | #define HAVE_MEMORY_H 1 [ 192s] | #define HAVE_STRINGS_H 1 [ 192s] | #define HAVE_INTTYPES_H 1 [ 192s] | #define HAVE_STDINT_H 1 [ 192s] | #define HAVE_UNISTD_H 1 [ 192s] | #define HAVE_DLFCN_H 1 [ 192s] | #define LT_OBJDIR ".libs/" [ 192s] | #define STDC_HEADERS 1 [ 192s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 192s] | [ 192s] | configure: exit 0 [ 192s] [ 192s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 192s] make[1]: *** [override_dh_auto_test] Error 1 [ 192s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 192s] debian/rules:45: recipe for target 'build' failed [ 192s] make: *** [build] Error 2 [ 192s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 192s] [ 192s] build35 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:23:05 UTC 2019. [ 192s] [ 192s] ### VM INTERACTION START ### [ 196s] [ 171.477358] sysrq: SysRq : Power Off [ 196s] [ 171.479845] reboot: Power down [ 196s] ### VM INTERACTION END ### [ 196s] [ 196s] build35 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:23:10 UTC 2019. [ 196s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:23:56 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:23:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c451f2ee1a00_39fdea667c5839d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 61s] | #define HAVE_STRING_H 1 [ 61s] | #define HAVE_MEMORY_H 1 [ 61s] | #define HAVE_STRINGS_H 1 [ 61s] | #define HAVE_INTTYPES_H 1 [ 61s] | #define HAVE_STDINT_H 1 [ 61s] | #define HAVE_UNISTD_H 1 [ 61s] | #define HAVE_DLFCN_H 1 [ 61s] | #define LT_OBJDIR ".libs/" [ 61s] | #define STDC_HEADERS 1 [ 61s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 61s] | [ 61s] | configure: exit 0 [ 61s] [ 61s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 61s] make[1]: *** [override_dh_auto_test] Error 1 [ 61s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 61s] debian/rules:45: recipe for target 'build' failed [ 61s] make: *** [build] Error 2 [ 61s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 61s] [ 61s] build72 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:23:42 UTC 2019. [ 61s] [ 61s] ### VM INTERACTION START ### [ 64s] [ 56.164750] sysrq: SysRq : Power Off [ 64s] [ 56.166492] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] build72 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:23:46 UTC 2019. [ 65s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:23:56 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:23:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c451f2f5013b_39fdea667c5840c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 68s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 68s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 68s] ^~~~~~~~~~~~~~~~~ [ 68s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 68s] make[4]: *** [gsm_04_80.o] Error 1 [ 68s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 68s] Makefile:421: recipe for target 'all-recursive' failed [ 68s] make[3]: *** [all-recursive] Error 1 [ 68s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 68s] Makefile:457: recipe for target 'all-recursive' failed [ 68s] make[2]: *** [all-recursive] Error 1 [ 68s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 68s] Makefile:389: recipe for target 'all' failed [ 68s] make[1]: *** [all] Error 2 [ 68s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 68s] dh_auto_build: make -j1 returned exit code 2 [ 68s] debian/rules:45: recipe for target 'build' failed [ 68s] make: *** [build] Error 2 [ 68s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 68s] [ 68s] sheep83 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:23:44 UTC 2019. [ 68s] [ 68s] ### VM INTERACTION START ### [ 71s] [ 64.244752] sysrq: SysRq : Power Off [ 71s] [ 64.250675] reboot: Power down [ 71s] ### VM INTERACTION END ### [ 71s] [ 71s] sheep83 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:23:48 UTC 2019. [ 71s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:24:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:24:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c451f6bd3b5b_39fdea667c58415@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 103s] 06 [ 103s] [ 103s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 103s] - [ 103s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 103s] 07 [ 103s] [ 103s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 103s] + [ 103s] result (UNBLOCK) = 1 [ 103s] [ 103s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 103s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 103s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 103s] make[1]: *** [override_dh_auto_test] Error 1 [ 103s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 103s] debian/rules:45: recipe for target 'build' failed [ 103s] make: *** [build] Error 2 [ 103s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 103s] [ 103s] lamb15 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:24:28 UTC 2019. [ 103s] [ 103s] ### VM INTERACTION START ### [ 106s] [ 94.401949] sysrq: SysRq : Power Off [ 106s] [ 94.409476] reboot: Power down [ 106s] ### VM INTERACTION END ### [ 106s] [ 106s] lamb15 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:24:32 UTC 2019. [ 106s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:24:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:24:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c451f6c34756_39fdea667c5842a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 49s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 49s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 49s] ^~~~~~~~~~~~~~~~~ [ 49s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 49s] make[4]: *** [gsm_04_80.o] Error 1 [ 49s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 49s] Makefile:421: recipe for target 'all-recursive' failed [ 49s] make[3]: *** [all-recursive] Error 1 [ 49s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 49s] Makefile:457: recipe for target 'all-recursive' failed [ 49s] make[2]: *** [all-recursive] Error 1 [ 49s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 49s] Makefile:389: recipe for target 'all' failed [ 49s] make[1]: *** [all] Error 2 [ 49s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 49s] dh_auto_build: make -j1 returned exit code 2 [ 49s] debian/rules:45: recipe for target 'build' failed [ 49s] make: *** [build] Error 2 [ 49s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 49s] [ 49s] build79 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:31 UTC 2019. [ 49s] [ 49s] ### VM INTERACTION START ### [ 52s] [ 44.049475] sysrq: SysRq : Power Off [ 52s] [ 44.051491] reboot: Power down [ 52s] ### VM INTERACTION END ### [ 52s] [ 52s] build79 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:35 UTC 2019. [ 52s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:24:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:24:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c451f6c8f423_39fdea667c584329@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 118s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 118s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 118s] ^~~~~~~~~~~~~~~~~ [ 118s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 118s] make[4]: *** [gsm_04_80.o] Error 1 [ 118s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 118s] Makefile:421: recipe for target 'all-recursive' failed [ 118s] make[3]: *** [all-recursive] Error 1 [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 118s] Makefile:457: recipe for target 'all-recursive' failed [ 118s] make[2]: *** [all-recursive] Error 1 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 118s] Makefile:389: recipe for target 'all' failed [ 118s] make[1]: *** [all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] dh_auto_build: make -j1 returned exit code 2 [ 118s] debian/rules:45: recipe for target 'build' failed [ 118s] make: *** [build] Error 2 [ 118s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 118s] [ 118s] cloud128 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:30 UTC 2019. [ 118s] [ 118s] ### VM INTERACTION START ### [ 121s] [ 100.463173] sysrq: SysRq : Power Off [ 121s] [ 100.478519] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] cloud128 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:36 UTC 2019. [ 123s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:25:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:25:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c451f8bbad96_39fdea667c58469e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 60s] | #define HAVE_STRING_H 1 [ 60s] | #define HAVE_MEMORY_H 1 [ 60s] | #define HAVE_STRINGS_H 1 [ 60s] | #define HAVE_INTTYPES_H 1 [ 60s] | #define HAVE_STDINT_H 1 [ 60s] | #define HAVE_UNISTD_H 1 [ 60s] | #define HAVE_DLFCN_H 1 [ 60s] | #define LT_OBJDIR ".libs/" [ 60s] | #define STDC_HEADERS 1 [ 60s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 60s] | [ 60s] | configure: exit 0 [ 60s] [ 60s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 60s] make[1]: *** [override_dh_auto_test] Error 1 [ 60s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 60s] debian/rules:45: recipe for target 'build' failed [ 60s] make: *** [build] Error 2 [ 60s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 60s] [ 60s] build74 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:25:02 UTC 2019. [ 60s] [ 60s] ### VM INTERACTION START ### [ 63s] [ 55.496143] sysrq: SysRq : Power Off [ 63s] [ 55.498061] reboot: Power down [ 63s] ### VM INTERACTION END ### [ 63s] [ 63s] build74 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:25:06 UTC 2019. [ 63s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:25:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:25:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c451f8aef6ef_39fdea667c5844f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 117s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 117s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 117s] ^~~~~~~~~~~~~~~~~ [ 117s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 117s] make[4]: *** [gsm_04_80.o] Error 1 [ 117s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 117s] Makefile:421: recipe for target 'all-recursive' failed [ 117s] make[3]: *** [all-recursive] Error 1 [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 117s] Makefile:457: recipe for target 'all-recursive' failed [ 117s] make[2]: *** [all-recursive] Error 1 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 117s] Makefile:389: recipe for target 'all' failed [ 117s] make[1]: *** [all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s] dh_auto_build: make -j1 returned exit code 2 [ 117s] debian/rules:45: recipe for target 'build' failed [ 117s] make: *** [build] Error 2 [ 117s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 117s] [ 117s] cloud111 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:52 UTC 2019. [ 117s] [ 117s] ### VM INTERACTION START ### [ 120s] [ 93.861199] sysrq: SysRq : Power Off [ 120s] [ 93.866178] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] cloud111 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:24:57 UTC 2019. [ 121s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:25:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:25:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c451f8c14465_39fdea667c5847f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/i586 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 88s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 88s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 88s] ^~~~~~~~~~~~~~~~~ [ 88s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 88s] make[4]: *** [gsm_04_80.o] Error 1 [ 88s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 88s] Makefile:421: recipe for target 'all-recursive' failed [ 88s] make[3]: *** [all-recursive] Error 1 [ 88s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 88s] Makefile:457: recipe for target 'all-recursive' failed [ 88s] make[2]: *** [all-recursive] Error 1 [ 88s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 88s] Makefile:389: recipe for target 'all' failed [ 88s] make[1]: *** [all] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] dh_auto_build: make -j1 returned exit code 2 [ 88s] debian/rules:45: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 88s] [ 88s] lamb52 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:25:13 UTC 2019. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 79.411279] sysrq: SysRq : Power Off [ 91s] [ 79.418921] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] lamb52 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:25:17 UTC 2019. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:25:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:25:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c451f8b476e3_39fdea667c584582@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 141s] 06 [ 141s] [ 141s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 141s] - [ 141s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 141s] 07 [ 141s] [ 141s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 141s] + [ 141s] result (UNBLOCK) = 1 [ 141s] [ 141s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 141s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 141s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 141s] make[1]: *** [override_dh_auto_test] Error 1 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] debian/rules:45: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] cloud117 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:24:54 UTC 2019. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 121.335062] sysrq: SysRq : Power Off [ 144s] [ 121.339641] reboot: Power down [ 145s] ### VM INTERACTION END ### [ 145s] [ 145s] cloud117 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:24:59 UTC 2019. [ 145s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:25:56 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:25:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c451fa5a3333_39fdea667c5848d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 109s] | #define HAVE_STRING_H 1 [ 109s] | #define HAVE_MEMORY_H 1 [ 109s] | #define HAVE_STRINGS_H 1 [ 109s] | #define HAVE_INTTYPES_H 1 [ 109s] | #define HAVE_STDINT_H 1 [ 109s] | #define HAVE_UNISTD_H 1 [ 109s] | #define HAVE_DLFCN_H 1 [ 109s] | #define LT_OBJDIR ".libs/" [ 109s] | #define STDC_HEADERS 1 [ 109s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 109s] | [ 109s] | configure: exit 0 [ 109s] [ 109s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 109s] make[1]: *** [override_dh_auto_test] Error 1 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] debian/rules:45: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:25:37 UTC 2019. [ 109s] [ 109s] ### VM INTERACTION START ### [ 113s] [ 101.230205] sysrq: SysRq : Power Off [ 113s] [ 101.237442] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:25:41 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:26:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:26:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c451fc431e60_39fdea667c58494c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 108s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 108s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 108s] ^~~~~~~~~~~~~~~~~ [ 108s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 108s] make[4]: *** [gsm_04_80.o] Error 1 [ 108s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 108s] Makefile:421: recipe for target 'all-recursive' failed [ 108s] make[3]: *** [all-recursive] Error 1 [ 108s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 108s] Makefile:457: recipe for target 'all-recursive' failed [ 108s] make[2]: *** [all-recursive] Error 1 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 108s] Makefile:389: recipe for target 'all' failed [ 108s] make[1]: *** [all] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] dh_auto_build: make -j1 returned exit code 2 [ 108s] debian/rules:45: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 108s] [ 108s] lamb57 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:25:58 UTC 2019. [ 108s] [ 108s] ### VM INTERACTION START ### [ 111s] [ 99.886164] sysrq: SysRq : Power Off [ 111s] [ 99.894369] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] lamb57 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:26:02 UTC 2019. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:26:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:26:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c451fc47872d_39fdea667c5850c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 118s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 118s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 118s] ^~~~~~~~~~~~~~~~~ [ 118s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 118s] make[4]: *** [gsm_04_80.o] Error 1 [ 118s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 118s] Makefile:421: recipe for target 'all-recursive' failed [ 118s] make[3]: *** [all-recursive] Error 1 [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 118s] Makefile:457: recipe for target 'all-recursive' failed [ 118s] make[2]: *** [all-recursive] Error 1 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 118s] Makefile:389: recipe for target 'all' failed [ 118s] make[1]: *** [all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] dh_auto_build: make -j1 returned exit code 2 [ 118s] debian/rules:45: recipe for target 'build' failed [ 118s] make: *** [build] Error 2 [ 118s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 118s] [ 118s] cloud112 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:26:04 UTC 2019. [ 118s] [ 118s] ### VM INTERACTION START ### [ 121s] [ 100.905042] sysrq: SysRq : Power Off [ 121s] [ 100.909543] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] cloud112 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:26:10 UTC 2019. [ 123s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:26:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:26:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c451fe2dd7b4_39fdea667c5851ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 144s] | #define HAVE_STRING_H 1 [ 144s] | #define HAVE_MEMORY_H 1 [ 144s] | #define HAVE_STRINGS_H 1 [ 144s] | #define HAVE_INTTYPES_H 1 [ 144s] | #define HAVE_STDINT_H 1 [ 144s] | #define HAVE_UNISTD_H 1 [ 144s] | #define HAVE_DLFCN_H 1 [ 144s] | #define LT_OBJDIR ".libs/" [ 144s] | #define STDC_HEADERS 1 [ 144s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 144s] | [ 144s] | configure: exit 0 [ 144s] [ 144s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 144s] make[1]: *** [override_dh_auto_test] Error 1 [ 144s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 144s] debian/rules:45: recipe for target 'build' failed [ 144s] make: *** [build] Error 2 [ 144s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 144s] [ 144s] cloud122 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:26:13 UTC 2019. [ 144s] [ 144s] ### VM INTERACTION START ### [ 148s] [ 123.683161] sysrq: SysRq : Power Off [ 148s] [ 123.687797] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] cloud122 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:26:18 UTC 2019. [ 149s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:26:47 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:26:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c451fe347af7_39fdea667c5852b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 134s] | #define HAVE_STRING_H 1 [ 134s] | #define HAVE_MEMORY_H 1 [ 134s] | #define HAVE_STRINGS_H 1 [ 134s] | #define HAVE_INTTYPES_H 1 [ 134s] | #define HAVE_STDINT_H 1 [ 134s] | #define HAVE_UNISTD_H 1 [ 134s] | #define HAVE_DLFCN_H 1 [ 134s] | #define LT_OBJDIR ".libs/" [ 134s] | #define STDC_HEADERS 1 [ 134s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 134s] | [ 134s] | configure: exit 0 [ 134s] [ 134s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 134s] make[1]: *** [override_dh_auto_test] Error 1 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:45: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 134s] [ 134s] morla3 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:26:26 UTC 2019. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 123.102846] sysrq: SysRq : Power Off [ 137s] [ 123.107476] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] morla3 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:26:30 UTC 2019. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:35:56 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:35:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c4521fd99305_39fdea667c5853c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 146s] 06 [ 146s] [ 146s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 146s] - [ 146s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 146s] 07 [ 146s] [ 146s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 146s] + [ 146s] result (UNBLOCK) = 1 [ 146s] [ 146s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 146s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 146s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 146s] make[1]: *** [override_dh_auto_test] Error 1 [ 146s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 146s] debian/rules:45: recipe for target 'build' failed [ 146s] make: *** [build] Error 2 [ 146s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 146s] [ 146s] armbuild22 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:35:41 UTC 2019. [ 146s] [ 146s] ### VM INTERACTION START ### [ 148s] [ 132.138690] SysRq : Power Off [ 148s] [ 132.140308] reboot: Power down [ 148s] ### VM INTERACTION END ### [ 148s] [ 148s] armbuild22 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:35:44 UTC 2019. [ 148s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:36:13 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:36:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c45221c1649c_39fdea667c5854f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 89s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 89s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 89s] ^~~~~~~~~~~~~~~~~ [ 89s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 89s] make[4]: *** [gsm_04_80.o] Error 1 [ 89s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 89s] Makefile:421: recipe for target 'all-recursive' failed [ 89s] make[3]: *** [all-recursive] Error 1 [ 89s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 89s] Makefile:457: recipe for target 'all-recursive' failed [ 89s] make[2]: *** [all-recursive] Error 1 [ 89s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 89s] Makefile:389: recipe for target 'all' failed [ 89s] make[1]: *** [all] Error 2 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] dh_auto_build: make -j1 returned exit code 2 [ 89s] debian/rules:45: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] obs-arm-7 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:36:05 UTC 2019. [ 89s] [ 89s] ### VM INTERACTION START ### [ 92s] [ 79.677043] sysrq: SysRq : Power Off [ 92s] [ 79.698476] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] obs-arm-7 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:36:08 UTC 2019. [ 92s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:38:30 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:38:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c4522b326829_39fdea667c585511@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 230s] Got LLC message, CRC: ea7648 (computed ea7648) [ 230s] Unhandled GSM 04.08 message type ATTACH COMPLETE for protocol discriminator GMM. [ 230s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0x327330 CMD=UI DATA [ 230s] Got LLC message, CRC: 327330 (computed 327330) [ 230s] RA_UPD_REQ: Got TLLI efe2b700, BSSGP RAID 112-332-16464-96, old RAID 112-332-16464-96 [ 230s] gbproxy_validate_tlli({current = afe2b700, assigned = efe2b700, net_vld = 0, bss_vld = 1}, efe2b700) [ 230s] gbproxy_validate_tlli({current = afe2b700, assigned = efe2b700, net_vld = 0, bss_vld = 1}, efe2b700) [ 230s] Updated LLC message, CRC: 327330 -> 327330 [ 230s] NSEI=4096 proxying BTS->SGSN (NS_BVCI=4098, NSEI=256) [ 230s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0x327330 CMD=UI DATA [ 230s] Got LLC message, CRC: 327330 (computed 327330) [ 230s] LLC SAPI=1 R U GEA? IOV-UI=0x000000 FCS=0xa73041 CMD=UI DATA [ 230s] Got LLC message, CRC: a73041 (computed a73041) [ 230s] RA_UPD_REJ: Got TLLI efe2b700, IMSI 12131415161718, invalidate, re-attach [ 230s] gbproxy_validate_tlli({current = afe2b700, assigned = efe2b700, net_vld = 0, bss_vld = 1}, efe2b700) [ 230s] The TLLI efe2b700 has been validated (was afe2b700) [ 230s] gbproxy_validate_tlli({current = afe2b700, assigned = efe2b700, net_vld = 0, bss_vld = 1}, efe2b700) [ 230s] The TLLI efe2b700 has been validated (was afe2b700) [ 230s] Unregistering TLLI efe2b700 [ 230s] NSEI=256 proxying SGSN->BSS (NS_BVCI=4098, NSEI=4096) [ 230s] LLC SAPI=1 R U GEA? IOV-UI=0x000000 FCS=0xa73041 CMD=UI DATA [ 230s] Got LLC message, CRC: a73041 (computed a73041) [ 230s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0xc3cc50 CMD=UI DATA [ 232s] Got LLC message, CRC: c3cc50 (computed[ 209.227465] sysrq: SysRq : Power Off [ 232s] [ 209.231727] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] obs-arm-3 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 01:38:29 UTC 2019. [ 232s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 01:41:38 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 01:41:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c45236856c48_39fdea667c58566f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/armv7l Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 159s] ^~~~~~~~~~~~~~~~~ [ 159s] In file included from /usr/include/osmocom/gsm/gsm48.h:7:0, [ 159s] from ../../include/osmocom/msc/gsm_data.h:13, [ 159s] from gsm_04_80.c:32: [ 159s] /usr/include/osmocom/core/msgb.h:371:30: note: previous definition of 'msgb_wrap_with_TL' was here [ 159s] static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) [ 159s] ^~~~~~~~~~~~~~~~~ [ 159s] Makefile:504: recipe for target 'gsm_04_80.o' failed [ 159s] make[4]: *** [gsm_04_80.o] Error 1 [ 159s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 159s] Makefile:421: recipe for target 'all-recursive' failed [ 159s] make[3]: *** [all-recursive] Error 1 [ 159s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 159s] Makefile:457: recipe for target 'all-recursive' failed [ 159s] make[2]: *** [all-recursive] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 159s] Makefile:389: recipe for target 'all' failed [ 159s] make[1]: *** [all] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: make -j1 returned exit code 2 [ 159s] debian/rules:45: recipe for target 'build' failed [ 159s] make: *** [build] Error 2 [ 159s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 159s] [ 159s] armbuild13 failed "build osmo-msc_1.2.0.dsc" at Mon Jan 21 01:41:25 UTC 2019. [ 159s] [ 159s] ### VM INTERACTION START ### [ 162s] [ 128.958091] SysRq : Power Off [ 162s] [ 128.959518] reboot: Power down -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 21 01:45:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 01:45:58 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 30: (1 comment) https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11642/30/src/libmsc/msc_vty.c at 564 PS30, Line 564: conn->via_ran == OSMO_RAT_UTRAN_IU ? "Iu" : "A", > here maybe rather use osmo_rat_type_name(), otherwise all SGs conns are shown as "A". (BTW, for the inter-MSC stuff, this will have to change anyway, so it's enough to solve it trivially / quickly and not spend much time on it.) -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 30 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 01:45:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 05:01:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 05:01:34 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 9: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm0808_utils.c at 1373 PS9, Line 1373: gsm0808_cell_id_u_name Are there any users of this function outside the library? Maybe we should mark it as deprecated instead? https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c at 339 PS9, Line 339: a->lac > b->lac If not a < b, and not a > b, then a != b, right? https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c at 356 PS9, Line 356: a->cell_identity > b->cell_identity same here. https://gerrit.osmocom.org/#/c/11504/9/src/gsm/libosmogsm.map File src/gsm/libosmogsm.map: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/libosmogsm.map at 213 PS9, Line 213: gsm0808_cell_id_u_match So, you're making this symbol static, thus breaking the API, but still keeping it here? -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 21 Jan 2019 05:01:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 05:14:37 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 05:14:37 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... Patch Set 2: Code-Review-1 (5 comments) Looks good, but I would prefer to avoid useless snprintf() calls in the 'else' branches. https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h at 59 PS2, Line 59: osmo_classmark Since this is a part of GSM 04.08, can we use "osmo_gsm48_" as prefix? https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h at 63 PS2, Line 63: classmark2 (just wondering) we also have gsm48_classmark2, why not to use it here? https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1199 PS2, Line 1199: snprintf(cm1, sizeof(cm1), "no-cm1"); Again, I suggest to avoid this snprintf() call. Just initialize the cm1[]: char cm1[42] = "no-cm1"; https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1207 PS2, Line 1207: snprintf same https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1217 PS2, Line 1217: snprintf too -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 05:14:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 05:28:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 05:28:22 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... Patch Set 2: (8 comments) https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1199 PS2, Line 1199: snprintf(cm1, sizeof(cm1), "no-cm1"); > Again, I suggest to avoid this snprintf() call. Just initialize the cm1[]: [?] PoC: https://pastebin.com/rUvt095q https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1230 PS2, Line 1230: const struct osmo_classmark *src, struct osmo_classmark *dst Let's follow the common (for memcpy, strcpy and memset) sequence here: dst, src. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1234 PS2, Line 1234: dst->classmark1_set Should we assign false otherwise? https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1238 PS2, Line 1238: sizeof(dst->classmark2) Why not classmark2_len? https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1242 PS2, Line 1242: sizeof same https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1269 PS2, Line 1269: } else { Cosmetic: nesting is not required here, because we return from the main 'if' branch. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1271 PS2, Line 1271: /* Inverted logic for this bit! */ This comment is actually related to the prev. line, please move it. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1303 PS2, Line 1303: return 0; (just wondering) shouldn't we indicate this 'out of range' case somehow? -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 05:28:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 09:40:24 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 21 Jan 2019 09:40:24 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12416 to look at the new patch set (#5). Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Fully internal generation of reference data that doesn't depend on glibc or even on any floating point math - Golden results are included in a .h Due to varying precision of different implementation or architecture, any kind of textual compare is impossible, so we include golden values and compare results of both the 'base' implementation the potentially 'optimized' one again this set of values with a small error tolerance Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/Makefile.am M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok A tests/Transceiver52M/convolve_test_golden.h 4 files changed, 926 insertions(+), 168 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/12416/5 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 5 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 09:53:48 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 21 Jan 2019 09:53:48 +0000 Subject: Change in osmo-trx[master]: arm/convolve: Fix the vfp4 real convolution for h_len=12 In-Reply-To: References: Message-ID: tnt has submitted this change and it was merged. ( https://gerrit.osmocom.org/12417 ) Change subject: arm/convolve: Fix the vfp4 real convolution for h_len=12 ...................................................................... arm/convolve: Fix the vfp4 real convolution for h_len=12 Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Signed-off-by: Sylvain Munaut --- M Transceiver52M/arch/arm/convolve_neon.S 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/arch/arm/convolve_neon.S b/Transceiver52M/arch/arm/convolve_neon.S index 637d150..8a023ff 100644 --- a/Transceiver52M/arch/arm/convolve_neon.S +++ b/Transceiver52M/arch/arm/convolve_neon.S @@ -92,8 +92,8 @@ vld2.32 {q8-q9}, [r4], r6 vld2.32 {q10-q11}, [r5], r6 #ifdef HAVE_NEON_FMA - vfma.f32 q1, q6, q0 - vfma.f32 q3, q7, q0 + vmul.f32 q1, q6, q0 + vmul.f32 q3, q7, q0 vfma.f32 q1, q8, q2 vfma.f32 q3, q9, q2 vfma.f32 q1, q10, q4 -- To view, visit https://gerrit.osmocom.org/12417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Gerrit-Change-Number: 12417 Gerrit-PatchSet: 5 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 09:54:02 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 21 Jan 2019 09:54:02 +0000 Subject: Change in osmo-trx[master]: convolve: Remove support for step, offset parameters In-Reply-To: References: Message-ID: tnt has submitted this change and it was merged. ( https://gerrit.osmocom.org/12415 ) Change subject: convolve: Remove support for step, offset parameters ...................................................................... convolve: Remove support for step, offset parameters - Those are not used any where - Those are not supported by the sse/neon accelerated versions - And I see very little use cases for those. Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Signed-off-by: Sylvain Munaut --- M Transceiver52M/Channelizer.cpp M Transceiver52M/Resampler.cpp M Transceiver52M/Synthesis.cpp M Transceiver52M/arch/arm/convolve.c M Transceiver52M/arch/common/convolve.h M Transceiver52M/arch/common/convolve_base.c M Transceiver52M/arch/x86/convolve.c M Transceiver52M/arch/x86/convolve_sse_3.c M Transceiver52M/arch/x86/convolve_sse_3.h M Transceiver52M/sigProcLib.cpp M tests/Transceiver52M/convolve_test.c 11 files changed, 124 insertions(+), 166 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/Transceiver52M/Channelizer.cpp b/Transceiver52M/Channelizer.cpp index 2d817b0..a18dd03 100644 --- a/Transceiver52M/Channelizer.cpp +++ b/Transceiver52M/Channelizer.cpp @@ -88,7 +88,7 @@ convolve_real(hInputs[i], blockLen, subFilters[i], hLen, hOutputs[i], blockLen, - 0, blockLen, 1, 0); + 0, blockLen); } cxvec_fft(fftHandle); diff --git a/Transceiver52M/Resampler.cpp b/Transceiver52M/Resampler.cpp index 6b9621c..ecd8865 100644 --- a/Transceiver52M/Resampler.cpp +++ b/Transceiver52M/Resampler.cpp @@ -143,7 +143,7 @@ convolve_real(in, in_len, reinterpret_cast(partitions[path]), filt_len, &out[2 * i], out_len - i, - n, 1, 1, 0); + n, 1); } return out_len; diff --git a/Transceiver52M/Synthesis.cpp b/Transceiver52M/Synthesis.cpp index 262c638..6b62156 100644 --- a/Transceiver52M/Synthesis.cpp +++ b/Transceiver52M/Synthesis.cpp @@ -102,7 +102,7 @@ convolve_real(hInputs[i], blockLen, subFilters[i], hLen, hOutputs[i], blockLen, - 0, blockLen, 1, 0); + 0, blockLen); } /* Interleave into output vector */ diff --git a/Transceiver52M/arch/arm/convolve.c b/Transceiver52M/arch/arm/convolve.c index 912d0c2..5b5bce5 100644 --- a/Transceiver52M/arch/arm/convolve.c +++ b/Transceiver52M/arch/arm/convolve.c @@ -29,17 +29,15 @@ int _base_convolve_real(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int _base_convolve_complex(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int bounds_check(int x_len, int h_len, int y_len, - int start, int len, int step); + int start, int len); #ifdef HAVE_NEON /* Calls into NEON assembler */ @@ -69,35 +67,32 @@ int convolve_real(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset) + int start, int len) { void (*conv_func)(float *, float *, float *, int) = NULL; - if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) + if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; memset(y, 0, len * 2 * sizeof(float)); #ifdef HAVE_NEON - if (step <= 4) { - switch (h_len) { - case 4: - conv_func = neon_conv_real4; - break; - case 8: - conv_func = neon_conv_real8; - break; - case 12: - conv_func = neon_conv_real12; - break; - case 16: - conv_func = neon_conv_real16; - break; - case 20: - conv_func = neon_conv_real20; - break; - } + switch (h_len) { + case 4: + conv_func = neon_conv_real4; + break; + case 8: + conv_func = neon_conv_real8; + break; + case 12: + conv_func = neon_conv_real12; + break; + case 16: + conv_func = neon_conv_real16; + break; + case 20: + conv_func = neon_conv_real20; + break; } #endif if (conv_func) { @@ -107,7 +102,7 @@ _base_convolve_real(x, x_len, h, h_len, y, y_len, - start, len, step, offset); + start, len); } return len; @@ -118,18 +113,17 @@ int convolve_complex(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset) + int start, int len) { void (*conv_func)(float *, float *, float *, int, int) = NULL; - if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) + if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; memset(y, 0, len * 2 * sizeof(float)); #ifdef HAVE_NEON - if (step <= 4 && !(h_len % 4)) + if (!(h_len % 4)) conv_func = neon_conv_cmplx_4n; #endif if (conv_func) { @@ -139,7 +133,7 @@ _base_convolve_complex(x, x_len, h, h_len, y, y_len, - start, len, step, offset); + start, len); } return len; diff --git a/Transceiver52M/arch/common/convolve.h b/Transceiver52M/arch/common/convolve.h index 095b04c..e30f7ec 100644 --- a/Transceiver52M/arch/common/convolve.h +++ b/Transceiver52M/arch/common/convolve.h @@ -6,26 +6,22 @@ int convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int base_convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int base_convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); void convolve_init(void); diff --git a/Transceiver52M/arch/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c index 2eb7124..9bb8d3d 100644 --- a/Transceiver52M/arch/common/convolve_base.c +++ b/Transceiver52M/arch/common/convolve_base.c @@ -41,17 +41,17 @@ /* Base vector complex-complex multiply and accumulate */ static void mac_real_vec_n(const float *x, const float *h, float *y, - int len, int step, int offset) + int len) { - for (int i = offset; i < len; i += step) + for (int i=0; ibegin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (!h->isReal() && h->isAligned()) { rc = convolve_complex((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (h->isReal() && !h->isAligned()) { rc = base_convolve_real((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (!h->isReal() && !h->isAligned()) { rc = base_convolve_complex((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else { rc = -1; } @@ -1482,7 +1481,7 @@ /* Correlate */ if (!convolve(corr_in, sync->sequence, &corr, - CUSTOM, start, len, 1, 0)) { + CUSTOM, start, len)) { delete dec; return -1; } diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 54bc7a1..8ca4b72 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -62,21 +62,17 @@ int y_len; int start; int len; - int step; - int offset; x_len=34; y_len=26; start=8; len=26; - step=1; - offset=1; reset_testvec(0); dump_floats(x,x_len,"x"); printf("\n"); dump_floats(h,h_len,"h"); printf("\n"); - convolve_complex(x, x_len, h, h_len, y, y_len, start, len, step, offset); + convolve_complex(x, x_len, h, h_len, y, y_len, start, len); dump_floats(y,y_len,"y"); printf("\n"); } @@ -88,21 +84,17 @@ int y_len; int start; int len; - int step; - int offset; x_len=34; y_len=26; start=8; len=26; - step=1; - offset=1; reset_testvec(0); - dump_floats(x,x_len,"x"); + dump_floats(x-30,2*x_len+30,"x"); printf("\n"); - dump_floats(h,h_len,"h"); + dump_floats(h,2*h_len,"h"); printf("\n"); - convolve_real(x, x_len, h, h_len, y, y_len, start, len, step, offset); + convolve_real(x, x_len, h, h_len, y, y_len, start, len); dump_floats(y,y_len,"y"); printf("\n"); } -- To view, visit https://gerrit.osmocom.org/12415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Gerrit-Change-Number: 12415 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 10:12:47 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 10:12:47 +0000 Subject: Change in osmo-bsc[master]: LCLS: constify helper parameters In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12485 ) Change subject: LCLS: constify helper parameters ...................................................................... LCLS: constify helper parameters Related: OS#2487 Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/osmo_bsc_lcls.c 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h index 3eaa589..c8b0ebd 100644 --- a/include/osmocom/bsc/osmo_bsc_lcls.h +++ b/include/osmocom/bsc/osmo_bsc_lcls.h @@ -29,7 +29,7 @@ LCLS_EV_OTHER_DEAD, }; -enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn); +enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn); void lcls_update_config(struct gsm_subscriber_connection *conn, const uint8_t *config, const uint8_t *control); diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 2d5a077..e4459da 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -47,7 +47,7 @@ * Utility functions ***********************************************************************/ -enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn) +enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn) { if (!conn->lcls.fi) return GSM0808_LCLS_STS_NA; @@ -86,7 +86,7 @@ } static struct gsm_subscriber_connection * -find_conn_with_same_gcr(struct gsm_subscriber_connection *conn_local) +find_conn_with_same_gcr(const struct gsm_subscriber_connection *conn_local) { struct gsm_network *net = conn_local->network; struct gsm_subscriber_connection *conn_other; @@ -159,7 +159,7 @@ /* Update the connections LCLS configuration and return old/previous configuration. * \returns (staticallly allocated) old configuration; NULL if new config not supported */ static struct osmo_lcls *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, - struct osmo_lcls *new_cfg_csc) + const struct osmo_lcls *new_cfg_csc) { static struct osmo_lcls old_cfg_csc = { 0 }; old_cfg_csc.config = conn->lcls.config; @@ -303,7 +303,7 @@ } } -static bool lcls_enable_possible(struct gsm_subscriber_connection *conn) +static bool lcls_enable_possible(const struct gsm_subscriber_connection *conn) { struct gsm_subscriber_connection *other_conn = conn->lcls.other; OSMO_ASSERT(other_conn); -- To view, visit https://gerrit.osmocom.org/12485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I341f4ea172432b94e8e96919926a5fb6870c2a30 Gerrit-Change-Number: 12485 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 11:21:59 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 21 Jan 2019 11:21:59 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#31). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 49 files changed, 2,920 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/31 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 31 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 12:00:21 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 12:00:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E199-45df98-dirty_=E2=86=92_1=2E3=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12661 Change subject: Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 --- M configure.ac M debian/changelog 2 files changed, 240 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/12661/1 diff --git a/configure.ac b/configure.ac index a4979cf..17f4b90 100644 --- a/configure.ac +++ b/configure.ac @@ -35,16 +35,16 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index f14c792..76d4fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,233 @@ +osmo-msc (1.3.0) unstable; urgency=medium + + [ Philipp Maier ] + * vlr_access_req_fsm: use correct cause codes + * a_reset: cleanup + remove dead code + * mgcp: do not start connections in loopback mode + * mgcp: hack to keep IuUP working + * mgcp: use codec information returned with ASSIGNMENT COMPL. + * doc: update mgw settings in example config file + * mncc: fix byte ordering of IP-Address in mncc + * msc_mgcp: move mncc struct initalization to where its actually needed + * gsm_04_08_cc: Add global guard timer for MNCC + * cosmetic: remove forgotten debug printf + * vlr: drop unused is_ps parameter in vlr_subscr_req_lu() + * osmo_msc: remove unused parameter from msc_dtap() + * gsm_subscriber: make function msc_paging_request() static + * msc_vty: display subscriber flags + * msc_vty: display current RAN type + * msc_vty: also show IMEI and IMEISV + * gsm_04_08: Fix nullpointer deref + + [ Stefan Sperling ] + * remove redundant unconditional PKG_CHECK_MODULES for libsmpp + * implement periodic Location Update expiry in the VLR + * VLR: reject overlong IMSIs in ID RESP messages + * fix a use-after-free in msc_mgcp.c:_handle_error() + * detach cancelled subscribers from VLR + * make gsup ipa name configurable in osmo-msc.cfg + * provide software version information to gsup peer + * require 'ipa-name' option to be set via config file + * use vty->type instead of local variable + + [ Vadim Yanitskiy ] + * libmsc/ussd.c: FIX: properly indicate errors + * libmsc: properly name the MSC_CONN_USE token for SS + * libmsc/ussd.c: use connection ref-counting and transactions + * Use proper naming for GSM TS 09.11 implementation + * libmsc/gsm_04_08.c: expose gsm48_tx_simple() + * libmsc/gsm_09_11.c: properly indicate transaction errors + * libmsc/gsm_04_80.c: make the API abstract from ss_request struct + * .gitignore: ignore src/libgsupclient/gsup_test_client + * configure.ac: drop unused dependencies + * msc_vlr_tests: don't abuse USSD-request to conclude connections + * libvlr/vlr.c: forward unhandled GSUP messages towards MSC + * libmsc/gsm_09_11.c: forward SS/USSD messages to HLR over GSUP + * libmsc/gsm_09_11.c: implement network-initiated sessions + * libmsc/gsm_09_11.c: properly handle MS-initiated release + * libmsc/gsm_09_11.c: introduce rate counters for NC_SS sessions + * libmsc/gsm_09_11.c: introduce counter for active sessions + * msc/signal.h: use #pragma once include guard + * msc/rrlp.h: use #pragma once include guard + * libmsc/rrlp.c: add missing include + * libmsc/gsm_09_11.c: clean up the local GSM 04.80 API + * RRLP: properly name the init function + * RRLP: fix: actually init the RRLP signal handlers + * RRLP: migrate and share mode definitions from msc_vty.c + * RRLP: print log when sending a position request + * osmo-msc: free the VTY talloc context on exit + * osmo-msc: track the use of talloc NULL memory contexts + * libmsc/db.c: cosmetic: mark missing breaks in switch as intended + * msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() + * msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() + * msc_vlr_tests.c: drop duplicating DMM category definition + * libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} + * libmsc/gsm_04_11.c: refactor RP-DATA header validation + * libmsc/transaction.c: cosmetic: fix typo + * libmsc/gsm_09_11.c: drop redundant assertion of stored msgb + * libmsc/gsm_04_11.c: refactor MT SMS message handling + * libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS + * libmsc/VTY: introduce kill-switch for routing SMS over GSUP + * libmsc/gsm_04_11.c: forward MO SMS messages over GSUP + * libmsc/gsm_04_11.c: accept MT SMS messages over GSUP + + [ Pau Espin Pedrol ] + * msc_main: Fix typo in description of version param + * jenkins.sh: Use --enable-werror only when iu support is disabled + * osmo-msc: Improve shutdown due to signal and print talloc report on exit + * msc: Set talloc ctx for osmo_signal structures + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * msc: vty: Fix integer printf formatting + + [ Daniel Willmann ] + * git-version-gen: Don't check for .git directory + * OsmoBSC/HLR/MSC: Fix default config file name + + [ Harald Welte ] + * libmsc: move L3 call-control to separate C file (gsm_04_08_cc.c) + * migrate to oap_client in libosmogsm + * Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr + * gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() + * share chapters/gsup.adoc from OsmoSGSN to OsmoMSC + OsmoHLR + * vty-ref: Update URI of docbook 5.0 schema + * add SGs / CSFB related dot + msc files + + [ Neels Hofmeyr ] + * vlr_access_req_fsm.c: use osmo_strlcpy and avoid compiler error + * Iu MGCP: no need to loopback on the cn side + * cosmetic: typos in log and comment + * use __FILE__, not __BASE_FILE__ + * cosmetic: mute "COMPLETE_LAYER_3 not permitted" + * store classmark in vlr_subscr, not conn + * msc_vlr_tests: cosmetically tweak perm algo printing + * A5/n Ciph: request Classmark Update if missing + * fix Classmark Update without VLR subscriber + * vty: add SCCP related vty commands + * GSUP client: send CN domain IE on LU request + * lu_fsm: result cb: use proper cause type (warning/coverity) + * Importing history from osmo-gsm-manuals + * add OsmoMSC manual + * add OsmoHLR manual, OsmoHLR VTY reference + * refactor Makefile build rules, don't use the FORCE + * OsmoMSC: update VTY reference + * msc: update vty reference + * drop unused gsm_subscr_conn->mncc_rtp_bridge + * drop unused gsm_network->handover.active + * drop unused openbscdefines.h + * drop unused SUBSCR_CONN_E_INVALID + * drop unused gsm0408_allow_everyone() declaration + * drop unused tests/db/* + * cosmetic: subscr_conn_fsm_auth_ciph() should be static + * adjust copyright in subscr_conn.c + * populate gsm_subscriber_connection->encr during Ciph + * rename gsm_encr to geran_encr, it is only applicable on GERAN + * drop msc_compl_l3() return value + * rename gsm_subscriber_connection to ran_conn + * rename some RAN conn related stuff to ran_conn_* + * move subscr_conn.c to ran_conn.c + * move ran_conn declarations to new ran_conn.h + * combine several small .h in msc_common.h + * cosmetic: drop some unused opaque struct defs + * move gsm_auth_tuple to vlr.h as vlr_auth_tuple + * GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH + * drop cruft from gsm_subscriber.h + * move gsm_cbfn to gsm_subscriber.h, the only user + * python tests: use py shebang instead of $(PYTHON) + * make: prepare for adding transcript tests + * add test_nodes.vty transcript test + * cosmetic: msc_main.c: default args definition style + * msc_main: mncc: move mncc socket decision to after read_cfg + * vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' + * add VTY commands: mncc internal / external (== -M) + * ASS-COMPL: do not fire Sec Mode Compl event + * move ASS-COMPL MGCP handling out of a_iface_bssap.c + * drop gsm48 RR ciph mode compl from permitted initial messages + * LU: do not always invoke sub_pres_vlr_fsm_start() + * Revert "move ASS-COMPL MGCP handling out of a_iface_bssap.c" + * log: by default start with all categories on LOGL_NOTICE + * tweak comment to indicate sub_pres_vlr fsm as dead code + * vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI + * comment: vlr: put the 'balancing' comment closer to the put() + * vty: show subscriber: put() before printing the use count + * fix msc_mgcp_fsm_evt_names: two missing events + * mgcp log tweak: say RAN, not BTS, like surrounding logging + * fix test_nodes.vty after libosmo-mgcp-client vty changes + * cosmetics in msc_mgcp_call_release() + * release RTP stream only for matching CC transaction + * fix vlr ops.subscr_assoc re-association + * remove code dup: add msc_mgcp_try_call_assignment() + * move trans->assignment_done to cc.assignment_started + * fix: incoming call during ongoing call + * abort assignment on Assignment Failure + * vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates + * vty cfg: move 'ipa-name' from 'msc' to 'hlr' section + * use osmo_rat_type from libosmocore + * use mgcp-client configured endpoint domain name + * use osmo_lu_type_name() from libosmocore + * add LOG_RAN_CONN() to use the conn->fi->id for context + * rx CM Service Req: reject double use sooner + * refactor log ctx for vlr_subscr and ran_conn + * mm_rx_id_resp(): use osmo_mi_name() + * tweak fsm_msc_mgcp FSM and FI name + * err log: fully log MS supported A5 algos on mismatch + * msc_vlr_tests: tweak logging in verbose mode + + [ Keith ] + * libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() + * Make alert notifications vty configurable per ESME + * Cosmetic: Fix spelling in smpp vty + + [ Max ] + * Properly parse cause in cipher mode reject + * Add counters for BSSMAP cipher mode messages + * vty: add command to show all known BSC + * msc_vlr_tests: tweak conn_exists() + * Fix build with latest libosmocore + * Use BSSAP-specific TLV parser from libosmocore + * Use libosmocore to function to parse cipher mode reject cause + * cosmetic: drop duplicated #include + * cosmetic: drop unused variable + * CC: log more details about unhandled message/state + * VLR tests: add logging macro with explicit value description + * VLR tests: avoid leaking LAC access details + * Use proper type for tch_rtp_connect() parameter + * VLR: drop unused struct members + * Remove redundancy in LAC processing + * MNCC: use log wrapper for call processing + * Constify transaction helpers parameters + * Use explicit protocol discriminator for NC SS/USSD session + * Fix trans_has_conn() doxygen description + * Enable SMS-related log in VLR tests + * MNCC: use explicit struct type in gsm_call + * SMS: remove code duplication in transaction init + * vty: make 'sh connect/transact' readable again + + [ Keith Whyte ] + * libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. + + [ Alexander Couzens ] + * OsmoMSC: add rate counter documentation + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + * Cosmetic: msc_vty: remove redundant "0 =", "1 =" + * msc_vty.c: make check-imei-rqd configurable + * vlr_core.h: remove duplicate declarations + * VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg + * VLR: send CHECK-IMEI to EIR/HLR + + [ Ivan Kluchnikov ] + * libmsc/transaction: introduce trans_find_by_sm_rp_mr() + + [ gsmevent admin ] + * gsm_04_08_cc.c: drop non-sensible error message + + -- Harald Welte Mon, 21 Jan 2019 00:16:26 +0100 + osmo-msc (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 Gerrit-Change-Number: 12661 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 12:25:58 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 12:25:58 +0000 Subject: Change in libosmocore[master]: ipa_ccm_idtag_parse*: Fix reported length value In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10216 ) Change subject: ipa_ccm_idtag_parse*: Fix reported length value ...................................................................... Patch Set 3: -- To view, visit https://gerrit.osmocom.org/10216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435aaa33605bd48635715a2c81aa2d231c1abf51 Gerrit-Change-Number: 10216 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 21 Jan 2019 12:25:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:02:19 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:02:19 +0000 Subject: Change in libosmocore[master]: constrain gsm48_generate_mid() output array bounds In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12641 ) Change subject: constrain gsm48_generate_mid() output array bounds ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: tnt Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:02:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:02:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:02:56 +0000 Subject: Change in libosmocore[master]: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12642 ) Change subject: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 Gerrit-Change-Number: 12642 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 13:02:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:18:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:18:40 +0000 Subject: Change in osmo-msc[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11821 ) Change subject: Fix build with latest libosmocore ...................................................................... Patch Set 2: This is the wrong solution. Old programs *must* always build against new libosmocore. This "fix" has just postponed the problem: Now that we have a new libosmocore (1.0.0) tagged, but not yet osmo-msc, the "latest" feeds fail to build: https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/x86_64 -- To view, visit https://gerrit.osmocom.org/11821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 Gerrit-Change-Number: 11821 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 21 Jan 2019 13:18:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:21:31 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:21:31 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() to all lowercase Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12662 Change subject: Rename msgb_wrap_with_TL() to all lowercase ...................................................................... Rename msgb_wrap_with_TL() to all lowercase This resolves the build issue with old OsmoMSC version. Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e --- M include/osmocom/core/msgb.h M src/gsm/gsm0480.c 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/12662/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index b7c8422..7c208b8 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -368,7 +368,7 @@ osmo_store32be(word, space); } -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) +static inline unsigned char *msgb_wrap_with_tl(struct msgb *msgb, uint8_t tag) { uint8_t *data = msgb_push(msgb, 2); diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 01f245a..57c7c71 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -84,7 +84,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id); /* 1. component tag */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE); + msgb_wrap_with_tl(msg, GSM0480_CTYPE_INVOKE); return 0; } @@ -92,7 +92,7 @@ /* wrap the GSM 04.08 Facility IE around it */ int gsm0480_wrap_facility(struct msgb *msg) { - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_wrap_with_tl(msg, GSM0480_IE_FACILITY); return 0; } @@ -793,26 +793,26 @@ msgb_put(msg, response_len); /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); + msgb_wrap_with_tl(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ msgb_tlv1_push(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_wrap_with_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ msgb_tlv1_push(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_wrap_with_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + msgb_wrap_with_tl(msg, GSM0480_CTYPE_RETURN_RESULT); return msg; } @@ -832,7 +832,7 @@ return NULL; /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_wrap_with_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gsm48_push_l3hdr_tid(msg, GSM48_PDISC_NC_SS, @@ -863,7 +863,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR); + msgb_wrap_with_tl(msg, GSM0480_CTYPE_RETURN_ERROR); /* FIXME: Wrap in Facility + L3? */ return msg; @@ -896,7 +896,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msgb_wrap_with_tl(msg, GSM0480_CTYPE_REJECT); /* FIXME: Wrap in Facility + L3? */ return msg; -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:27:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:27:49 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 2: @laforge, might be a bit quick to vote +2: - there are remarks by Vadim, - the patch is obviously not trivial -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:27:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:29:18 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:29:18 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:29:34 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:29:34 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 2: I removed the +2 vote to prevent merging before I can read the patch -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:29:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:30:13 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:30:13 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() to all lowercase In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12662 to look at the new patch set (#2). Change subject: Rename msgb_wrap_with_TL() to all lowercase ...................................................................... Rename msgb_wrap_with_TL() to all lowercase This resolves the build issue with old OsmoMSC version. Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e --- M include/osmocom/core/msgb.h M src/gsm/gsm0480.c 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/12662/2 -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:32:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:32:17 +0000 Subject: Change in osmo-msc[master]: Sync with libosmocore function rename Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12663 Change subject: Sync with libosmocore function rename ...................................................................... Sync with libosmocore function rename Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 --- M src/libmsc/gsm_04_80.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/12663/1 diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index fb5a091..119f0e1 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -59,7 +59,7 @@ return -1; /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:35:04 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12664 Change subject: Sync with libosmocore function rename ...................................................................... Sync with libosmocore function rename Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/64/12664/1 diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index dc9ae23..1c08d99 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -67,29 +67,29 @@ msgb_put(msg, response_len); /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); + msgb_push_tl(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + msgb_push_tl(msg, GSM0480_CTYPE_RETURN_RESULT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); @@ -115,10 +115,10 @@ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msgb_push_tl(msg, GSM0480_CTYPE_REJECT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:43:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:43:36 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() to all lowercase In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12662 ) Change subject: Rename msgb_wrap_with_TL() to all lowercase ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 13:43:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:45:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 13:45:41 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() to all lowercase In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12662 ) Change subject: Rename msgb_wrap_with_TL() to all lowercase ...................................................................... Patch Set 2: Once this is merged I've got to re-trigger jenkins on related patches with the same topic. Ideally we should be able to merge them right after this. Please have a look as well. -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 13:45:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:47:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:47:14 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#3) to the change originally created by Max. ( https://gerrit.osmocom.org/12662 ) Change subject: Rename msgb_wrap_with_TL() ...................................................................... Rename msgb_wrap_with_TL() This resolves an issue introduced in 84fb5bb6a09a6a358f98c654c84c3b99a0f24eef when msgb_wrap_with_TL() was introduced as an inline function with *exactly the same name* as in osmo-msc.git and openbsc.git. We *NEVER* do something like this. Functions moved from applications to library *MUST* always be renamed. This has been the case for almost a decade now. With this subsequent change we make sure the libosmocore function has a different name and doesn't clash. After this commit, old openbsc.git and osmo-bsc.git should again build fine. Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e --- M include/osmocom/core/msgb.h M src/gsm/gsm0480.c 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/12662/3 -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:47:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:47:30 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12662 ) Change subject: Rename msgb_wrap_with_TL() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 13:47:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:47:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:47:46 +0000 Subject: Change in libosmocore[master]: Rename msgb_wrap_with_TL() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12662 ) Change subject: Rename msgb_wrap_with_TL() ...................................................................... Rename msgb_wrap_with_TL() This resolves an issue introduced in 84fb5bb6a09a6a358f98c654c84c3b99a0f24eef when msgb_wrap_with_TL() was introduced as an inline function with *exactly the same name* as in osmo-msc.git and openbsc.git. We *NEVER* do something like this. Functions moved from applications to library *MUST* always be renamed. This has been the case for almost a decade now. With this subsequent change we make sure the libosmocore function has a different name and doesn't clash. After this commit, old openbsc.git and osmo-bsc.git should again build fine. Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e --- M include/osmocom/core/msgb.h M src/gsm/gsm0480.c 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index b7c8422..f006b34 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -368,7 +368,7 @@ osmo_store32be(word, space); } -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) +static inline unsigned char *msgb_push_tl(struct msgb *msgb, uint8_t tag) { uint8_t *data = msgb_push(msgb, 2); diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 01f245a..b5c9844 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -84,7 +84,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id); /* 1. component tag */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE); + msgb_push_tl(msg, GSM0480_CTYPE_INVOKE); return 0; } @@ -92,7 +92,7 @@ /* wrap the GSM 04.08 Facility IE around it */ int gsm0480_wrap_facility(struct msgb *msg) { - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); return 0; } @@ -793,26 +793,26 @@ msgb_put(msg, response_len); /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); + msgb_push_tl(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ msgb_tlv1_push(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ msgb_tlv1_push(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + msgb_push_tl(msg, GSM0480_CTYPE_RETURN_RESULT); return msg; } @@ -832,7 +832,7 @@ return NULL; /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gsm48_push_l3hdr_tid(msg, GSM48_PDISC_NC_SS, @@ -863,7 +863,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR); + msgb_push_tl(msg, GSM0480_CTYPE_RETURN_ERROR); /* FIXME: Wrap in Facility + L3? */ return msg; @@ -896,7 +896,7 @@ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msgb_push_tl(msg, GSM0480_CTYPE_REJECT); /* FIXME: Wrap in Facility + L3? */ return msg; -- To view, visit https://gerrit.osmocom.org/12662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e Gerrit-Change-Number: 12662 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:50:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 13:50:55 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0_=E2=86=92_1=2E0=2E1?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12665 Change subject: Bump version: 1.0.0 ? 1.0.1 ...................................................................... Bump version: 1.0.0 ? 1.0.1 Change-Id: I51696a3ace219ab69c294b0e3637371c5460291f --- M debian/changelog M src/Makefile.am 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/12665/1 diff --git a/debian/changelog b/debian/changelog index c5de726..2cdab76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.0.1) unstable; urgency=medium + + [ Max ] + * Rename msgb_wrap_with_TL() + + -- Harald Welte Mon, 21 Jan 2019 14:50:42 +0100 + libosmocore (1.0.0) unstable; urgency=medium [ K?vin Redon ] diff --git a/src/Makefile.am b/src/Makefile.am index 6ca39ad..6840f79 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=12:0:0 +LIBVERSION=12:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51696a3ace219ab69c294b0e3637371c5460291f Gerrit-Change-Number: 12665 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:52:44 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:52:44 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 2: Code-Review-1 (2 comments) (let me first post this and follow up with review on the remaining patch later) https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/gsm_data.h at 121 PS2, Line 121: struct channel_mode_and_rate ch_mode_rate_alt; Are there really only two possible mode,rate combinations? https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/abis_rsl.c at 1391 PS2, Line 1391: if (!lchan) { These changes above make up a separate fix by themselves. I personally understand this change because I explained the mistake I made here to you, but the reason definitely should appear in the commit log. Let's put this in a separate patch and explain like this: Fix TCH-as-SDCCH allocation on Channel Request On rsl_rx_chan_rqd(), so far osmo-bsc tried to preferably assign the lchan type that was asked for in the RACH. Firstly, this contained a bug, and secondly, it does not make sense to heed that preference, since we do late assignment. Ignore the preference for the MS' TCH kind. We do late assignment to avoid codec mismatches. In the "old days", we would heed the MS' TCH channel kind, even if the MSC or BSC didn't actually allow or prefer that channel kind. Hence, in the presence of both TCH/F and TCH/H, the MS could ask for TCH/F (which we would grant on the MO side) and the BSC or MSC could prefer TCH/H (which we would apply on the MT side), and hence fabricate a codec mismatch. Instead, since quite some time now, we *always* assign an SDCCH first, and only later on do another Assignment to hand out a proper voice lchan that heeds the MS capability bits as well as MSC's and BSC's preferences. By completely ignoring the channel kind the MS asked for in the RACH, we also eliminate this bug in rsl_rx_chan_rqd(): - If the first "lchan_select_by_type(GSM_LCHAN_SDDCH)" fails (all SDDCH in use), we should try to fall back to any TCH instead, to serve as SDCCH. - the first "if (!lchan && lctype != GSM_LCHAN_SDCCH)" was an attempt to prefer a fallback to the lchan type the MS requested. - the remaining two "if (!lchan && lctype == GSM_LCHAN_SDCCH)" were obviously only applied if the MS asked for an SDCCH, and skipped if the type was TCH/*. - hence, missing was: if the MS asked for a TCH, to also try the *other* TCH kind that the MS did not ask for. (Example: all SDCCH in use, MS asks for TCH/F, but BSC has only TCH/H lchans; we should assign TCH/H as SDCCH, instead we said "no resources") -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:52:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 13:54:19 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 13:54:19 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1164?= Message-ID: <1888356565.672.1548078859026.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 92.34 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:56:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:56:14 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 140 PS1, Line 140: EFR works over FR channels only */ > This comment looks confusing. Let's rather say: [?] agree https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 142 PS1, Line 142: return NULL; /* fall through */ https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 143 PS1, Line 143: /* fall through */ > Please add some "fall-through" comment here to suppress Coverity / compiler warnings. ack. it's fine to omit a comment below GSM48_CMODE_SPEECH_V1, but above it you need to add a "/* fall through */" comment. -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:56:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:57:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:57:31 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:58:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:58:52 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: I removed the +2 vote to prevent accidental "submit including parents". Gladly re-add the +2 vote when the wording and missing fall-through comment are fixed -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:58:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 13:59:26 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 13:59:26 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Do not unsolicitedly select a TCH/F In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12623 ) Change subject: lchan_select: Do not unsolicitedly select a TCH/F ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Gerrit-Change-Number: 12623 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 13:59:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:00:00 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Jan 2019 14:00:00 +0000 Subject: Change in docker-playground[master]: regen_docs: Add a script that extracts counter and vty info In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/10273 ) Change subject: regen_docs: Add a script that extracts counter and vty info ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4e57a64caccfbc982199f8f25bbb14c2d96e11a6 Gerrit-Change-Number: 10273 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 14:02:17 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:02:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8211?= Message-ID: <1455731504.673.1548079337452.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 780.78 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 14:03:36 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:03:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8211?= Message-ID: <1028313887.674.1548079416973.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 14:04:23 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:04:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8212?= In-Reply-To: <1455731504.673.1548079337452.JavaMail.jenkins@jenkins.osmocom.org> References: <1455731504.673.1548079337452.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <749007724.675.1548079463326.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 781.45 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 14:05:52 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:05:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3682?= Message-ID: <950602345.676.1548079552431.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 757.74 KB...] config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC oap_client.o CC common_vty.o CC gsm_data.o CC gsup_client.o CC debug.o CC gsm_data_shared.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_vty.o CC mgcp_osmux.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000.o CC acc_ramp.o CC abis_om2000_vty.o CC abis_rsl.o CC bsc_subscriber.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC handover_decision.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_11.o CC gsm_04_80.o CC mncc.o CC gsm_subscriber.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... CC mncc_builtin.o make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' Makefile:514: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 14:06:22 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:06:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8212?= In-Reply-To: <1028313887.674.1548079416973.JavaMail.jenkins@jenkins.osmocom.org> References: <1028313887.674.1548079416973.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1388238553.677.1548079582157.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] =============================== osmo-msc =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC gsm_04_08.o CC gsm_04_08_cc.o CC msc_vty.o CC db.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... CC gsm_09_11.o make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 14:06:23 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:06:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3682?= Message-ID: <1434229289.678.1548079583064.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 758.03 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC socket.o CC oap_client.o CC gsup_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_vty.o CC mgcp_network.o CC mgcp_protocol.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_transcode.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC bsc_rll.o CC abis_rsl.o CC acc_ramp.o CC bsc_subscriber.o CC abis_om2000_vty.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC mncc.o CC gsm_subscriber.o CC gsm_04_80.o CC gsm_04_14.o CC gsm_04_11.o CC gsm_04_08.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o CC mncc_sock.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:07:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 14:07:31 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 14:07:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:07:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 14:07:40 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: Sync with libosmocore function rename ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:09:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 14:09:57 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12567 to look at the new patch set (#3). Change subject: common: extend glossary.adoc ...................................................................... common: extend glossary.adoc Add EIR, IMEISV, LU, SS, TS, USSD, and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/3 -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:10:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 14:10:06 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: Code-Review-2 this change is completely bogus as the file gsm_04_80 is defining its own msgb_wrap_with_TL() function. -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 21 Jan 2019 14:10:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 21 14:10:39 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 14:10:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c45d2f6c34c7_2c16f5067c312075@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 258s] configure:10923: 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 [ 258s] configure:10923: $? = 0 [ 258s] configure:10923: result: yes [ 258s] configure:10923: checking for inttypes.h [ 258s] configure:10923: 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 [ 258s] configure:10923: $? = 0 [ 258s] configure:10923: result: yes [ 258s] configure:10923: checking for stdint.h [ 258s] configure:10923: 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 [ 258s] configure:10923: $? = 0 [ 258s] configure:10923: result: yes [ 258s] configure:10923: checking for unistd.h [ 258s] configure:10923: 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 [ 258s] configure:10923: $? = 0 [ 258s] configure:10923: result: yes [ 258s] configure:10937: checking for dlfcn.h [ 258s] configure:10937: 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 [ 258s] configure:10937: $? = 0 [ 258s] configure:10937: result: yes [ 258s] configure:11141: checking for objdir [ 258s] configure:11156: result: .libs [ 258s] configure:11420: checking if gcc supports -fno-rtti -fno-exceptions [ 258s] configure:11438: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fno-rtti -fno-exceptions conftest.c >&5 [ 260s] cc1: warning: command line option '-fno-rtti[ 232.995609] sysrq: SysRq : Power Off [ 260s] [ 233.000058] reboot: Power down [ 260s] ### VM INTERACTION END ### [ 260s] [ 260s] obs-arm-1 failed "build osmo-trx_1.0.0.dsc" at Mon Jan 21 14:10:25 UTC 2019. [ 260s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:12:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 14:12:06 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc at 298 PS2, Line 298: Supplementary Services; textual dialog between subscriber and core : network, e.g. '*#100#' -> 'Your extension is 1234' > actually, your example is USSD, which is only one part of non-call-related SS, which again are only [?] Updated the description of SS and added USSD. -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 21 Jan 2019 14:12:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 14:12:47 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:12:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8213?= In-Reply-To: <749007724.675.1548079463326.JavaMail.jenkins@jenkins.osmocom.org> References: <749007724.675.1548079463326.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <654210655.679.1548079967409.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 810.37 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] # is like basename from coreutils, and . is WD. + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:14:01 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 14:14:01 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-2 > > this change is completely bogus as the file gsm_04_80 is defining its own msgb_wrap_with_TL() function. Erm, where? -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 21 Jan 2019 14:14:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 14:14:03 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 14:14:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8213?= In-Reply-To: <1388238553.677.1548079582157.JavaMail.jenkins@jenkins.osmocom.org> References: <1388238553.677.1548079582157.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1873415056.680.1548080043642.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC gsm_04_11.o CC gsm_04_08.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:15:21 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 14:15:21 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 2: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/12624/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12624/2/include/osmocom/bsc/gsm_data.h at 619 PS2, Line 619: bool disabled; In general I dislike double-negation booleans, enabled = false is much more straightforward. Vadim has a point, I would prefer to not add a separate flag and instead put an lchan in LCHAN_ST_BORKEN state. It will then remain unusable until manual intervention. This could also make more sense on the VTY API: a command like "lchan set broken" is obviously a feature no operator would misunderstand as something useful besides a broken BTS, and maybe in that case laforge would agree to keep it in the vty reference manual? https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1447 PS2, Line 1447: bool all) why do you add this 'all' flag? https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1570 PS2, Line 1570: "Short summary (in use lchans)\n" "used lchans" This is unrelated to a debugging flag https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1578 PS2, Line 1578: "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", why pass TS and subslot arguments to "show lchan all"? I thought it shows them all? So far the semantics are that 'show lchan summary 1 2' shows BTS 1 TS 2, and 'show lchan summary' shows all. So I oppose adding this command. What is the goal -- do you want to achieve printing out all disabled lchans? then use that flag to trigger printing? Maybe we can also talk about this in person to figure out how to best achieve what you need. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 83 PS2, Line 83: if (lchan->fi->state == LCHAN_ST_UNUSED && lchan->disabled == false) > At this point I've got an idea: what if we introduce a special FSM state for that? For example, LCHA [?] you can re-use LCHAN_ST_BORKEN -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 14:15:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:19:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 14:19:15 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 14:19:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:20:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 14:20:33 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 14:20:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:24:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 14:24:42 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: -Code-Review ah, *sigh*. It was also removed in a commit in november :/ e8cd09dd6f3378a8137afb581dcd7ed554daa24c -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 21 Jan 2019 14:24:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 21 14:31:32 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 14:31:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c45d7df2a56b_2c16f5067c318214@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/armv7l Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 257s] configure:19033: result: no [ 257s] configure:19054: checking for LIBOSMOCORE [ 257s] configure:19061: $PKG_CONFIG --exists --print-errors "libosmocore >= 0.11.0" [ 257s] configure:19064: $? = 0 [ 257s] configure:19078: $PKG_CONFIG --exists --print-errors "libosmocore >= 0.11.0" [ 257s] configure:19081: $? = 0 [ 257s] configure:19139: result: yes [ 257s] configure:19145: checking for LIBOSMOVTY [ 257s] configure:19152: $PKG_CONFIG --exists --print-errors "libosmovty >= 0.11.0" [ 257s] configure:19155: $? = 0 [ 257s] configure:19169: $PKG_CONFIG --exists --print-errors "libosmovty >= 0.11.0" [ 257s] configure:19172: $? = 0 [ 257s] configure:19230: result: yes [ 257s] configure:19236: checking for LIBOSMOCTRL [ 257s] configure:19243: $PKG_CONFIG --exists --print-errors "libosmoctrl >= 0.11.0" [ 257s] configure:19246: $? = 0 [ 257s] configure:19260: $PKG_CONFIG --exists --print-errors "libosmoctrl >= 0.11.0" [ 257s] configure:19263: $? = 0 [ 257s] configure:19321: result: yes [ 257s] configure:19426: checking boost/config.hpp usability [ 257s] configure:19426: g++ -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.cpp >&5 [ 257s] configure:19426: $? = 0 [ 257s] configure:19426: result: yes [ 259s] configure:19426: ch[ 219.306002] sysrq: SysRq : Power Off [ 259s] [ 219.307704] reboot: Power down [ 259s] ### VM INTERACTION END ### [ 259s] [ 259s] armbuild14 failed "build osmo-trx_1.0.0.dsc" at Mon Jan 21 14:31:24 UTC 2019. [ 259s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:32:17 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 14:32:17 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 8: Code-Review-1 (5 comments) generally I wonder whether we should just always drop that luhn check digit and only handle 14 digit IMEIs. Would that simplify anything? https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 136 PS8, Line 136: char imei_buf[15]; use the constant, what was that, GSM23003_IMEI_MAX_LEN? add + 1 for the '\0'? https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 149 PS8, Line 149: osmo_strlcpy(imei_buf, id, 15); the 15 refers to the sizeof() the target buffer; IMHO this should either be sizeof() or some OSMO_MIN() that includes sizeof(), just in case we modify above buffer size and forget about this? It's a bit ugly to truncate using osmo_strlcpy(). I think I also used that once, but the reader isn't necessarily aware of the -1 behavior. If you want to keep this and avoid strncpy(), then explain in a comment what is happening. https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 151 PS8, Line 151: } what if the digit is present and invalid? https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 537 PS8, Line 537: char imei_buf[15]; same; clarify the size and +1 for nul... https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 544 PS8, Line 544: osmo_strlcpy(imei_buf, imei, 15); same as above -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 14:32:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 21 14:32:23 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 14:32:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c45d8016e9f5_2c16f5067c31851c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 133s] | [ 133s] | ac_cv_build=aarch64-unknown-linux-gnu [ 133s] | ac_cv_c_compiler_gnu=yes [ 133s] | ac_cv_env_CC_set= [ 133s] | ac_cv_env_CC_value= [ 133s] | ac_cv_env_CFLAGS_set=set [ 133s] | ac_cv_env_CFLAGS_value='-g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security' [ 133s] | ac_cv_env_CPPFLAGS_set=set [ 133s] | ac_cv_env_CPPFLAGS_value='-Wdate-time -D_FORTIFY_SOURCE=2' [ 133s] | ac_cv_env_CPP_set= [ 133s] | ac_cv_env_CPP_value= [ 133s] | ac_cv_env_LDFLAGS_set=set [ 133s] | ac_cv_env_LDFLAGS_value=-Wl,-z,relro [ 133s] | ac_cv_env_LIBASN1C_CFLAGS_set= [ 133s] | ac_cv_env_LIBASN1C_CFLAGS_value= [ 133s] | ac_cv_env_LIBASN1C_LIBS_set= [ 133s] | ac_cv_env_LIBASN1C_LIBS_value= [ 133s] | ac_cv_env_LIBCARES_CFLAGS_set= [ 133s] | ac_cv_env_LIBCARES_CFLAGS_value= [ 133s] | ac_cv_env_LIBCARES_LIBS_set= [ 133s] | ac_cv_env_LIBCARES_LIBS_value= [ 133s] | ac_cv_env_LIBGTP_CFLAGS_set= [ 133s] | ac_cv_env_LIBGTP_CFLAGS_value= [ 135s] | ac_cv_env_[ 117.696647] sysrq: SysRq : Power Off [ 135s] [ 117.698668] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] obs-arm-7 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 14:32:09 UTC 2019. [ 135s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 21 14:35:19 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 14:35:19 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc at 298 PS2, Line 298: Supplementary Services; query and set various service parameters between : subscriber and core network (e.g. USSD, 3rd-party > Updated the description of SS and added USSD. oh, out of my depth, not really aware of SS vs USSD -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 21 Jan 2019 14:35:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:03:40 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:03:40 +0000 Subject: Change in osmo-msc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:03:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:04:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:04:32 +0000 Subject: Change in osmo-msc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: (Consider mentioning the libosmocore Change-Id If1e851ac605c8d2fde3da565b0bd674ea6350c2e in the commit message) -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:04:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:05:54 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:05:54 +0000 Subject: Change in openbsc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: Code-Review+1 (Consider mentioning the libosmocore Change-Id If1e851ac605c8d2fde3da565b0bd674ea6350c2e in the commit message) -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:05:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 21 15:07:15 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:07:15 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c45e03284b39_2c16f5067c333523@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 90s] 06 [ 90s] [ 90s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 90s] - [ 90s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 90s] 07 [ 90s] [ 90s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 90s] + [ 90s] result (UNBLOCK) = 1 [ 90s] [ 90s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 90s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 90s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 90s] make[1]: *** [override_dh_auto_test] Error 1 [ 90s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 90s] debian/rules:45: recipe for target 'build' failed [ 90s] make: *** [build] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 90s] [ 90s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:07:03 UTC 2019. [ 90s] [ 90s] ### VM INTERACTION START ### [ 91s] Powering off. [ 91s] [ 83.184822] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:07:04 UTC 2019. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:08:23 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:08:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c45e06eb1c19_2c16f5067c33469a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 232s] | configure:7578: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c [ 232s] | configure:7578: $? = 0 [ 232s] | configure:7592: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c [ 232s] | conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory [ 232s] | #include [ 232s] | ^ [ 232s] | compilation terminated. [ 232s] | configure:7592: $? = 1 [ 232s] | configure: failed program was: [ 232s] | | /* confdefs.h */ [ 232s] | | #define PACKAGE_NAME "osmo-sgsn" [ 232s] | | #define PACKAGE_TARNAME "osmo-sgsn" [ 232s] | | #define PACKAGE_VERSION "UNKNOWN" [ 232s] | | #define PACKAGE_STRING "osmo-sgsn UNKNOWN" [ 232s] | | #define PACKAGE_BUGREPORT "osmocom-net-gprs at lists.osmocom.org" [ 232s] | | #define PACKAGE_URL "" [ 232s] | | #define PACKAGE "osmo-sgsn" [ 232s] | | #define VERSION "UNKNOWN" [ 232s] | | /* end confdefs.h. */ [ 232s] | | #include [ 232s] | configure:7621: checking for ANSI C header files [ 232s] | configure:7641: 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 [ 232s] | configure:7641: $? = 0 [ 234s] | configure:7714: gcc -o conftest -g -O2 -fdeb[ 200.899697] sysrq: SysRq : Power Off [ 234s] [ 200.901526] reboot: Power down [ 234s] ### VM INTERACTION END ### [ 234s] [ 234s] armbuild14 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:08:08 UTC 2019. [ 234s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:09:49 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:09:49 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c45e0c8d2305_2c16f5067c335695@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 96s] | #define HAVE_STRING_H 1 [ 96s] | #define HAVE_MEMORY_H 1 [ 96s] | #define HAVE_STRINGS_H 1 [ 96s] | #define HAVE_INTTYPES_H 1 [ 96s] | #define HAVE_STDINT_H 1 [ 96s] | #define HAVE_UNISTD_H 1 [ 96s] | #define HAVE_DLFCN_H 1 [ 96s] | #define LT_OBJDIR ".libs/" [ 96s] | #define STDC_HEADERS 1 [ 96s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 96s] | [ 96s] | configure: exit 0 [ 96s] [ 96s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 96s] make[1]: *** [override_dh_auto_test] Error 1 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] debian/rules:45: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] lamb69 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:09:41 UTC 2019. [ 96s] [ 96s] ### VM INTERACTION START ### [ 97s] Powering off. [ 97s] [ 87.082189] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] lamb69 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:09:42 UTC 2019. [ 97s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:12:58 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:12:58 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c45e17ef3b9a_2c16f5067c33736e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 106s] 06 [ 106s] [ 106s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 106s] - [ 106s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 106s] 07 [ 106s] [ 106s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 106s] + [ 106s] result (UNBLOCK) = 1 [ 106s] [ 106s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 106s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 106s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 106s] make[1]: *** [override_dh_auto_test] Error 1 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 106s] debian/rules:45: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] lamb20 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:12:45 UTC 2019. [ 106s] [ 106s] ### VM INTERACTION START ### [ 109s] [ 98.572342] sysrq: SysRq : Power Off [ 109s] [ 98.583761] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] lamb20 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:12:50 UTC 2019. [ 110s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:13:15 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:13:15 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c45e19a81e70_2c16f5067c3377c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 127s] 06 [ 127s] [ 127s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 127s] - [ 127s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 127s] 07 [ 127s] [ 127s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 127s] + [ 127s] result (UNBLOCK) = 1 [ 127s] [ 127s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 127s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 127s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 127s] make[1]: *** [override_dh_auto_test] Error 1 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 127s] debian/rules:45: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] lamb10 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:13:04 UTC 2019. [ 127s] [ 127s] ### VM INTERACTION START ### [ 130s] [ 117.254443] sysrq: SysRq : Power Off [ 130s] [ 117.266227] reboot: Power down [ 130s] ### VM INTERACTION END ### [ 130s] [ 130s] lamb10 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:13:09 UTC 2019. [ 130s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:14:06 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:14:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c45e1d4d5f5b_2c16f5067c33818@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 89s] | #define HAVE_STRING_H 1 [ 89s] | #define HAVE_MEMORY_H 1 [ 89s] | #define HAVE_STRINGS_H 1 [ 89s] | #define HAVE_INTTYPES_H 1 [ 89s] | #define HAVE_STDINT_H 1 [ 89s] | #define HAVE_UNISTD_H 1 [ 89s] | #define HAVE_DLFCN_H 1 [ 89s] | #define LT_OBJDIR ".libs/" [ 89s] | #define STDC_HEADERS 1 [ 89s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 89s] | [ 89s] | configure: exit 0 [ 89s] [ 89s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 89s] make[1]: *** [override_dh_auto_test] Error 1 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] debian/rules:45: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] sheep81 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:13:59 UTC 2019. [ 89s] [ 89s] ### VM INTERACTION START ### [ 93s] [ 85.744333] sysrq: SysRq : Power Off [ 93s] [ 85.751695] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] sheep81 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:14:03 UTC 2019. [ 93s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:16:40 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:16:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c45e26ed45b7_2c16f5067c33978f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 116s] | #define HAVE_STRING_H 1 [ 116s] | #define HAVE_MEMORY_H 1 [ 116s] | #define HAVE_STRINGS_H 1 [ 116s] | #define HAVE_INTTYPES_H 1 [ 116s] | #define HAVE_STDINT_H 1 [ 116s] | #define HAVE_UNISTD_H 1 [ 116s] | #define HAVE_DLFCN_H 1 [ 116s] | #define LT_OBJDIR ".libs/" [ 116s] | #define STDC_HEADERS 1 [ 116s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 116s] | [ 116s] | configure: exit 0 [ 116s] [ 116s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 116s] make[1]: *** [override_dh_auto_test] Error 1 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] debian/rules:45: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 116s] [ 116s] build77 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:16:27 UTC 2019. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 107.813103] sysrq: SysRq : Power Off [ 119s] [ 107.818476] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] build77 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:16:30 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:18:23 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:18:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c45e2c848250_2c16f5067c340715@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 112s] | #define HAVE_STRING_H 1 [ 112s] | #define HAVE_MEMORY_H 1 [ 112s] | #define HAVE_STRINGS_H 1 [ 112s] | #define HAVE_INTTYPES_H 1 [ 112s] | #define HAVE_STDINT_H 1 [ 112s] | #define HAVE_UNISTD_H 1 [ 112s] | #define HAVE_DLFCN_H 1 [ 112s] | #define LT_OBJDIR ".libs/" [ 112s] | #define STDC_HEADERS 1 [ 112s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 112s] | [ 112s] | configure: exit 0 [ 112s] [ 112s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 112s] make[1]: *** [override_dh_auto_test] Error 1 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] debian/rules:45: recipe for target 'build' failed [ 112s] make: *** [build] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 112s] [ 112s] lamb51 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:18:12 UTC 2019. [ 112s] [ 112s] ### VM INTERACTION START ### [ 115s] [ 100.194112] sysrq: SysRq : Power Off [ 115s] [ 100.198151] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] lamb51 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:18:17 UTC 2019. [ 115s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:22:40 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:22:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c45e3d299561_2c16f5067c343174@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 110s] | #define HAVE_STRING_H 1 [ 110s] | #define HAVE_MEMORY_H 1 [ 110s] | #define HAVE_STRINGS_H 1 [ 110s] | #define HAVE_INTTYPES_H 1 [ 110s] | #define HAVE_STDINT_H 1 [ 110s] | #define HAVE_UNISTD_H 1 [ 110s] | #define HAVE_DLFCN_H 1 [ 110s] | #define LT_OBJDIR ".libs/" [ 110s] | #define STDC_HEADERS 1 [ 110s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 110s] | [ 110s] | configure: exit 0 [ 110s] [ 110s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 110s] make[1]: *** [override_dh_auto_test] Error 1 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] debian/rules:45: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] lamb11 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:22:22 UTC 2019. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 102.306433] sysrq: SysRq : Power Off [ 113s] [ 102.313767] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] lamb11 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:22:26 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:24:40 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:24:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c45e4504639a_2c16f5067c344662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 105s] 06 [ 105s] [ 105s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 105s] - [ 105s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 105s] 07 [ 105s] [ 105s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 105s] + [ 105s] result (UNBLOCK) = 1 [ 105s] [ 105s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 105s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 105s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 105s] make[1]: *** [override_dh_auto_test] Error 1 [ 105s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 105s] debian/rules:45: recipe for target 'build' failed [ 105s] make: *** [build] Error 2 [ 105s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 105s] [ 105s] lamb11 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:24:20 UTC 2019. [ 105s] [ 105s] ### VM INTERACTION START ### [ 108s] [ 98.453070] sysrq: SysRq : Power Off [ 108s] [ 98.459217] reboot: Power down [ 108s] ### VM INTERACTION END ### [ 108s] [ 108s] lamb11 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:24:23 UTC 2019. [ 108s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:24:40 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:24:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c45e44fd9bc6_2c16f5067c3445b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 116s] | #define HAVE_STRING_H 1 [ 116s] | #define HAVE_MEMORY_H 1 [ 116s] | #define HAVE_STRINGS_H 1 [ 116s] | #define HAVE_INTTYPES_H 1 [ 116s] | #define HAVE_STDINT_H 1 [ 116s] | #define HAVE_UNISTD_H 1 [ 116s] | #define HAVE_DLFCN_H 1 [ 116s] | #define LT_OBJDIR ".libs/" [ 116s] | #define STDC_HEADERS 1 [ 116s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 116s] | [ 116s] | configure: exit 0 [ 116s] [ 116s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 116s] make[1]: *** [override_dh_auto_test] Error 1 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] debian/rules:45: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 116s] [ 116s] lamb05 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:24:31 UTC 2019. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 108.812160] sysrq: SysRq : Power Off [ 119s] [ 108.817513] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb05 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:24:34 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:26:22 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:26:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c45e4a89d7af_2c16f5067c3464f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 81s] | #define HAVE_STRING_H 1 [ 81s] | #define HAVE_MEMORY_H 1 [ 81s] | #define HAVE_STRINGS_H 1 [ 81s] | #define HAVE_INTTYPES_H 1 [ 81s] | #define HAVE_STDINT_H 1 [ 81s] | #define HAVE_UNISTD_H 1 [ 81s] | #define HAVE_DLFCN_H 1 [ 81s] | #define LT_OBJDIR ".libs/" [ 81s] | #define STDC_HEADERS 1 [ 81s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 81s] | [ 81s] | configure: exit 0 [ 81s] [ 81s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 81s] make[1]: *** [override_dh_auto_test] Error 1 [ 81s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 81s] debian/rules:45: recipe for target 'build' failed [ 81s] make: *** [build] Error 2 [ 81s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 81s] [ 81s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:26:08 UTC 2019. [ 81s] [ 81s] ### VM INTERACTION START ### [ 84s] [ 77.592938] sysrq: SysRq : Power Off [ 84s] [ 77.596887] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:26:12 UTC 2019. [ 84s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 15:32:22 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 15:32:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c45e60f2ba5c_2c16f5067c349925@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 130s] | #define HAVE_STRING_H 1 [ 130s] | #define HAVE_MEMORY_H 1 [ 130s] | #define HAVE_STRINGS_H 1 [ 130s] | #define HAVE_INTTYPES_H 1 [ 130s] | #define HAVE_STDINT_H 1 [ 130s] | #define HAVE_UNISTD_H 1 [ 130s] | #define HAVE_DLFCN_H 1 [ 130s] | #define LT_OBJDIR ".libs/" [ 130s] | #define STDC_HEADERS 1 [ 130s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 130s] | [ 130s] | configure: exit 0 [ 130s] [ 130s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 130s] make[1]: *** [override_dh_auto_test] Error 1 [ 130s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 130s] debian/rules:45: recipe for target 'build' failed [ 130s] make: *** [build] Error 2 [ 130s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 130s] [ 130s] lamb20 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:32:06 UTC 2019. [ 130s] [ 130s] ### VM INTERACTION START ### [ 134s] [ 122.505389] sysrq: SysRq : Power Off [ 134s] [ 122.509602] reboot: Power down [ 134s] ### VM INTERACTION END ### [ 134s] [ 134s] lamb20 failed "build osmo-sgsn_1.3.0.dsc" at Mon Jan 21 15:32:11 UTC 2019. [ 134s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:36:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 15:36:15 +0000 Subject: Change in libosmocore[master]: LCLS: add string dump helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12492 ) Change subject: LCLS: add string dump helpers ...................................................................... Patch Set 10: (4 comments) Hopefully latest revision clarifies the rest. Don't hesitate to get in touch if that's not the case. https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 614 PS7, Line 614: * \param[in] lcls pointer to the struct to print, used as talloc context to hang the result off. > I've done this type of thing before, and most of the time it turns out to be impractical. Sorry to hear that but I don't see how it's related to this case. > I'd suggest returning a static string buffer that doesn't need freeing. I don't see any practical advantages in that: most of the time talloc will clean it up alongside with lcls automatically. > but you avoid leaking strings Where? I don't see any leaks. Could you be more specific? > and you can guarantee a non-NULL return arg Why would we want such a guarantee? > Hence can directly include in printf() args. I haven't found any docs explicitly allowing or forbidding printf("%s", NULL); in practice it will just print '(null)'. Are you sure we're not supposed to pass NULL pointer to printf()? https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 618 PS7, Line 618: char *s = NULL; > Seeing this for the first time. [?] Embedded arch won't have talloc available. It's also not expected to deal with LCLS to begin with. https://gerrit.osmocom.org/#/c/12492/7/src/gsm/gsm0808_utils.c at 624 PS7, Line 624: #if (!EMBEDDED) > In this current form, this is leaking the talloc string from osmo_gcr_dump(). > Of course will be cleaned up as soon as the struct osmo_lcls is deallocated That seems to be self-contradictory: if smth is leaked it means that it'll never be deallocated. If it's deallocated than it's not leaked. https://gerrit.osmocom.org/#/c/12492/7/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12492/7/tests/gsm0808/gsm0808_test.c at 746 PS7, Line 746: printf("\t%s\n", osmo_gcr_dump(lcls_out)); > Some of our unit tests fail from the address sanitizer noticing non-deallocated buffers. Which ones? I thought we have sanitizer enabled by default so it'd cause jenkins failure. -- To view, visit https://gerrit.osmocom.org/12492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3609224c8f3282d667e75f68bc20327e36eb9e6 Gerrit-Change-Number: 12492 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 21 Jan 2019 15:36:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:38:52 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:38:52 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12666 Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS ...................................................................... gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/12666/1 diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index ee697ff..65ac328 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,6 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) +/* IMEI without Luhn checksum */ +#define GSM23003_IMEI_NUM_NO_CHK_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ + GSM23003_IMEI_SNR_NUM_DIGITS) /* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ #define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:40:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:40:18 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS ...................................................................... Patch Set 1: This will be used to make the magic numbers go away here: https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/8/src/hlr_vty_subscr.c -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 15:40:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:43:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:43:45 +0000 Subject: Change in libosmocore[master]: ipa_ccm_idtag_parse*: Fix reported length value In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10216 ) Change subject: ipa_ccm_idtag_parse*: Fix reported length value ...................................................................... Patch Set 3: Code-Review+1 Looks good. @Max: there's an unanswered question from Neels. -- To view, visit https://gerrit.osmocom.org/10216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435aaa33605bd48635715a2c81aa2d231c1abf51 Gerrit-Change-Number: 10216 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:43:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:46:12 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 15:46:12 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:46:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:47:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:47:24 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 136 PS8, Line 136: char imei_buf[15]; > use the constant, what was that, GSM23003_IMEI_MAX_LEN? add + 1 for the '\0'? There is GSM23003_IMEISV_NUM_DIGITS = 15. What we need is something like GSM23003_IMEI_NUM_NO_CHK_DIGITS = 14, added it here: https://gerrit.osmocom.org/#/c/libosmocore/+/12666/ (please review) ...then I can write imei_buf[GSM23003_IMEI_NUM_NO_CHK_DIGITS + 1] and it is obvious what it means. https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 149 PS8, Line 149: osmo_strlcpy(imei_buf, id, 15); > the 15 refers to the sizeof() the target buffer; IMHO this should either be sizeof() or some OSMO_MI [?] Well, I had used strncpy before: https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/6/src/hlr_vty_subscr.c at 150 I'll go with osmo_strlcpy and a more explicit comment. https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c at 151 PS8, Line 151: } > what if the digit is present and invalid? It tries to query the IMEI with db_subscr_get_by_imei(), which will tell the user that it is invalid: OsmoHLR# subscriber imei 35761300444848 show ID: 1 IMSI: 123456789023000 MSISDN: none IMEI: 357613004448485 OsmoHLR# subscriber imei 357613004448484 show % No subscriber for imei = '357613004448484' I don't think we need to optimize here and make it not query the database, or give out another error message. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:47:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:47:52 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 21 Jan 2019 15:47:52 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: (2 comments) > I removed the +2 vote to prevent accidental "submit including > parents". Gladly re-add the +2 vote when the wording and missing > fall-through comment are fixed I see. I already corrected the issue, but its not pushed yet since I am not entirely through with all problems of this patch set. https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 140 PS1, Line 140: EFR works over FR channels only */ > This comment looks confusing. Let's rather say: [?] Done https://gerrit.osmocom.org/#/c/12622/1/src/osmo-bsc/lchan_select.c at 143 PS1, Line 143: /* fall through */ > Please add some "fall-through" comment here to suppress Coverity / compiler warnings. Done -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 21 Jan 2019 15:47:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:49:40 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 15:49:40 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E199-45df98-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12661 ) Change subject: Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ...................................................................... Patch Set 1: It might make sense to wait for https://gerrit.osmocom.org/c/osmo-msc/+/12663 and than use 1.0.1 libosmocore requirement. -- To view, visit https://gerrit.osmocom.org/12661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 Gerrit-Change-Number: 12661 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:49:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:49:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:49:47 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 8: > generally I wonder whether we should just always drop that luhn check digit and only handle 14 digit IMEIs. Would that simplify anything? I would rather keep it, it seems to be an useful feature to me and it is already implemented and working. I'll create a new patch that addresses the points you mentioned, thanks for the review. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:49:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 15:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 15:59:57 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#9). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/9 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 16:02:35 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 9: (the build will fail now, because it depends on https://gerrit.osmocom.org/#/c/libosmocore/+/12666/ now) -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 16:02:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 16:10:13 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:10:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8214?= In-Reply-To: <654210655.679.1548079967409.JavaMail.jenkins@jenkins.osmocom.org> References: <654210655.679.1548079967409.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <221502046.681.1548087013735.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.86 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:11:39 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:11:39 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8214?= In-Reply-To: <1873415056.680.1548080043642.JavaMail.jenkins@jenkins.osmocom.org> References: <1873415056.680.1548080043642.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1148481743.682.1548087099827.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:11:47 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:11:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8215?= In-Reply-To: <221502046.681.1548087013735.JavaMail.jenkins@jenkins.osmocom.org> References: <221502046.681.1548087013735.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1040594439.683.1548087107047.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 779.50 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + mkdir -p generated # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + cp ./vty/msc_vty_reference.xml generated/combined.xml # is like basename from coreutils, and . is WD. + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC gsm_04_08.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:13:10 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:13:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8215?= In-Reply-To: <1148481743.682.1548087099827.JavaMail.jenkins@jenkins.osmocom.org> References: <1148481743.682.1548087099827.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <393266664.684.1548087190479.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC gsm_04_08_cc.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC db.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:13:33 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:13:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3683?= In-Reply-To: <950602345.676.1548079552431.JavaMail.jenkins@jenkins.osmocom.org> References: <950602345.676.1548079552431.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1760500446.685.1548087213848.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 756.45 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC socket.o CC gsm_data_shared.o CC oap_client.o CC gsup_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_vty.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC bsc_subscriber.o CC bsc_rll.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC bts_ipaccess_nanobts.o CC bts_ericsson_rbs2000.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC bsc_init.o CC gsm_04_80_utils.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_dyn_ts.o CC net_init.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC gsm_04_14.o CC auth.o CC gsm_subscriber.o CC gsm_04_08.o CC gsm_04_80.o CC gsm_04_11.o CC mncc.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ CC mncc_builtin.o CC mncc_sock.o gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:14:09 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:14:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3683?= In-Reply-To: <1434229289.678.1548079583064.JavaMail.jenkins@jenkins.osmocom.org> References: <1434229289.678.1548079583064.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1474558422.686.1548087249632.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 762.54 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC socket.o CC gsm_data_shared.o CC oap_client.o CC gsup_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_transcode.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_rsl.o CC acc_ramp.o CC abis_om2000_vty.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC gsm_04_08.o CC auth.o CC db.o CC gsm_04_80.o CC gsm_subscriber.o CC gsm_04_11.o CC gsm_04_14.o CC mncc.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ CC mncc_builtin.o CC mncc_sock.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:14:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 16:14:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:14:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:20:09 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 16:20:09 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12666/1/include/osmocom/gsm/protocol/gsm_23_003.h File include/osmocom/gsm/protocol/gsm_23_003.h: https://gerrit.osmocom.org/#/c/12666/1/include/osmocom/gsm/protocol/gsm_23_003.h at 28 PS1, Line 28: #define GSM23003_IMEI_NUM_NO_CHK_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ "NUM_DIGITS_NO_CHK"? The idea for this patch was to pick a char buffer of exactly the right size, for which I think this patch is quite overkill. (just using IMEI_NUM_DIGITS is close enough) But maybe it is a useful constant in general, so ok with me. -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:20:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 16:20:16 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:20:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8216?= In-Reply-To: <1040594439.683.1548087107047.JavaMail.jenkins@jenkins.osmocom.org> References: <1040594439.683.1548087107047.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <413734061.687.1548087616847.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.66 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml # is like basename from coreutils, and . is WD. + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11.o CC a_reset.o CC gsm_04_08.o CC msc_vty.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:20:40 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:20:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8216?= In-Reply-To: <393266664.684.1548087190479.JavaMail.jenkins@jenkins.osmocom.org> References: <393266664.684.1548087190479.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1661854192.688.1548087640789.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC db.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:28:25 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 16:28:25 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12666/1/include/osmocom/gsm/protocol/gsm_23_003.h File include/osmocom/gsm/protocol/gsm_23_003.h: https://gerrit.osmocom.org/#/c/12666/1/include/osmocom/gsm/protocol/gsm_23_003.h at 28 PS1, Line 28: #define GSM23003_IMEI_NUM_NO_CHK_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ > "NUM_DIGITS_NO_CHK"? [?] * "GSM23003_IMEI_NUM_DIGITS_NO_CHK" but it's a bikeshed, sry -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:28:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:31:26 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 21 Jan 2019 16:31:26 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12316 to look at the new patch set (#4). Change subject: ctrl: separate config structure ...................................................................... ctrl: separate config structure Moving configuration data from anonymous struct into shared header as a preparation for ctrl logging improvements in follow-up patches. Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Related: SYS#2655 --- M src/osysmon_ctrl.c M src/simple_ctrl.h 2 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/16/12316/4 -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:32:59 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 16:32:59 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12666 to look at the new patch set (#2). Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK ...................................................................... gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/12666/2 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:33:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 16:33:49 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:33:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:34:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 16:34:48 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:34:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:34:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 16:34:51 +0000 Subject: Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK ...................................................................... gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index ee697ff..babd0f4 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,6 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) +/* IMEI without Luhn checksum */ +#define GSM23003_IMEI_NUM_DIGITS_NO_CHK (GSM23003_IMEI_TAC_NUM_DIGITS + \ + GSM23003_IMEI_SNR_NUM_DIGITS) /* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ #define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:40:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 21 Jan 2019 16:40:30 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#10). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/10 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 16:44:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:44:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1165?= In-Reply-To: <1888356565.672.1548078859026.JavaMail.jenkins@jenkins.osmocom.org> References: <1888356565.672.1548078859026.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1080339758.689.1548089046524.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.64 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:52:16 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:52:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8217?= In-Reply-To: <413734061.687.1548087616847.JavaMail.jenkins@jenkins.osmocom.org> References: <413734061.687.1548087616847.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <648629927.690.1548089536214.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 780.74 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC gsm_04_11.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:53:37 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:53:37 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8217?= In-Reply-To: <1661854192.688.1548087640789.JavaMail.jenkins@jenkins.osmocom.org> References: <1661854192.688.1548087640789.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <26257029.691.1548089617223.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC msc_vty.o CC gsm_04_08_cc.o CC a_iface.o CC gsm_04_11.o CC db.o CC gsm_04_08.o CC a_reset.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:54:57 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:54:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8218?= In-Reply-To: <26257029.691.1548089617223.JavaMail.jenkins@jenkins.osmocom.org> References: <26257029.691.1548089617223.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <193933521.692.1548089697149.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:55:08 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:55:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8218?= In-Reply-To: <648629927.690.1548089536214.JavaMail.jenkins@jenkins.osmocom.org> References: <648629927.690.1548089536214.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1057478751.693.1548089708666.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 780.60 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + mkdir -p generated # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + cp ./vty/msc_vty_reference.xml generated/combined.xml # is like basename from coreutils, and . is WD. + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC msc_vty.o CC gsm_04_11.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:55:22 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:55:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3684?= In-Reply-To: <1474558422.686.1548087249632.JavaMail.jenkins@jenkins.osmocom.org> References: <1474558422.686.1548087249632.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <37482895.694.1548089722929.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 757.91 KB...] config.status: creating src/libmgcp/Makefile config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC common_vty.o CC bsc_version.o CC gsm_data.o CC debug.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_vty.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ CC mgcp_sdp.o CC mgcp_transcode.o AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o CC paging.o CC bts_ericsson_rbs2000.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC gsm_subscriber.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 16:55:38 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 16:55:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3684?= In-Reply-To: <1760500446.685.1548087213848.JavaMail.jenkins@jenkins.osmocom.org> References: <1760500446.685.1548087213848.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <295998669.695.1548089738067.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.50 KB...] config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC gsm_data.o CC debug.o CC socket.o CC gsup_client.o CC oap_client.o CC gsm_data_shared.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_vty.o CC mgcp_osmux.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_om2000.o CC abis_nm.o CC abis_rsl.o CC abis_om2000_vty.o CC abis_nm_vty.o CC bsc_rll.o CC acc_ramp.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC chan_alloc.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_subscriber.o CC mncc.o CC gsm_04_14.o CC gsm_04_80.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ cc1: some warnings being treated as errors CC mncc_builtin.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 16:59:38 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 16:59:38 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 21 Jan 2019 16:59:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 17:03:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:03:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8219?= In-Reply-To: <193933521.692.1548089697149.JavaMail.jenkins@jenkins.osmocom.org> References: <193933521.692.1548089697149.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <804608812.696.1548090239979.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 17:04:14 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:04:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8219?= In-Reply-To: <1057478751.693.1548089708666.JavaMail.jenkins@jenkins.osmocom.org> References: <1057478751.693.1548089708666.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <385504865.697.1548090254116.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 810.16 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.199-45df98 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # we create a symlink at ./srcfile.adoc pointing at + mv generated/combined.xml generated/combine_src.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.2.0-199-g45df98" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ CC gsm_09_11.o cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:28:00 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 17:28:00 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 10: Code-Review-1 (8 comments) https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 62 PS10, Line 62: vty_out(vty, " IMEI: %s%c%s", subscr->imei, osmo_luhn(subscr->imei, 14), VTY_NEWLINE); if the IMEI in the db were too short, we will feed -EINVAL into "%c". Please make sure to avoid that. https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 150 PS10, Line 150: } (I was going to complain about the checksum-digit-present-but-invalid case, but saw the vty test for this answering with "does not exist", which is fine.) https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 167 PS10, Line 167: "Identify subscriber by IMEI (14 digits, without 15th check digit)\n" \ here you say "14 digits" but above you explicitly allow 15. Maybe cut out the "(14 ...)"? https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 176 PS10, Line 176: #define SUBSCR_IMEI_HELP "Set IMEI of the subscriber (debug only! normally set from MSC, do not use manually)\n" IIUC this string is used only once, so could drop the #define? (to put this review in context: apparently the MSISDN one should also have been dropped. not in this patch.) Maybe weaken the warning a bit: "(Normally, this is populated from the MSC, no need to set this manually.)", also because the 'none' below to clear an IMEI could be a useful use case not covered by the MSC. https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 547 PS10, Line 547: else if (!osmo_imei_str_valid(imei, false)) { osmocom coding style is } else if () { (wouldn't be my choice either, but that's how it is.) https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty File tests/test_subscriber.vty: https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 50 PS10, Line 50: % No subscriber for imei = '35761300444848' so, the user entered "...485" and is told "no ...48". If I were the user I would file a bug report. This is a bit hard to solve, right? Maybe the vty could simply indicate that it is using the shorter IMEI version? OsmoHLR# show subscriber imei 357613004448485 % Stripping checksum digit: imei = '35761300444848' % No subscriber for imei = '35761300444848' or something, idk https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 401 PS10, Line 401: OsmoHLR# subscriber imei 35761300444848 show (BTW, the 'subscriber foo show' ordering was a mistake by me. All other vty commands everywhere use the order of 'show subscriber foo'.) https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 407 PS10, Line 407: % No subscriber for imei = '357613004448484' also have a valid checksum case plz # show subscriber imei 357613004448485 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 17:28:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 17:33:47 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 9: (4 comments) https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm0808_utils.c at 1373 PS9, Line 1373: gsm0808_cell_id_u_name > Are there any users of this function outside the library? [?] oh, wait what, I thought I was adding this function. https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c at 339 PS9, Line 339: a->lac > b->lac > If not a < b, and not a > b, then a != b, right? please read your comment and the code again :) https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c at 356 PS9, Line 356: a->cell_identity > b->cell_identity > same here. :) https://gerrit.osmocom.org/#/c/11504/9/src/gsm/libosmogsm.map File src/gsm/libosmogsm.map: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/libosmogsm.map at 213 PS9, Line 213: gsm0808_cell_id_u_match > So, you're making this symbol static, thus breaking the API, but still keeping it here? gah, forgot, thx -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 21 Jan 2019 17:33:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:40:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:40:33 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0_=E2=86=92_1=2E0=2E1?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12665 ) Change subject: Bump version: 1.0.0 ? 1.0.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51696a3ace219ab69c294b0e3637371c5460291f Gerrit-Change-Number: 12665 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 17:40:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:40:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:40:35 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0_=E2=86=92_1=2E0=2E1?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12665 ) Change subject: Bump version: 1.0.0 ? 1.0.1 ...................................................................... Bump version: 1.0.0 ? 1.0.1 Change-Id: I51696a3ace219ab69c294b0e3637371c5460291f --- M debian/changelog M src/Makefile.am 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index c5de726..2cdab76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.0.1) unstable; urgency=medium + + [ Max ] + * Rename msgb_wrap_with_TL() + + -- Harald Welte Mon, 21 Jan 2019 14:50:42 +0100 + libosmocore (1.0.0) unstable; urgency=medium [ K?vin Redon ] diff --git a/src/Makefile.am b/src/Makefile.am index 6ca39ad..6840f79 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=12:0:0 +LIBVERSION=12:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51696a3ace219ab69c294b0e3637371c5460291f Gerrit-Change-Number: 12665 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:43:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:43:05 +0000 Subject: Change in libosmocore[master]: Merge tag '1.0.1' Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12667 Change subject: Merge tag '1.0.1' ...................................................................... Merge tag '1.0.1' Release v1.0.1 on 2019-01-21. Change-Id: I2b92a7cfcdc7ed9d6f835bd17c6b5d2ec939b568 --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/12667/1 -- To view, visit https://gerrit.osmocom.org/12667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2b92a7cfcdc7ed9d6f835bd17c6b5d2ec939b568 Gerrit-Change-Number: 12667 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:43:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:43:36 +0000 Subject: Change in libosmocore[master]: Merge tag '1.0.1' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12667 ) Change subject: Merge tag '1.0.1' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2b92a7cfcdc7ed9d6f835bd17c6b5d2ec939b568 Gerrit-Change-Number: 12667 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 17:43:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:45:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:45:06 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E199-45df98-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12661 ) Change subject: Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 Gerrit-Change-Number: 12661 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 17:45:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:45:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:45:07 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E199-45df98-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12661 ) Change subject: Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 --- M configure.ac M debian/changelog 2 files changed, 240 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index a4979cf..17f4b90 100644 --- a/configure.ac +++ b/configure.ac @@ -35,16 +35,16 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index f14c792..76d4fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,233 @@ +osmo-msc (1.3.0) unstable; urgency=medium + + [ Philipp Maier ] + * vlr_access_req_fsm: use correct cause codes + * a_reset: cleanup + remove dead code + * mgcp: do not start connections in loopback mode + * mgcp: hack to keep IuUP working + * mgcp: use codec information returned with ASSIGNMENT COMPL. + * doc: update mgw settings in example config file + * mncc: fix byte ordering of IP-Address in mncc + * msc_mgcp: move mncc struct initalization to where its actually needed + * gsm_04_08_cc: Add global guard timer for MNCC + * cosmetic: remove forgotten debug printf + * vlr: drop unused is_ps parameter in vlr_subscr_req_lu() + * osmo_msc: remove unused parameter from msc_dtap() + * gsm_subscriber: make function msc_paging_request() static + * msc_vty: display subscriber flags + * msc_vty: display current RAN type + * msc_vty: also show IMEI and IMEISV + * gsm_04_08: Fix nullpointer deref + + [ Stefan Sperling ] + * remove redundant unconditional PKG_CHECK_MODULES for libsmpp + * implement periodic Location Update expiry in the VLR + * VLR: reject overlong IMSIs in ID RESP messages + * fix a use-after-free in msc_mgcp.c:_handle_error() + * detach cancelled subscribers from VLR + * make gsup ipa name configurable in osmo-msc.cfg + * provide software version information to gsup peer + * require 'ipa-name' option to be set via config file + * use vty->type instead of local variable + + [ Vadim Yanitskiy ] + * libmsc/ussd.c: FIX: properly indicate errors + * libmsc: properly name the MSC_CONN_USE token for SS + * libmsc/ussd.c: use connection ref-counting and transactions + * Use proper naming for GSM TS 09.11 implementation + * libmsc/gsm_04_08.c: expose gsm48_tx_simple() + * libmsc/gsm_09_11.c: properly indicate transaction errors + * libmsc/gsm_04_80.c: make the API abstract from ss_request struct + * .gitignore: ignore src/libgsupclient/gsup_test_client + * configure.ac: drop unused dependencies + * msc_vlr_tests: don't abuse USSD-request to conclude connections + * libvlr/vlr.c: forward unhandled GSUP messages towards MSC + * libmsc/gsm_09_11.c: forward SS/USSD messages to HLR over GSUP + * libmsc/gsm_09_11.c: implement network-initiated sessions + * libmsc/gsm_09_11.c: properly handle MS-initiated release + * libmsc/gsm_09_11.c: introduce rate counters for NC_SS sessions + * libmsc/gsm_09_11.c: introduce counter for active sessions + * msc/signal.h: use #pragma once include guard + * msc/rrlp.h: use #pragma once include guard + * libmsc/rrlp.c: add missing include + * libmsc/gsm_09_11.c: clean up the local GSM 04.80 API + * RRLP: properly name the init function + * RRLP: fix: actually init the RRLP signal handlers + * RRLP: migrate and share mode definitions from msc_vty.c + * RRLP: print log when sending a position request + * osmo-msc: free the VTY talloc context on exit + * osmo-msc: track the use of talloc NULL memory contexts + * libmsc/db.c: cosmetic: mark missing breaks in switch as intended + * msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() + * msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() + * msc_vlr_tests.c: drop duplicating DMM category definition + * libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} + * libmsc/gsm_04_11.c: refactor RP-DATA header validation + * libmsc/transaction.c: cosmetic: fix typo + * libmsc/gsm_09_11.c: drop redundant assertion of stored msgb + * libmsc/gsm_04_11.c: refactor MT SMS message handling + * libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS + * libmsc/VTY: introduce kill-switch for routing SMS over GSUP + * libmsc/gsm_04_11.c: forward MO SMS messages over GSUP + * libmsc/gsm_04_11.c: accept MT SMS messages over GSUP + + [ Pau Espin Pedrol ] + * msc_main: Fix typo in description of version param + * jenkins.sh: Use --enable-werror only when iu support is disabled + * osmo-msc: Improve shutdown due to signal and print talloc report on exit + * msc: Set talloc ctx for osmo_signal structures + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * msc: vty: Fix integer printf formatting + + [ Daniel Willmann ] + * git-version-gen: Don't check for .git directory + * OsmoBSC/HLR/MSC: Fix default config file name + + [ Harald Welte ] + * libmsc: move L3 call-control to separate C file (gsm_04_08_cc.c) + * migrate to oap_client in libosmogsm + * Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr + * gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() + * share chapters/gsup.adoc from OsmoSGSN to OsmoMSC + OsmoHLR + * vty-ref: Update URI of docbook 5.0 schema + * add SGs / CSFB related dot + msc files + + [ Neels Hofmeyr ] + * vlr_access_req_fsm.c: use osmo_strlcpy and avoid compiler error + * Iu MGCP: no need to loopback on the cn side + * cosmetic: typos in log and comment + * use __FILE__, not __BASE_FILE__ + * cosmetic: mute "COMPLETE_LAYER_3 not permitted" + * store classmark in vlr_subscr, not conn + * msc_vlr_tests: cosmetically tweak perm algo printing + * A5/n Ciph: request Classmark Update if missing + * fix Classmark Update without VLR subscriber + * vty: add SCCP related vty commands + * GSUP client: send CN domain IE on LU request + * lu_fsm: result cb: use proper cause type (warning/coverity) + * Importing history from osmo-gsm-manuals + * add OsmoMSC manual + * add OsmoHLR manual, OsmoHLR VTY reference + * refactor Makefile build rules, don't use the FORCE + * OsmoMSC: update VTY reference + * msc: update vty reference + * drop unused gsm_subscr_conn->mncc_rtp_bridge + * drop unused gsm_network->handover.active + * drop unused openbscdefines.h + * drop unused SUBSCR_CONN_E_INVALID + * drop unused gsm0408_allow_everyone() declaration + * drop unused tests/db/* + * cosmetic: subscr_conn_fsm_auth_ciph() should be static + * adjust copyright in subscr_conn.c + * populate gsm_subscriber_connection->encr during Ciph + * rename gsm_encr to geran_encr, it is only applicable on GERAN + * drop msc_compl_l3() return value + * rename gsm_subscriber_connection to ran_conn + * rename some RAN conn related stuff to ran_conn_* + * move subscr_conn.c to ran_conn.c + * move ran_conn declarations to new ran_conn.h + * combine several small .h in msc_common.h + * cosmetic: drop some unused opaque struct defs + * move gsm_auth_tuple to vlr.h as vlr_auth_tuple + * GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH + * drop cruft from gsm_subscriber.h + * move gsm_cbfn to gsm_subscriber.h, the only user + * python tests: use py shebang instead of $(PYTHON) + * make: prepare for adding transcript tests + * add test_nodes.vty transcript test + * cosmetic: msc_main.c: default args definition style + * msc_main: mncc: move mncc socket decision to after read_cfg + * vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' + * add VTY commands: mncc internal / external (== -M) + * ASS-COMPL: do not fire Sec Mode Compl event + * move ASS-COMPL MGCP handling out of a_iface_bssap.c + * drop gsm48 RR ciph mode compl from permitted initial messages + * LU: do not always invoke sub_pres_vlr_fsm_start() + * Revert "move ASS-COMPL MGCP handling out of a_iface_bssap.c" + * log: by default start with all categories on LOGL_NOTICE + * tweak comment to indicate sub_pres_vlr fsm as dead code + * vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI + * comment: vlr: put the 'balancing' comment closer to the put() + * vty: show subscriber: put() before printing the use count + * fix msc_mgcp_fsm_evt_names: two missing events + * mgcp log tweak: say RAN, not BTS, like surrounding logging + * fix test_nodes.vty after libosmo-mgcp-client vty changes + * cosmetics in msc_mgcp_call_release() + * release RTP stream only for matching CC transaction + * fix vlr ops.subscr_assoc re-association + * remove code dup: add msc_mgcp_try_call_assignment() + * move trans->assignment_done to cc.assignment_started + * fix: incoming call during ongoing call + * abort assignment on Assignment Failure + * vlr: auth_fsm: make sure vsub->auth_fsm = NULL when it terminates + * vty cfg: move 'ipa-name' from 'msc' to 'hlr' section + * use osmo_rat_type from libosmocore + * use mgcp-client configured endpoint domain name + * use osmo_lu_type_name() from libosmocore + * add LOG_RAN_CONN() to use the conn->fi->id for context + * rx CM Service Req: reject double use sooner + * refactor log ctx for vlr_subscr and ran_conn + * mm_rx_id_resp(): use osmo_mi_name() + * tweak fsm_msc_mgcp FSM and FI name + * err log: fully log MS supported A5 algos on mismatch + * msc_vlr_tests: tweak logging in verbose mode + + [ Keith ] + * libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() + * Make alert notifications vty configurable per ESME + * Cosmetic: Fix spelling in smpp vty + + [ Max ] + * Properly parse cause in cipher mode reject + * Add counters for BSSMAP cipher mode messages + * vty: add command to show all known BSC + * msc_vlr_tests: tweak conn_exists() + * Fix build with latest libosmocore + * Use BSSAP-specific TLV parser from libosmocore + * Use libosmocore to function to parse cipher mode reject cause + * cosmetic: drop duplicated #include + * cosmetic: drop unused variable + * CC: log more details about unhandled message/state + * VLR tests: add logging macro with explicit value description + * VLR tests: avoid leaking LAC access details + * Use proper type for tch_rtp_connect() parameter + * VLR: drop unused struct members + * Remove redundancy in LAC processing + * MNCC: use log wrapper for call processing + * Constify transaction helpers parameters + * Use explicit protocol discriminator for NC SS/USSD session + * Fix trans_has_conn() doxygen description + * Enable SMS-related log in VLR tests + * MNCC: use explicit struct type in gsm_call + * SMS: remove code duplication in transaction init + * vty: make 'sh connect/transact' readable again + + [ Keith Whyte ] + * libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. + + [ Alexander Couzens ] + * OsmoMSC: add rate counter documentation + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + * Cosmetic: msc_vty: remove redundant "0 =", "1 =" + * msc_vty.c: make check-imei-rqd configurable + * vlr_core.h: remove duplicate declarations + * VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg + * VLR: send CHECK-IMEI to EIR/HLR + + [ Ivan Kluchnikov ] + * libmsc/transaction: introduce trans_find_by_sm_rp_mr() + + [ gsmevent admin ] + * gsm_04_08_cc.c: drop non-sensible error message + + -- Harald Welte Mon, 21 Jan 2019 00:16:26 +0100 + osmo-msc (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59d032ad953438f12439ac3d6275ee78d0ebbb40 Gerrit-Change-Number: 12661 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:46:52 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 17:46:52 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c File src/gsm/gsm23003.c: https://gerrit.osmocom.org/#/c/11504/9/src/gsm/gsm23003.c at 331 PS9, Line 331: 0 if the LAI are equal, -1 if a < b, 1 if a > b Ahhh, sorry, I didn't notice this comment :/ Nevermind. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 21 Jan 2019 17:46:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 17:48:13 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:48:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8220?= In-Reply-To: <385504865.697.1548090254116.JavaMail.jenkins@jenkins.osmocom.org> References: <385504865.697.1548090254116.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <565716616.698.1548092893850.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ------------------------------------------ [...truncated 807.49 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 17:49:09 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:49:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1166?= In-Reply-To: <1080339758.689.1548089046524.JavaMail.jenkins@jenkins.osmocom.org> References: <1080339758.689.1548089046524.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <331938003.699.1548092949392.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.51 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 17:49:18 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:49:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8220?= In-Reply-To: <804608812.696.1548090239979.JavaMail.jenkins@jenkins.osmocom.org> References: <804608812.696.1548090239979.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <902656459.700.1548092958570.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] Bump version: 1.2.0.199-45df98-dirty ? 1.3.0 ------------------------------------------ [...truncated 1.14 MB...] + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_reset.o CC a_iface.o CC db.o CC msc_vty.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... CC gsm_09_11.o make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:49:50 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:49:50 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E10-9e66-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12660 ) Change subject: Bump version: 0.3.0.10-9e66-dirty ? 0.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2943b7fd0a1f7ca79f761116cba30aa3aa29b88 Gerrit-Change-Number: 12660 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 17:49:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:49:51 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:49:51 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0=2E10-9e66-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12660 ) Change subject: Bump version: 0.3.0.10-9e66-dirty ? 0.4.0 ...................................................................... Bump version: 0.3.0.10-9e66-dirty ? 0.4.0 Change-Id: Ib2943b7fd0a1f7ca79f761116cba30aa3aa29b88 --- M debian/changelog M src/Makefile.am 2 files changed, 32 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 1ec6437..26f7525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +osmo-iuh (0.4.0) unstable; urgency=medium + + [ Bernhard M. Wiedemann ] + * asn1tostruct: allow to override build date + + [ Alexander Couzens ] + * hnbgw: remove close_cb() to fix a crash when releasing a hnbgw + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * hnbgw_tx_hnb_register_rej(): Missing return statement + + [ Neels Hofmeyr ] + * fix decoding of incoming X.213 NSAP addr + * hnbgw: vty: add SCCP related vty commands + * fix transport layer addr again, for nano3g + + [ Pau Espin Pedrol ] + * debian: package osmo-hnbgw.service + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Stefan Sperling ] + * add a VTY command which shows a specific HNB + + [ Oliver Smith ] + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Sun, 20 Jan 2019 21:46:05 +0100 + osmo-iuh (0.3.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/src/Makefile.am b/src/Makefile.am index 7802384..586c689 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=2:0:0 +RANAP_LIBVERSION=2:1:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/12660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2943b7fd0a1f7ca79f761116cba30aa3aa29b88 Gerrit-Change-Number: 12660 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 17:54:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 17:54:47 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E2=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12668 Change subject: Bump version: 1.1.0 ? 1.2.0 ...................................................................... Bump version: 1.1.0 ? 1.2.0 Change-Id: Ia3926179b9020ba597d8dda727da89a20ff4bdce --- M debian/changelog 1 file changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/68/12668/1 diff --git a/debian/changelog b/debian/changelog index 81f0271..8e570cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +osmo-sip-connector (1.2.0) unstable; urgency=medium + + [ Keith ] + * Logging: Log mncc_names in mncc_data() + * Add Cause to DISCONNECT and RELEASE Requests + * Add SIP <-> MNCC Cause Map + * Implement Cause Mapping + * Logging: Add debug logging for status/causes + * Cosmetic: correct spelling error in logging + * Log using GSM48 Cause Value strings + * Logging: Further use of osmo_mncc_name() in logging + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + + [ Keith Whyte ] + * Logging: Log RTP IP in dotted quad format. + * Use htonl, not ntohl before inet_ntoa() + * Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. + + [ Pau Espin Pedrol ] + * mncc: Fix missing conditional clause + * configure.ac: Introduce --enable-werror option + * jenkins.sh: Use --enable-werror option + * debian: Use osmo-sip-connector.service from contrib + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Oliver Smith ] + * Fix typo in -h: s/hekp/help + * cosmetic: call.h: spaces -> tabs for consistency + * vty: make 'show calls summary' more userfriendly + * Add --version cmdline option + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Daniel Willmann ] + * Fix mncc socket name + * Add VTY reference for osmo-sip-connector + * Add manual for OsmoSIPConnector + * osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC + + [ Neels Hofmeyr ] + * configure.ac: add --enable-sanitize + * Importing history from osmo-gsm-manuals.git + * sip-connector: update vty reference + + [ Vadim Yanitskiy ] + * OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion + + [ Philipp Maier ] + * running: Add note about DTMF support + + -- Harald Welte Mon, 21 Jan 2019 18:54:09 +0100 + osmo-sip-connector (1.1.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3926179b9020ba597d8dda727da89a20ff4bdce Gerrit-Change-Number: 12668 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 17:58:14 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:58:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3685?= In-Reply-To: <295998669.695.1548089738067.JavaMail.jenkins@jenkins.osmocom.org> References: <295998669.695.1548089738067.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2012300344.701.1548093494763.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.47 KB...] config.status: creating src/libmgcp/Makefile config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC common_vty.o CC bsc_version.o CC gsm_data.o CC debug.o CC socket.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_network.o CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_logic.o CC handover_decision.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_80.o CC mncc.o CC gsm_subscriber.o CC db.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 17:58:49 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:58:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8221?= In-Reply-To: <565716616.698.1548092893850.JavaMail.jenkins@jenkins.osmocom.org> References: <565716616.698.1548092893850.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1549146094.702.1548093529501.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 810.82 KB...] checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 17:59:10 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 17:59:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3685?= In-Reply-To: <37482895.694.1548089722929.JavaMail.jenkins@jenkins.osmocom.org> References: <37482895.694.1548089722929.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <387273816.703.1548093550720.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 758.27 KB...] config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/openbsc/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsup_client.o CC oap_client.o CC gsm_data.o CC socket.o CC gsm_data_shared.o CC talloc_ctx.o CC gsup_test_client.o CC gsm_subscriber_base.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_sdp.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_transcode.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_om2000.o CC abis_nm.o CC bsc_subscriber.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC abis_om2000_vty.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC mncc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_subscriber.o CC gsm_04_80.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 18:00:17 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:00:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8221?= In-Reply-To: <902656459.700.1548092958570.JavaMail.jenkins@jenkins.osmocom.org> References: <902656459.700.1548092958570.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <980566075.704.1548093617545.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:00:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:00:52 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12668 ) Change subject: Bump version: 1.1.0 ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3926179b9020ba597d8dda727da89a20ff4bdce Gerrit-Change-Number: 12668 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 18:00:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:00:53 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:00:53 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12668 ) Change subject: Bump version: 1.1.0 ? 1.2.0 ...................................................................... Bump version: 1.1.0 ? 1.2.0 Change-Id: Ia3926179b9020ba597d8dda727da89a20ff4bdce --- M debian/changelog 1 file changed, 57 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 81f0271..8e570cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +osmo-sip-connector (1.2.0) unstable; urgency=medium + + [ Keith ] + * Logging: Log mncc_names in mncc_data() + * Add Cause to DISCONNECT and RELEASE Requests + * Add SIP <-> MNCC Cause Map + * Implement Cause Mapping + * Logging: Add debug logging for status/causes + * Cosmetic: correct spelling error in logging + * Log using GSM48 Cause Value strings + * Logging: Further use of osmo_mncc_name() in logging + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + + [ Keith Whyte ] + * Logging: Log RTP IP in dotted quad format. + * Use htonl, not ntohl before inet_ntoa() + * Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. + + [ Pau Espin Pedrol ] + * mncc: Fix missing conditional clause + * configure.ac: Introduce --enable-werror option + * jenkins.sh: Use --enable-werror option + * debian: Use osmo-sip-connector.service from contrib + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + + [ Oliver Smith ] + * Fix typo in -h: s/hekp/help + * cosmetic: call.h: spaces -> tabs for consistency + * vty: make 'show calls summary' more userfriendly + * Add --version cmdline option + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Daniel Willmann ] + * Fix mncc socket name + * Add VTY reference for osmo-sip-connector + * Add manual for OsmoSIPConnector + * osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC + + [ Neels Hofmeyr ] + * configure.ac: add --enable-sanitize + * Importing history from osmo-gsm-manuals.git + * sip-connector: update vty reference + + [ Vadim Yanitskiy ] + * OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion + + [ Philipp Maier ] + * running: Add note about DTMF support + + -- Harald Welte Mon, 21 Jan 2019 18:54:09 +0100 + osmo-sip-connector (1.1.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3926179b9020ba597d8dda727da89a20ff4bdce Gerrit-Change-Number: 12668 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 18:05:39 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:05:39 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3686?= In-Reply-To: <2012300344.701.1548093494763.JavaMail.jenkins@jenkins.osmocom.org> References: <2012300344.701.1548093494763.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <155765572.705.1548093939983.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 761.36 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000_vty.o CC abis_om2000.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_08.o CC db.o CC gsm_04_11.o CC mncc.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_subscriber.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o CC mncc_sock.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 18:05:42 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:05:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3686?= In-Reply-To: <387273816.703.1548093550720.JavaMail.jenkins@jenkins.osmocom.org> References: <387273816.703.1548093550720.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1842251105.706.1548093942209.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 761.15 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsup_client.o CC gsm_data_shared.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_transcode.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_om2000.o CC abis_nm_vty.o CC bsc_subscriber.o CC acc_ramp.o CC abis_om2000_vty.o CC abis_rsl.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC gsm_04_08.o CC auth.o CC db.o CC gsm_04_14.o CC gsm_04_11.o CC gsm_subscriber.o CC gsm_04_80.o CC mncc.o gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 18:08:47 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:08:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8222?= In-Reply-To: <1549146094.702.1548093529501.JavaMail.jenkins@jenkins.osmocom.org> References: <1549146094.702.1548093529501.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <328376350.707.1548094127466.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 810.15 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, + mkdir -p generated # we create a symlink at ./srcfile.adoc pointing at + cp ./vty/msc_vty_reference.xml generated/combined.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml # is like basename from coreutils, and . is WD. + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC gsm_04_08_cc.o CC db.o CC gsm_04_08.o CC a_iface_bssap.o CC msc_vty.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 18:09:47 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:09:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8222?= In-Reply-To: <980566075.704.1548093617545.JavaMail.jenkins@jenkins.osmocom.org> References: <980566075.704.1548093617545.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <363763653.708.1548094187257.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:17:40 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 18:17:40 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/codec_pref.h File include/osmocom/bsc/codec_pref.h: https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/codec_pref.h at 24 PS2, Line 24: const struct gsm_bts *bts, enum rate_pref rate_pref); in ch_mode_rate, we add a 'bool full_rate', and we also add a 'rate_pref'? That seems redundant to me / more complex for error checking, because I could technically pass ch_mode_rate->full_rate = false and rate_pref = RATE_PREF_HR. would it make more sense to add an enum rate_pref to channel_mode_and_rate, instead of the bool? Or instead of enum rate_pref, add a "bool strict_rate_pref", to say whether the ch_mode_rate->full_rate flag is important or can be overruled? https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/assignment_fsm.c at 255 PS2, Line 255: struct channel_mode_and_rate *ch_mode_rate) const struct ... https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/assignment_fsm.c at 305 PS2, Line 305: static int check_voice_stream_needed(struct gsm_subscriber_connection *conn, struct osmo_fsm_inst *fi) (we already have a flag around called "requires_voice_stream", so prefer if this is called "check_requires_voice_stream()") https://gerrit.osmocom.org/#/c/12625/2/src/osmo-bsc/assignment_fsm.c at 324 PS2, Line 324: result_pref = false; don't understand the name 'result_pref' ... from surrounding code I guess 'requires_voice' is better? -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 18:17:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:19:21 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 18:19:21 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... Patch Set 2: (6 comments) https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h at 59 PS2, Line 59: osmo_classmark > Since this is a part of GSM 04. [?] sure, can, but I preferred it shorter. Hmm, ok, maybe there are other classmarks besides the 48 ones... https://gerrit.osmocom.org/#/c/12659/2/include/osmocom/gsm/protocol/gsm_04_08.h at 63 PS2, Line 63: classmark2 > (just wondering) we also have gsm48_classmark2, why not to use it here? I'm not entirely sure, maybe anticipating that classmark2 might grow in a future spec? But actually, no, if at all, cm3 would be extended. Looks like I should use gsm48_classmark2 indeed. Now I'm unsure whether cm2 might ever be < 3 bytes. Since existing code seems to use the cm2_len already, I'm just going to keep that. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1199 PS2, Line 1199: snprintf(cm1, sizeof(cm1), "no-cm1"); > PoC: https://pastebin. [?] sure, better. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1234 PS2, Line 1234: dst->classmark1_set > Should we assign false otherwise? no, it's just an update. We can only add classmarks, not remove them. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1238 PS2, Line 1238: sizeof(dst->classmark2) > Why not classmark2_len? to avoid having to check whether the len is > sizeof(). I can make it OSMO_MIN() if you prefer. https://gerrit.osmocom.org/#/c/12659/2/src/gsm/gsm48.c at 1303 PS2, Line 1303: return 0; > (just wondering) shouldn't we indicate this 'out of range' case somehow? we're in a libosmocore utility function, and I want to avoid adding logging. The negative rc range is already used for "the missing classmark number (negative)", so just return "no, A5/99 is not supported, go away". -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 18:19:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:19:25 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 18:19:25 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#10). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 645 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/10 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:19:25 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 21 Jan 2019 18:19:25 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12659 to look at the new patch set (#3). Change subject: add osmo_classmark_* API ...................................................................... add osmo_classmark_* API osmo-bsc and osmo-msc implement identical Classmark structures. It makes sense to define once near the gsm48 protocol definitions. Also move along some generic Classmark API from osmo-msc. Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/12659/3 -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:44:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:44:31 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E38-5b52_=E2=86=92_0=2E6=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12669 Change subject: Bump version: 0.5.1.38-5b52 ? 0.6.0 ...................................................................... Bump version: 0.5.1.38-5b52 ? 0.6.0 Change-Id: Ibd7ac106f1e08319a592cf3246fc9fb6e298d226 --- M debian/changelog 1 file changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/69/12669/1 diff --git a/debian/changelog b/debian/changelog index e5df5c7..ac9c6a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-pcu (0.6.0) unstable; urgency=medium + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * Initial place-holder for the new Gb/IP interface documentation + * Gb message sequence chart: flip sides (SGSN should be right) + * Gb message sequence chart: Add notion of PCU unix domain socket + * Gb: Various spelling fixes + * gb: Some language improvements, formatting changes + * consistently use '3GPP TS' not sometimes 3GPP TS and sometimes TS. + * gb/NS: Clarify the language regarding the UDP port numbers / socket + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * Cleanup of systemd service files + * configure.ac: Set CXXFLAGS during --enable-sanitize + * Install systemd services with autotools + * Move examples/ to doc/examples/ + * Install osmo-pcu.cfg to docdir/examples + * Allow easily disabling GFDL references + + [ Stefan Sperling ] + * check for overlong unix socket paths + + [ Max ] + * deb: add missing copyright file + * OsmoPCU: fix Gb documentation front page + * OsmoPCU: expand NS documentation + * OsmoPCU: expand BSSGP documentation + * OsmoPCU: add MSC chart + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + * make clean: also remove generated image files + * add 'make check' target + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Philipp ] + * configuration: fixing typos + + [ Alexander Couzens ] + * OsmoPCU: add rate counter documentation + + [ Daniel Willmann ] + * Change OpenBSC mentions to OsmoBSC where applicable + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Mon, 21 Jan 2019 19:03:52 +0100 + osmo-pcu (0.5.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/12669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd7ac106f1e08319a592cf3246fc9fb6e298d226 Gerrit-Change-Number: 12669 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:44:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:44:56 +0000 Subject: Change in libosmocore[master]: Merge tag '1.0.1' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12667 ) Change subject: Merge tag '1.0.1' ...................................................................... Merge tag '1.0.1' Release v1.0.1 on 2019-01-21. Change-Id: I2b92a7cfcdc7ed9d6f835bd17c6b5d2ec939b568 --- 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/12667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2b92a7cfcdc7ed9d6f835bd17c6b5d2ec939b568 Gerrit-Change-Number: 12667 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:45:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:45:56 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 18:45:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:50:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 18:50:04 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b(), osmo_hexdump_buf() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b(), osmo_hexdump_buf() ...................................................................... Patch Set 3: Code-Review+1 I'm a bit skeptical about those "second static buffer" functions. If we, in general, added functions for a user-supplied bufer and one for a static buffer, it should be enough. Then a user who needs two buffers can put one buffer on his stack... and a user who needs three can do the same, without adding a _c() variant... -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 18:50:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 18:51:03 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 Jan 2019 18:51:03 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 21 Jan 2019 18:51:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 18:53:49 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 18:53:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1167?= In-Reply-To: <331938003.699.1548092949392.JavaMail.jenkins@jenkins.osmocom.org> References: <331938003.699.1548092949392.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <537603438.709.1548096829457.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.48 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 21 19:00:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 19:00:44 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E38-5b52_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12669 ) Change subject: Bump version: 0.5.1.38-5b52 ? 0.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd7ac106f1e08319a592cf3246fc9fb6e298d226 Gerrit-Change-Number: 12669 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 21 Jan 2019 19:00:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 21 19:00:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 21 Jan 2019 19:00:46 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E1=2E38-5b52_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12669 ) Change subject: Bump version: 0.5.1.38-5b52 ? 0.6.0 ...................................................................... Bump version: 0.5.1.38-5b52 ? 0.6.0 Change-Id: Ibd7ac106f1e08319a592cf3246fc9fb6e298d226 --- M debian/changelog 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index e5df5c7..ac9c6a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-pcu (0.6.0) unstable; urgency=medium + + [ Harald Welte ] + * debian/rules: Don't overwrite .tarball-version + * gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * Initial place-holder for the new Gb/IP interface documentation + * Gb message sequence chart: flip sides (SGSN should be right) + * Gb message sequence chart: Add notion of PCU unix domain socket + * Gb: Various spelling fixes + * gb: Some language improvements, formatting changes + * consistently use '3GPP TS' not sometimes 3GPP TS and sometimes TS. + * gb/NS: Clarify the language regarding the UDP port numbers / socket + * vty-ref: Update URI of docbook 5.0 schema + + [ Pau Espin Pedrol ] + * Cleanup of systemd service files + * configure.ac: Set CXXFLAGS during --enable-sanitize + * Install systemd services with autotools + * Move examples/ to doc/examples/ + * Install osmo-pcu.cfg to docdir/examples + * Allow easily disabling GFDL references + + [ Stefan Sperling ] + * check for overlong unix socket paths + + [ Max ] + * deb: add missing copyright file + * OsmoPCU: fix Gb documentation front page + * OsmoPCU: expand NS documentation + * OsmoPCU: expand BSSGP documentation + * OsmoPCU: add MSC chart + + [ Neels Hofmeyr ] + * Importing history from osmo-gsm-manuals.git + * make clean: also remove generated image files + * add 'make check' target + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Philipp ] + * configuration: fixing typos + + [ Alexander Couzens ] + * OsmoPCU: add rate counter documentation + + [ Daniel Willmann ] + * Change OpenBSC mentions to OsmoBSC where applicable + + [ Oliver Smith ] + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + -- Harald Welte Mon, 21 Jan 2019 19:03:52 +0100 + osmo-pcu (0.5.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/12669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd7ac106f1e08319a592cf3246fc9fb6e298d226 Gerrit-Change-Number: 12669 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 21 19:02:18 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:02:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8223?= In-Reply-To: <328376350.707.1548094127466.JavaMail.jenkins@jenkins.osmocom.org> References: <328376350.707.1548094127466.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1704139360.710.1548097338553.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.49 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ CC gsm_09_11.o cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:03:23 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:03:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8223?= In-Reply-To: <363763653.708.1548094187257.JavaMail.jenkins@jenkins.osmocom.org> References: <363763653.708.1548094187257.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <436605280.711.1548097403027.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_reset.o CC a_iface.o CC gsm_04_11.o CC msc_vty.o CC gsm_04_08.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:05:21 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:05:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8224?= In-Reply-To: <1704139360.710.1548097338553.JavaMail.jenkins@jenkins.osmocom.org> References: <1704139360.710.1548097338553.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <436492379.712.1548097521373.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.67 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # we create a symlink at ./srcfile.adoc pointing at + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_reset.o CC a_iface.o CC msc_vty.o CC a_iface_bssap.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC db.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:06:12 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:06:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3687?= In-Reply-To: <155765572.705.1548093939983.JavaMail.jenkins@jenkins.osmocom.org> References: <155765572.705.1548093939983.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1595584648.713.1548097572892.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 764.02 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC debug.o CC common_vty.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_network.o CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_om2000.o CC abis_rsl.o CC abis_nm_vty.o CC bsc_subscriber.o CC abis_om2000_vty.o CC acc_ramp.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_80.o CC gsm_04_11.o CC gsm_subscriber.o CC gsm_04_14.o CC mncc.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ CC mncc_builtin.o CC mncc_sock.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/build/openbsc/src' Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:06:16 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:06:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3687?= In-Reply-To: <1842251105.706.1548093942209.JavaMail.jenkins@jenkins.osmocom.org> References: <1842251105.706.1548093942209.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1970652868.714.1548097576192.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.77 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC debug.o CC common_vty.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_transcode.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000.o CC abis_rsl.o CC abis_om2000_vty.o CC bsc_rll.o CC bsc_subscriber.o CC acc_ramp.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_80.o CC gsm_04_08.o CC gsm_subscriber.o CC gsm_04_11.o CC gsm_04_14.o CC mncc.o gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:06:32 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:06:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8224?= In-Reply-To: <436605280.711.1548097403027.JavaMail.jenkins@jenkins.osmocom.org> References: <436605280.711.1548097403027.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1791130776.715.1548097592211.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC db.o CC a_reset.o CC msc_vty.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:12:10 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:12:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8225?= In-Reply-To: <436492379.712.1548097521373.JavaMail.jenkins@jenkins.osmocom.org> References: <436492379.712.1548097521373.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <133909690.716.1548097930906.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.98 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. + mv generated/combined.xml generated/combine_src.xml TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 19:12:48 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 19:12:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8225?= In-Reply-To: <1791130776.715.1548097592211.JavaMail.jenkins@jenkins.osmocom.org> References: <1791130776.715.1548097592211.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <610169200.717.1548097968130.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC msc_vty.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC gsm_04_08.o CC a_reset.o CC db.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From admin at opensuse.org Mon Jan 21 19:50:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 19:50:45 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c4622a686138_2c16f5067c4591bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/xUbuntu_17.04/i586 Package network:osmocom:latest/eclipse-titan failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 432s] "Build date (Base Library): " __DATE__ " " __TIME__ "\n" [ 432s] ^~~~~~~~ [ 432s] ar -r libttcn3-parallel.a RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_static.o Parallel_main.o [ 432s] ar: creating libttcn3-parallel.a [ 432s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -I. -IRT1 -I/usr/include/libxml2 -I../common -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC LoggerPlugin_dynamic.cc -o LoggerPlugin_dynamic.o [ 432s] g++ -shared -Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -fPIC -o libttcn3-dynamic.so RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_dynamic.o Single_main.o -Ldefault/lib -lcrypto -lxml2 [ 432s] /usr/bin/ld: LoggerPlugin_dynamic.o: undefined reference to symbol 'dlopen@@GLIBC_2.1' [ 432s] //lib/i386-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line [ 432s] collect2: error: ld returned 1 exit status [ 432s] Makefile:344: recipe for target 'libttcn3-dynamic.so' failed [ 432s] make[2]: *** [libttcn3-dynamic.so] Error 1 [ 432s] make[2]: Leaving directory '/usr/src/packages/BUILD/core' [ 432s] Makefile:65: recipe for target 'all' failed [ 432s] make[1]: *** [all] Error 2 [ 432s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 432s] dh_auto_build: make -j1 returned exit code 2 [ 432s] debian/rules:6: recipe for target 'build' failed [ 432s] make: *** [build] Error 2 [ 432s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 432s] [ 432s] build75 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 21 19:50:28 UTC 2019. [ 432s] [ 432s] ### VM INTERACTION START ### [ 435s] [ 426.198619] sysrq: SysRq : Power Off [ 436s] [ 426.209853] reboot: Power down [ 436s] ### VM INTERACTION END ### [ 436s] [ 436s] build75 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 21 19:50:32 UTC 2019. [ 436s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 19:54:10 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 19:54:10 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c46237487add_2c16f5067c459572@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/xUbuntu_17.04/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 642s] "Build date (Base Library): " __DATE__ " " __TIME__ "\n" [ 642s] ^~~~~~~~ [ 642s] ar -r libttcn3-parallel.a RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_static.o Parallel_main.o [ 642s] ar: creating libttcn3-parallel.a [ 642s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -I. -IRT1 -I/usr/include/libxml2 -I../common -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC LoggerPlugin_dynamic.cc -o LoggerPlugin_dynamic.o [ 643s] g++ -shared -Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -fPIC -o libttcn3-dynamic.so RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_dynamic.o Single_main.o -Ldefault/lib -lcrypto -lxml2 [ 643s] /usr/bin/ld: LoggerPlugin_dynamic.o: undefined reference to symbol 'dlclose@@GLIBC_2.2.5' [ 643s] //lib/x86_64-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line [ 643s] collect2: error: ld returned 1 exit status [ 643s] Makefile:344: recipe for target 'libttcn3-dynamic.so' failed [ 643s] make[2]: *** [libttcn3-dynamic.so] Error 1 [ 643s] make[2]: Leaving directory '/usr/src/packages/BUILD/core' [ 643s] Makefile:65: recipe for target 'all' failed [ 643s] make[1]: *** [all] Error 2 [ 643s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 643s] dh_auto_build: make -j1 returned exit code 2 [ 643s] debian/rules:6: recipe for target 'build' failed [ 643s] make: *** [build] Error 2 [ 643s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 643s] [ 643s] lamb14 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 21 19:53:52 UTC 2019. [ 643s] [ 643s] ### VM INTERACTION START ### [ 646s] [ 632.437804] sysrq: SysRq : Power Off [ 646s] [ 632.444261] reboot: Power down [ 646s] ### VM INTERACTION END ### [ 646s] [ 646s] lamb14 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 21 19:53:56 UTC 2019. [ 646s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:11:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:11:02 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c4627702ab4e_2c16f5067c4612a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_8.0/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 101s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 101s] ^ [ 101s] cc1: some warnings being treated as errors [ 101s] Makefile:475: recipe for target 'gsm_04_80.o' failed [ 101s] make[4]: *** [gsm_04_80.o] Error 1 [ 101s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 101s] Makefile:438: recipe for target 'all-recursive' failed [ 101s] make[3]: *** [all-recursive] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 101s] Makefile:514: recipe for target 'all-recursive' failed [ 101s] make[2]: *** [all-recursive] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] Makefile:422: recipe for target 'all' failed [ 101s] make[1]: *** [all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:13: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 101s] [ 101s] lamb10 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:10:46 UTC 2019. [ 101s] [ 101s] ### VM INTERACTION START ### [ 103s] Powering off. [ 103s] [ 91.958486] reboot: Power down [ 103s] ### VM INTERACTION END ### [ 103s] [ 103s] lamb10 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:10:48 UTC 2019. [ 103s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:14:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:14:45 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c462844a0276_2c16f5067c461656@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 85s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 85s] ^~~~~~~~~~~~~~~~~ [ 85s] cc1: some warnings being treated as errors [ 85s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 85s] make[4]: *** [gsm_04_80.o] Error 1 [ 85s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 85s] Makefile:450: recipe for target 'all-recursive' failed [ 85s] make[3]: *** [all-recursive] Error 1 [ 85s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 85s] Makefile:525: recipe for target 'all-recursive' failed [ 85s] make[2]: *** [all-recursive] Error 1 [ 85s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 85s] Makefile:434: recipe for target 'all' failed [ 85s] make[1]: *** [all] Error 2 [ 85s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 85s] dh_auto_build: make -j1 returned exit code 2 [ 85s] debian/rules:13: recipe for target 'build' failed [ 85s] make: *** [build] Error 2 [ 85s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 85s] [ 85s] sheep84 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:14:37 UTC 2019. [ 85s] [ 85s] ### VM INTERACTION START ### [ 88s] [ 79.740624] sysrq: SysRq : Power Off [ 88s] [ 79.746373] reboot: Power down [ 88s] ### VM INTERACTION END ### [ 88s] [ 88s] sheep84 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:14:40 UTC 2019. [ 88s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:15:19 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:15:19 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c462864d180b_2c16f5067c4618fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 116s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 116s] ^~~~~~~~~~~~~~~~~ [ 116s] cc1: some warnings being treated as errors [ 116s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 116s] make[4]: *** [gsm_04_80.o] Error 1 [ 116s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 116s] Makefile:450: recipe for target 'all-recursive' failed [ 116s] make[3]: *** [all-recursive] Error 1 [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 116s] Makefile:525: recipe for target 'all-recursive' failed [ 116s] make[2]: *** [all-recursive] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 116s] Makefile:434: recipe for target 'all' failed [ 116s] make[1]: *** [all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 116s] dh_auto_build: make -j1 returned exit code 2 [ 116s] debian/rules:13: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 116s] [ 116s] lamb60 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:15:11 UTC 2019. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 108.075234] sysrq: SysRq : Power Off [ 119s] [ 108.089426] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb60 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:15:14 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:15:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:15:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c46287fbabfe_2c16f5067c4619c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 128s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 128s] ^ [ 128s] cc1: some warnings being treated as errors [ 128s] Makefile:501: recipe for target 'gsm_04_80.o' failed [ 128s] make[4]: *** [gsm_04_80.o] Error 1 [ 128s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 128s] Makefile:412: recipe for target 'all-recursive' failed [ 128s] make[3]: *** [all-recursive] Error 1 [ 128s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 128s] Makefile:452: recipe for target 'all-recursive' failed [ 128s] make[2]: *** [all-recursive] Error 1 [ 128s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 128s] Makefile:383: recipe for target 'all' failed [ 128s] make[1]: *** [all] Error 2 [ 128s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 128s] dh_auto_build: make -j1 returned exit code 2 [ 128s] debian/rules:45: recipe for target 'build' failed [ 128s] make: *** [build] Error 2 [ 128s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 128s] [ 128s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:15:23 UTC 2019. [ 128s] [ 128s] ### VM INTERACTION START ### [ 129s] Powering off. [ 129s] [ 115.781635] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:15:24 UTC 2019. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:16:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:16:28 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c46289fc6e7d_2c16f5067c462088@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/i586 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 182s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 182s] ^~~~~~~~~~~~~~~~~ [ 182s] cc1: some warnings being treated as errors [ 182s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 182s] make[4]: *** [gsm_04_80.o] Error 1 [ 182s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 182s] Makefile:450: recipe for target 'all-recursive' failed [ 182s] make[3]: *** [all-recursive] Error 1 [ 182s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 182s] Makefile:525: recipe for target 'all-recursive' failed [ 182s] make[2]: *** [all-recursive] Error 1 [ 182s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 182s] Makefile:434: recipe for target 'all' failed [ 182s] make[1]: *** [all] Error 2 [ 182s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 182s] dh_auto_build: make -j1 returned exit code 2 [ 182s] debian/rules:13: recipe for target 'build' failed [ 182s] make: *** [build] Error 2 [ 182s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 182s] [ 182s] lamb25 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:14 UTC 2019. [ 182s] [ 182s] ### VM INTERACTION START ### [ 185s] [ 168.522707] sysrq: SysRq : Power Off [ 185s] [ 168.527902] reboot: Power down [ 185s] ### VM INTERACTION END ### [ 185s] [ 185s] lamb25 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:18 UTC 2019. [ 185s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:16:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:16:28 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c4628a0302c6_2c16f5067c462180@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 170s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 170s] ^ [ 170s] cc1: some warnings being treated as errors [ 170s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 170s] make[4]: *** [gsm_04_80.o] Error 1 [ 170s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 170s] Makefile:450: recipe for target 'all-recursive' failed [ 170s] make[3]: *** [all-recursive] Error 1 [ 170s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 170s] Makefile:525: recipe for target 'all-recursive' failed [ 170s] make[2]: *** [all-recursive] Error 1 [ 170s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 170s] Makefile:434: recipe for target 'all' failed [ 170s] make[1]: *** [all] Error 2 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 170s] dh_auto_build: make -j1 returned exit code 2 [ 170s] debian/rules:13: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] morla3 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:18 UTC 2019. [ 170s] [ 170s] ### VM INTERACTION START ### [ 173s] [ 160.438226] sysrq: SysRq : Power Off [ 173s] [ 160.501034] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] morla3 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:22 UTC 2019. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:16:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:16:45 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c4628beb35d8_2c16f5067c4622b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_17.10/i586 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 188s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 188s] ^~~~~~~~~~~~~~~~~ [ 188s] cc1: some warnings being treated as errors [ 188s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 188s] make[4]: *** [gsm_04_80.o] Error 1 [ 188s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 188s] Makefile:450: recipe for target 'all-recursive' failed [ 188s] make[3]: *** [all-recursive] Error 1 [ 188s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 188s] Makefile:525: recipe for target 'all-recursive' failed [ 188s] make[2]: *** [all-recursive] Error 1 [ 188s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 188s] Makefile:434: recipe for target 'all' failed [ 188s] make[1]: *** [all] Error 2 [ 188s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 188s] dh_auto_build: make -j1 returned exit code 2 [ 188s] debian/rules:13: recipe for target 'build' failed [ 188s] make: *** [build] Error 2 [ 188s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 188s] [ 188s] lamb61 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:26 UTC 2019. [ 188s] [ 188s] ### VM INTERACTION START ### [ 192s] [ 178.276207] sysrq: SysRq : Power Off [ 192s] [ 178.286175] reboot: Power down [ 192s] ### VM INTERACTION END ### [ 192s] [ 192s] lamb61 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:16:30 UTC 2019. [ 192s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:18:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:18:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c4629336a59f_2c16f5067c462478@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 88s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 88s] ^ [ 88s] cc1: some warnings being treated as errors [ 88s] Makefile:501: recipe for target 'gsm_04_80.o' failed [ 88s] make[4]: *** [gsm_04_80.o] Error 1 [ 88s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 88s] Makefile:412: recipe for target 'all-recursive' failed [ 88s] make[3]: *** [all-recursive] Error 1 [ 88s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 88s] Makefile:452: recipe for target 'all-recursive' failed [ 88s] make[2]: *** [all-recursive] Error 1 [ 88s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 88s] Makefile:383: recipe for target 'all' failed [ 88s] make[1]: *** [all] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] dh_auto_build: make -j1 returned exit code 2 [ 88s] debian/rules:45: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 88s] [ 88s] build77 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:18:35 UTC 2019. [ 88s] [ 88s] ### VM INTERACTION START ### [ 89s] Powering off. [ 90s] [ 73.738555] reboot: Power down [ 90s] ### VM INTERACTION END ### [ 90s] [ 90s] build77 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:18:37 UTC 2019. [ 90s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:19:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:19:02 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c4629532772e_2c16f5067c462648@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 188s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 188s] ^~~~~~~~~~~~~~~~~ [ 188s] cc1: some warnings being treated as errors [ 188s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 188s] make[4]: *** [gsm_04_80.o] Error 1 [ 188s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 188s] Makefile:450: recipe for target 'all-recursive' failed [ 188s] make[3]: *** [all-recursive] Error 1 [ 188s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 188s] Makefile:525: recipe for target 'all-recursive' failed [ 188s] make[2]: *** [all-recursive] Error 1 [ 188s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 188s] Makefile:434: recipe for target 'all' failed [ 188s] make[1]: *** [all] Error 2 [ 188s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 188s] dh_auto_build: cd openbsc && make -j1 returned exit code 2 [ 188s] debian/rules:13: recipe for target 'build' failed [ 188s] make: *** [build] Error 2 [ 188s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 188s] [ 188s] morla3 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:18:49 UTC 2019. [ 188s] [ 188s] ### VM INTERACTION START ### [ 191s] [ 176.943203] sysrq: SysRq : Power Off [ 191s] [ 176.986865] reboot: Power down [ 191s] ### VM INTERACTION END ### [ 191s] [ 191s] morla3 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:18:53 UTC 2019. [ 191s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:19:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:19:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c462953adde6_2c16f5067c46276e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 83s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 83s] ^~~~~~~~~~~~~~~~~ [ 83s] cc1: some warnings being treated as errors [ 83s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 83s] make[4]: *** [gsm_04_80.o] Error 1 [ 83s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 83s] Makefile:424: recipe for target 'all-recursive' failed [ 83s] make[3]: *** [all-recursive] Error 1 [ 83s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 83s] Makefile:464: recipe for target 'all-recursive' failed [ 83s] make[2]: *** [all-recursive] Error 1 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 83s] Makefile:396: recipe for target 'all' failed [ 83s] make[1]: *** [all] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] dh_auto_build: make -j1 returned exit code 2 [ 83s] debian/rules:45: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] lamb19 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:18:52 UTC 2019. [ 83s] [ 83s] ### VM INTERACTION START ### [ 87s] [ 74.514054] sysrq: SysRq : Power Off [ 87s] [ 74.518451] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] lamb19 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:18:57 UTC 2019. [ 87s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:19:19 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:19:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c46295496910_2c16f5067c4628df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 122s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 122s] ^~~~~~~~~~~~~~~~~ [ 122s] cc1: some warnings being treated as errors [ 122s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 122s] make[4]: *** [gsm_04_80.o] Error 1 [ 122s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 122s] Makefile:424: recipe for target 'all-recursive' failed [ 122s] make[3]: *** [all-recursive] Error 1 [ 122s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 122s] Makefile:464: recipe for target 'all-recursive' failed [ 122s] make[2]: *** [all-recursive] Error 1 [ 122s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 122s] Makefile:396: recipe for target 'all' failed [ 122s] make[1]: *** [all] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] dh_auto_build: make -j1 returned exit code 2 [ 122s] debian/rules:45: recipe for target 'build' failed [ 122s] make: *** [build] Error 2 [ 122s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 122s] [ 122s] cloud117 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:19:11 UTC 2019. [ 122s] [ 122s] ### VM INTERACTION START ### [ 126s] [ 103.963849] sysrq: SysRq : Power Off [ 126s] [ 103.974484] reboot: Power down [ 127s] ### VM INTERACTION END ### [ 127s] [ 127s] cloud117 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:19:16 UTC 2019. [ 127s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:19:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:19:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c46296e791eb_2c16f5067c462926@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 127s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 127s] ^~~~~~~~~~~~~~~~~ [ 127s] cc1: some warnings being treated as errors [ 127s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 127s] make[4]: *** [gsm_04_80.o] Error 1 [ 127s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 127s] Makefile:424: recipe for target 'all-recursive' failed [ 127s] make[3]: *** [all-recursive] Error 1 [ 127s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 127s] Makefile:464: recipe for target 'all-recursive' failed [ 127s] make[2]: *** [all-recursive] Error 1 [ 127s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 127s] Makefile:396: recipe for target 'all' failed [ 127s] make[1]: *** [all] Error 2 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 127s] dh_auto_build: make -j1 returned exit code 2 [ 127s] debian/rules:45: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] cloud103 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:19:20 UTC 2019. [ 127s] [ 127s] ### VM INTERACTION START ### [ 131s] [ 108.127528] sysrq: SysRq : Power Off [ 131s] [ 108.170462] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] cloud103 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:19:26 UTC 2019. [ 132s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:20:10 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:20:10 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c46298eed695_2c16f5067c463096@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 170s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 170s] ^~~~~~~~~~~~~~~~~ [ 170s] cc1: some warnings being treated as errors [ 170s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 170s] make[4]: *** [gsm_04_80.o] Error 1 [ 170s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 170s] Makefile:450: recipe for target 'all-recursive' failed [ 170s] make[3]: *** [all-recursive] Error 1 [ 170s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 170s] Makefile:525: recipe for target 'all-recursive' failed [ 170s] make[2]: *** [all-recursive] Error 1 [ 170s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 170s] Makefile:434: recipe for target 'all' failed [ 170s] make[1]: *** [all] Error 2 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 170s] dh_auto_build: cd openbsc && make -j1 returned exit code 2 [ 170s] debian/rules:13: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 170s] [ 170s] lamb08 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:19:54 UTC 2019. [ 170s] [ 170s] ### VM INTERACTION START ### [ 173s] [ 161.345772] sysrq: SysRq : Power Off [ 173s] [ 161.353032] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] lamb08 failed "build openbsc_1.1.0.20190121.dsc" at Mon Jan 21 20:19:58 UTC 2019. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:23:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:23:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c462a41dc297_2c16f5067c46378b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 119s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 119s] ^~~~~~~~~~~~~~~~~ [ 119s] cc1: some warnings being treated as errors [ 119s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 119s] make[4]: *** [gsm_04_80.o] Error 1 [ 119s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 119s] Makefile:424: recipe for target 'all-recursive' failed [ 119s] make[3]: *** [all-recursive] Error 1 [ 119s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 119s] Makefile:464: recipe for target 'all-recursive' failed [ 119s] make[2]: *** [all-recursive] Error 1 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 119s] Makefile:396: recipe for target 'all' failed [ 119s] make[1]: *** [all] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 119s] dh_auto_build: make -j1 returned exit code 2 [ 119s] debian/rules:45: recipe for target 'build' failed [ 119s] make: *** [build] Error 2 [ 119s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 119s] [ 119s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:22:41 UTC 2019. [ 119s] [ 119s] ### VM INTERACTION START ### [ 122s] [ 107.458224] sysrq: SysRq : Power Off [ 122s] [ 107.503811] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:22:45 UTC 2019. [ 122s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:23:19 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:23:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c462a429763d_2c16f5067c463892@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 151s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 151s] ^ [ 151s] cc1: some warnings being treated as errors [ 151s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 151s] make[4]: *** [gsm_04_80.o] Error 1 [ 151s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 151s] Makefile:424: recipe for target 'all-recursive' failed [ 151s] make[3]: *** [all-recursive] Error 1 [ 151s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 151s] Makefile:464: recipe for target 'all-recursive' failed [ 151s] make[2]: *** [all-recursive] Error 1 [ 151s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 151s] Makefile:396: recipe for target 'all' failed [ 151s] make[1]: *** [all] Error 2 [ 151s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 151s] dh_auto_build: make -j1 returned exit code 2 [ 151s] debian/rules:45: recipe for target 'build' failed [ 151s] make: *** [build] Error 2 [ 151s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 151s] [ 151s] wildcard2 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:22:53 UTC 2019. [ 151s] [ 151s] ### VM INTERACTION START ### [ 154s] [ 112.853706] sysrq: SysRq : Power Off [ 154s] [ 112.857750] reboot: Power down [ 159s] ### VM INTERACTION END ### [ 159s] [ 159s] wildcard2 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:23:02 UTC 2019. [ 159s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:27:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:27:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c462b3080cf5_2c16f5067c464227@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 135s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 135s] ^ [ 135s] cc1: some warnings being treated as errors [ 135s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 135s] make[4]: *** [gsm_04_80.o] Error 1 [ 135s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 135s] Makefile:424: recipe for target 'all-recursive' failed [ 135s] make[3]: *** [all-recursive] Error 1 [ 135s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 135s] Makefile:464: recipe for target 'all-recursive' failed [ 135s] make[2]: *** [all-recursive] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 135s] Makefile:396: recipe for target 'all' failed [ 135s] make[1]: *** [all] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:45: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] cloud108 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:26:55 UTC 2019. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 110.611596] sysrq: SysRq : Power Off [ 138s] [ 110.630236] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] cloud108 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:26:59 UTC 2019. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:30:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:30:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c462c04b3beb_2c16f5067c465040@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 82s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 82s] ^~~~~~~~~~~~~~~~~ [ 82s] cc1: some warnings being treated as errors [ 82s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 82s] make[4]: *** [gsm_04_80.o] Error 1 [ 82s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 82s] Makefile:424: recipe for target 'all-recursive' failed [ 82s] make[3]: *** [all-recursive] Error 1 [ 82s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 82s] Makefile:464: recipe for target 'all-recursive' failed [ 82s] make[2]: *** [all-recursive] Error 1 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 82s] Makefile:396: recipe for target 'all' failed [ 82s] make[1]: *** [all] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 82s] dh_auto_build: make -j1 returned exit code 2 [ 82s] debian/rules:45: recipe for target 'build' failed [ 82s] make: *** [build] Error 2 [ 82s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 82s] [ 82s] build79 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:30:25 UTC 2019. [ 82s] [ 82s] ### VM INTERACTION START ### [ 85s] [ 67.362700] sysrq: SysRq : Power Off [ 86s] [ 67.365173] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 87s] [ 87s] build79 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:30:31 UTC 2019. [ 87s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 21 20:32:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Jan 2019 20:32:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c462c61d14ff_2c16f5067c465634@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 178s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 178s] ^~~~~~~~~~~~~~~~~ [ 178s] cc1: some warnings being treated as errors [ 178s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 178s] make[4]: *** [gsm_04_80.o] Error 1 [ 178s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 178s] Makefile:424: recipe for target 'all-recursive' failed [ 178s] make[3]: *** [all-recursive] Error 1 [ 178s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 178s] Makefile:464: recipe for target 'all-recursive' failed [ 178s] make[2]: *** [all-recursive] Error 1 [ 178s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 178s] Makefile:396: recipe for target 'all' failed [ 178s] make[1]: *** [all] Error 2 [ 178s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 178s] dh_auto_build: make -j1 returned exit code 2 [ 178s] debian/rules:45: recipe for target 'build' failed [ 178s] make: *** [build] Error 2 [ 178s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 178s] [ 178s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:32:07 UTC 2019. [ 178s] [ 178s] ### VM INTERACTION START ### [ 181s] [ 167.461560] sysrq: SysRq : Power Off [ 181s] [ 167.485744] reboot: Power down [ 182s] ### VM INTERACTION END ### [ 182s] [ 182s] morla3 failed "build osmo-msc_1.3.0.dsc" at Mon Jan 21 20:32:12 UTC 2019. [ 182s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Mon Jan 21 21:15:48 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 21:15:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1168?= In-Reply-To: <537603438.709.1548096829457.JavaMail.jenkins@jenkins.osmocom.org> References: <537603438.709.1548096829457.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <373774652.718.1548105348748.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 97.67 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 23:03:05 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 23:03:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8226?= In-Reply-To: <133909690.716.1548097930906.JavaMail.jenkins@jenkins.osmocom.org> References: <133909690.716.1548097930906.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1435064426.719.1548111785753.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 807.53 KB...] checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 23:04:13 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 23:04:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8226?= In-Reply-To: <610169200.717.1548097968130.JavaMail.jenkins@jenkins.osmocom.org> References: <610169200.717.1548097968130.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <353366965.720.1548111853948.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 23:59:14 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 23:59:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1169?= In-Reply-To: <373774652.718.1548105348748.JavaMail.jenkins@jenkins.osmocom.org> References: <373774652.718.1548105348748.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2054936042.721.1548115154192.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.31 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 21 23:59:34 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 Jan 2019 23:59:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8227?= In-Reply-To: <1435064426.719.1548111785753.JavaMail.jenkins@jenkins.osmocom.org> References: <1435064426.719.1548111785753.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1309953946.722.1548115174194.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 807.73 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:00:05 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:00:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3688?= In-Reply-To: <1595584648.713.1548097572892.JavaMail.jenkins@jenkins.osmocom.org> References: <1595584648.713.1548097572892.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <449318480.723.1548115205638.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 761.56 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC socket.o CC oap_client.o CC gsup_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000.o CC acc_ramp.o CC abis_rsl.o CC abis_om2000_vty.o CC bsc_subscriber.o CC bsc_rll.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC handover_decision.o CC chan_alloc.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_subscriber.o CC gsm_04_14.o CC gsm_04_80.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o cc1: some warnings being treated as errors CC mncc_sock.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:00:16 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:00:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3688?= In-Reply-To: <1970652868.714.1548097576192.JavaMail.jenkins@jenkins.osmocom.org> References: <1970652868.714.1548097576192.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <138829471.724.1548115216283.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 761.83 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_transcode.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_vty.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000_vty.o CC abis_om2000.o CC abis_rsl.o CC bsc_subscriber.o CC bsc_rll.o CC acc_ramp.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_08.o CC gsm_subscriber.o CC db.o CC gsm_04_11.o CC mncc.o CC gsm_04_80.o CC gsm_04_14.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o cc1: some warnings being treated as errors CC mncc_sock.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:00:56 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:00:56 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8227?= In-Reply-To: <353366965.720.1548111853948.JavaMail.jenkins@jenkins.osmocom.org> References: <353366965.720.1548111853948.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <447296842.725.1548115256312.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_auth_fsm.o CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC gsm_04_08.o CC msc_vty.o CC db.o CC a_reset.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:08:57 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:08:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8228?= In-Reply-To: <1309953946.722.1548115174194.JavaMail.jenkins@jenkins.osmocom.org> References: <1309953946.722.1548115174194.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1354482139.726.1548115737574.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.26 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC msc_vty.o CC db.o CC gsm_04_11.o CC a_reset.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:10:01 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:10:01 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8228?= In-Reply-To: <447296842.725.1548115256312.JavaMail.jenkins@jenkins.osmocom.org> References: <447296842.725.1548115256312.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1436410649.727.1548115801227.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ CC gsm_09_11.o cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:10:13 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:10:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8229?= In-Reply-To: <1436410649.727.1548115801227.JavaMail.jenkins@jenkins.osmocom.org> References: <1436410649.727.1548115801227.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1362429226.728.1548115813720.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:10:21 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:10:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8229?= In-Reply-To: <1354482139.726.1548115737574.JavaMail.jenkins@jenkins.osmocom.org> References: <1354482139.726.1548115737574.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1101636864.729.1548115821250.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 780.57 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + mv generated/combined.xml generated/combine_src.xml # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC gsm_04_11.o CC msc_vty.o CC a_reset.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC db.o CC gsm_04_08.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:10:55 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:10:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3689?= In-Reply-To: <449318480.723.1548115205638.JavaMail.jenkins@jenkins.osmocom.org> References: <449318480.723.1548115205638.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <389993675.730.1548115855392.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.74 KB...] config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_sdp.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC bsc_subscriber.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_80.o CC gsm_04_14.o CC gsm_subscriber.o CC mncc.o gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o cc1: some warnings being treated as errors Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:11:19 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:11:19 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3689?= In-Reply-To: <138829471.724.1548115216283.JavaMail.jenkins@jenkins.osmocom.org> References: <138829471.724.1548115216283.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1156773894.731.1548115879394.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.79 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsup_client.o CC socket.o CC oap_client.o CC gsm_data_shared.o CC gsm_data.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_transcode.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000.o CC abis_rsl.o CC abis_om2000_vty.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC rest_octets.o CC pcu_sock.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC auth.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_80.o CC gsm_subscriber.o CC mncc.o CC gsm_04_14.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:14:57 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:14:57 +0000 Subject: Change in libosmocore[master]: osmo_fsm_state_name: make robust against NULL fi Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12670 Change subject: osmo_fsm_state_name: make robust against NULL fi ...................................................................... osmo_fsm_state_name: make robust against NULL fi Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 --- M include/osmocom/core/fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/12670/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 5bf5328..df7e348 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -220,7 +220,7 @@ /*! return the name of the state the FSM instance is currently in. */ static inline const char *osmo_fsm_inst_state_name(struct osmo_fsm_inst *fi) -{ return osmo_fsm_state_name(fi->fsm, fi->state); } +{ return fi ? osmo_fsm_state_name(fi->fsm, fi->state) : "NULL"; } /*! perform a state change of the given FSM instance * -- To view, visit https://gerrit.osmocom.org/12670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 Gerrit-Change-Number: 12670 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 00:18:09 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:18:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8230?= In-Reply-To: <1101636864.729.1548115821250.JavaMail.jenkins@jenkins.osmocom.org> References: <1101636864.729.1548115821250.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1827600240.732.1548116289230.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.97 KB...] checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC msc_vty.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ CC gsm_09_11.o cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:18:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:18:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8230?= In-Reply-To: <1362429226.728.1548115813720.JavaMail.jenkins@jenkins.osmocom.org> References: <1362429226.728.1548115813720.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1338278612.733.1548116338615.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC gsm_04_08_cc.o CC gsm_04_11.o CC db.o CC gsm_04_08.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors CC gsm_09_11.o Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:19:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:19:52 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12658 to look at the new patch set (#5). Change subject: add osmo_hexdump_buf() and test ...................................................................... add osmo_hexdump_buf() and test Add osmo_hexdump_buf() as an all-purpose hexdump function, which all other osmo_hexdump_*() implementations now call. It absorbs the static _osmo_hexdump(). Add tests for osmo_hexdump_buf(). Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 161 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/12658/5 -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:19:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:19:52 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12659 to look at the new patch set (#5). Change subject: add osmo_classmark_* API ...................................................................... add osmo_classmark_* API osmo-bsc and osmo-msc implement identical Classmark structures. It makes sense to define once near the gsm48 protocol definitions. Also move along some generic Classmark API from osmo-msc. Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/12659/5 -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:19:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:19:52 +0000 Subject: Change in libosmocore[master]: osmo_fsm_state_name: make robust against NULL fi In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12670 ) Change subject: osmo_fsm_state_name: make robust against NULL fi ...................................................................... osmo_fsm_state_name: make robust against NULL fi Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 --- M include/osmocom/core/fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/12670/2 -- To view, visit https://gerrit.osmocom.org/12670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 Gerrit-Change-Number: 12670 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:19:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:19:54 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12671 Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... add osmo_hexdump_b(), osmo_hexdump_nospc_b() Add osmo_hexdump_b() and osmo_hexdump_nospc_b() to use a second static buffer, allowing more than one hexdump per printf()-like call. Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. Naming: before, I named functions that use a secondary string buffer with a '2' suffix, like osmo_plmn_name() and osmo_plmn_name2(). This time, I decided to use a '_b' suffix, osmo_hexdump_b(), instead. The reason is, by now I think that '2' is a bad choice for secondary-buffer functions: the '2' suffix is already used for introducing a newer API version of function signatures. If we, for example, introduce an osmo_hexdump() that has no final delimiter after the last byte, that would qualify for osmo_hexdump2(); and that would confuse with the implementation simply using a secondary buffer. Sometimes during code review, I assume that the existence of a foo2() function means the patch submitter should use foo2() instead of foo(), and am annoyed by my previous choice of overloading the '2' suffix with a secondary meaning besides "this is newer API". Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 --- M include/osmocom/core/utils.h M src/utils.c 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12671/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index ff16cf4..ffe6cdd 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -55,7 +55,9 @@ char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); char *osmo_hexdump(const unsigned char *buf, int len); +char *osmo_hexdump_b(const unsigned char *buf, int len); char *osmo_hexdump_nospc(const unsigned char *buf, int len); +char *osmo_hexdump_nospc_b(const unsigned char *buf, int len); char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, bool delim_after_last); diff --git a/src/utils.c b/src/utils.c index c21b4ad..06c2f8a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -217,6 +217,7 @@ } static char hexd_buff[4096]; +static char hexd_buff2[4096]; static const char hex_chars[] = "0123456789abcdef"; /*! Convert binary sequence to hexadecimal ASCII string. @@ -320,6 +321,17 @@ return osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, " ", true); } +/*! Same as osmo_hexdump() but use a separate static buffer. + * Allows passing a second osmo_hexdump() as print format argument. + * \param[in] buf pointer to sequence of bytes. + * \param[in] len length of buf in number of bytes. + * \returns pointer to zero-terminated string. + */ +char *osmo_hexdump_b(const unsigned char *buf, int len) +{ + return osmo_hexdump_buf(hexd_buff2, sizeof(hexd_buff2), buf, len, " ", true); +} + /*! Convert binary sequence to hexadecimal ASCII string * \param[in] buf pointer to sequence of bytes * \param[in] len length of buf in number of bytes @@ -336,6 +348,17 @@ return osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); } +/*! Same as osmo_hexdump_nospc() but use a separate static buffer. + * Allows passing a second osmo_hexdump() as print format argument. + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + */ +char *osmo_hexdump_nospc_b(const unsigned char *buf, int len) +{ + return osmo_hexdump_buf(hexd_buff2, sizeof(hexd_buff2), buf, len, "", true); +} + /* Compat with previous typo to preserve abi */ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) #if defined(__MACH__) && defined(__APPLE__) -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:20:14 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:20:14 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... Patch Set 5: ok, let's decide about those separately. -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 Jan 2019 00:20:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:21:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:21:54 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12671 ) Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... Patch Set 1: These are mere convenience wrappers for providing an own buffer on the stack and calling osmo_hexdump_buf(). i.e. it could amount to mere API bloat. Maybe we can park this patch here for a while and see whether someone yearns for it... -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 Jan 2019 00:21:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:24:09 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:24:09 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12658/5/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12658/5/src/utils.c at 230 PS5, Line 230: * \returns out_buf, containing a zero-terminated string, or NULL if out_buf == NULL or out_buf_size < 1. thinking now, maybe should rather return "" if the out_buf is NULL or zero length? -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 Jan 2019 00:24:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:40:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:40:53 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12671 to look at the new patch set (#2). Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... add osmo_hexdump_b(), osmo_hexdump_nospc_b() Add osmo_hexdump_b() and osmo_hexdump_nospc_b() to use a second static buffer, allowing more than one hexdump per printf()-like call. Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. Naming: before, I named functions that use a secondary string buffer with a '2' suffix, like osmo_plmn_name() and osmo_plmn_name2(). This time, I decided to use a '_b' suffix, osmo_hexdump_b(), instead. The reason is, by now I think that '2' is a bad choice for secondary-buffer functions: the '2' suffix is already used for introducing a newer API version of function signatures. If we, for example, introduce an osmo_hexdump() that has no final delimiter after the last byte, that would qualify for osmo_hexdump2(); and that would confuse with the implementation simply using a secondary buffer. Sometimes during code review, I assume that the existence of a foo2() function means the patch submitter should use foo2() instead of foo(), and am annoyed by my previous choice of overloading the '2' suffix with a secondary meaning besides "this is newer API". Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 --- M include/osmocom/core/utils.h M src/utils.c 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12671/2 -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:40:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:40:53 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12658 to look at the new patch set (#6). Change subject: add osmo_hexdump_buf() and test ...................................................................... add osmo_hexdump_buf() and test Add osmo_hexdump_buf() as an all-purpose hexdump function, which all other osmo_hexdump_*() implementations now call. It absorbs the static _osmo_hexdump(). Add tests for osmo_hexdump_buf(). Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. The traditional osmo_hexdump() API returns a non-const char*, which should probably have been a const instead. Particularly this new function may return a string constant "" if the buf is NULL or empty, so return const char*. That is why the older implementations calling osmo_hexdump_buf() separately return the buffer instead of the const return value directly. Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 163 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/12658/6 -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:54:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:54:54 +0000 Subject: Change in osmo-msc[master]: Sync with libosmocore function rename In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: Sync with libosmocore function rename ...................................................................... Patch Set 1: (1 comment) I think it is quite weak that this patch here is sleeping on gerrit while the osmo-msc master build is broken after libosmocore If1e851ac605c8d2fde3da565b0bd674ea6350c2e is already merged. I hope we didn't tag releases in this state! https://gerrit.osmocom.org/#/c/12663/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12663/1//COMMIT_MSG at 7 PS1, Line 7: Sync with libosmocore function rename this log summary could be about absolutely anything! -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 00:54:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 00:55:16 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:55:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8231?= In-Reply-To: <1827600240.732.1548116289230.JavaMail.jenkins@jenkins.osmocom.org> References: <1827600240.732.1548116289230.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1249994702.734.1548118516692.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.62 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # we create a symlink at ./srcfile.adoc pointing at + mv generated/combined.xml generated/combine_src.xml # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC gsm_04_08.o CC msc_vty.o CC a_reset.o CC gsm_04_11.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:56:02 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:56:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8231?= In-Reply-To: <1338278612.733.1548116338615.JavaMail.jenkins@jenkins.osmocom.org> References: <1338278612.733.1548116338615.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <839177222.735.1548118562512.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + '[' 0 = 1 ']' + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:56:45 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:56:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3690?= In-Reply-To: <389993675.730.1548115855392.JavaMail.jenkins@jenkins.osmocom.org> References: <389993675.730.1548115855392.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <780743733.736.1548118605395.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 762.80 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsup_client.o CC oap_client.o CC socket.o CC gsm_data_shared.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_network.o CC mgcp_vty.o CC mgcp_protocol.o CC mgcp_sdp.o CC mgcp_osmux.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC bsc_subscriber.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC mncc.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_04_11.o CC gsm_subscriber.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ CC mncc_builtin.o CC mncc_sock.o cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:57:22 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:57:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3690?= In-Reply-To: <1156773894.731.1548115879394.JavaMail.jenkins@jenkins.osmocom.org> References: <1156773894.731.1548115879394.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2079963533.737.1548118642739.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.10 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.116-6504c9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC gsm_data_shared.o CC debug.o CC gsm_data.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_transcode.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC bsc_subscriber.o CC abis_om2000_vty.o CC bsc_rll.o CC abis_om2000.o CC abis_rsl.o CC acc_ramp.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:462:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC system_information.o CC rest_octets.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o system_information.c: In function 'band_compatible': system_information.c:51:7: warning: 'gsm_arfcn2band' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h:165): Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] enum gsm_band band = gsm_arfcn2band(arfcn); ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_dyn_ts.o CC net_init.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC auth.o CC gsm_subscriber.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_80.o CC gsm_04_14.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c: In function 'gsm0480_send_ussd_response': gsm_04_80.c:70:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ cc1: some warnings being treated as errors CC mncc_builtin.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:58:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:58:07 +0000 Subject: Change in osmo-msc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by Max. ( https://gerrit.osmocom.org/12663 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the osmo-msc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreaks the build. Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 --- M src/libmsc/gsm_04_80.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/12663/2 -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 00:58:09 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:58:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8232?= In-Reply-To: <1249994702.734.1548118516692.JavaMail.jenkins@jenkins.osmocom.org> References: <1249994702.734.1548118516692.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1650890181.738.1548118689114.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.83 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml + mkdir -p generated + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC db.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 00:58:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 00:58:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8232?= In-Reply-To: <839177222.735.1548118562512.JavaMail.jenkins@jenkins.osmocom.org> References: <839177222.735.1548118562512.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <251102651.739.1548118738835.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_auth_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC msc_vty.o CC gsm_04_11.o CC gsm_04_08.o CC db.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 22 00:59:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 00:59:04 +0000 Subject: Change in osmo-msc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3) to the change originally created by Max. ( https://gerrit.osmocom.org/12663 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the osmo-msc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build. Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 --- M src/libmsc/gsm_04_80.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/12663/3 -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 01:03:51 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:03:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8233?= In-Reply-To: <1650890181.738.1548118689114.JavaMail.jenkins@jenkins.osmocom.org> References: <1650890181.738.1548118689114.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <339320974.740.1548119031121.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.27 KB...] checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) All dependencies installed! CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ ./vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmomsc-vty-reference.xml # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at ./srcfile.adoc pointing at + mkdir -p generated # ./srcfile.adoc. osmomsc-usermanual.adoc is the ./srcfile.adoc, + cp ./vty/msc_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml # is like basename from coreutils, and . is WD. + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml if ! [ -f osmomsc-usermanual.adoc ]; then \ ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.3.0" -a revdate="2018-Nov-14" osmomsc-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomsc-usermanual.adoc; exit 1) + [ -n ./vty/msc_vty_additions.xml ] + realpath ./vty/msc_vty_additions.xml + addition=/build/doc/manuals/vty/msc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/doc/manuals/vty/msc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmomsc-vty-reference.pdf osmomsc-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmomsc-vty-reference.pdf 'osmomsc-vty-reference.pdf' successfully built make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC gsm_04_08.o CC gsm_04_11.o CC db.o CC msc_vty.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: all warnings being treated as errors make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:383: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 01:05:45 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:05:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8233?= In-Reply-To: <251102651.739.1548118738835.JavaMail.jenkins@jenkins.osmocom.org> References: <251102651.739.1548118738835.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1070929035.741.1548119145204.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC gsm_04_08_cc.o CC gsm_04_11.o CC msc_vty.o CC gsm_04_08.o CC db.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c: In function 'msc_send_ussd_reject': gsm_04_80.c:62:2: error: implicit declaration of function 'msgb_wrap_with_TL' [-Werror=implicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^ cc1: some warnings being treated as errors Makefile:497: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From admin at opensuse.org Tue Jan 22 01:13:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:13:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c466e2e6379e_2c16f5067c539254@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 82s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 82s] ^ [ 82s] cc1: some warnings being treated as errors [ 82s] Makefile:501: recipe for target 'gsm_04_80.o' failed [ 82s] make[4]: *** [gsm_04_80.o] Error 1 [ 82s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 82s] Makefile:412: recipe for target 'all-recursive' failed [ 82s] make[3]: *** [all-recursive] Error 1 [ 82s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 82s] Makefile:452: recipe for target 'all-recursive' failed [ 82s] make[2]: *** [all-recursive] Error 1 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 82s] Makefile:383: recipe for target 'all' failed [ 82s] make[1]: *** [all] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 82s] dh_auto_build: make -j1 returned exit code 2 [ 82s] debian/rules:45: recipe for target 'build' failed [ 82s] make: *** [build] Error 2 [ 82s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 82s] [ 82s] lamb08 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:13:05 UTC 2019. [ 82s] [ 82s] ### VM INTERACTION START ### [ 84s] Powering off. [ 84s] [ 73.182313] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] lamb08 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:13:07 UTC 2019. [ 84s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:13:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:13:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c466e2df3982_2c16f5067c539125@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 69s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 69s] ^~~~~~~~~~~~~~~~~ [ 69s] cc1: some warnings being treated as errors [ 69s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 69s] make[4]: *** [gsm_04_80.o] Error 1 [ 69s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 69s] Makefile:424: recipe for target 'all-recursive' failed [ 69s] make[3]: *** [all-recursive] Error 1 [ 69s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 69s] Makefile:464: recipe for target 'all-recursive' failed [ 69s] make[2]: *** [all-recursive] Error 1 [ 69s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 69s] Makefile:396: recipe for target 'all' failed [ 69s] make[1]: *** [all] Error 2 [ 69s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 69s] dh_auto_build: make -j1 returned exit code 2 [ 69s] debian/rules:45: recipe for target 'build' failed [ 69s] make: *** [build] Error 2 [ 69s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 69s] [ 69s] sheep83 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:12:59 UTC 2019. [ 69s] [ 69s] ### VM INTERACTION START ### [ 73s] [ 64.973286] sysrq: SysRq : Power Off [ 73s] [ 64.979524] reboot: Power down [ 73s] ### VM INTERACTION END ### [ 73s] [ 73s] sheep83 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:13:03 UTC 2019. [ 73s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:13:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:13:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c466e4871ccc_2c16f5067c53949e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 118s] 06 [ 118s] [ 118s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 118s] - [ 118s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 118s] 07 [ 118s] [ 118s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 118s] + [ 118s] result (UNBLOCK) = 1 [ 118s] [ 118s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 118s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 118s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 118s] make[1]: *** [override_dh_auto_test] Error 1 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] debian/rules:45: recipe for target 'build' failed [ 118s] make: *** [build] Error 2 [ 118s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 118s] [ 118s] wildcard2 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:17 UTC 2019. [ 118s] [ 118s] ### VM INTERACTION START ### [ 120s] Powering off. [ 120s] [ 98.198333] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] wildcard2 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:20 UTC 2019. [ 121s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:13:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:13:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5c466e482f62f_2c16f5067c539362@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 82s] | #define HAVE_STRING_H 1 [ 82s] | #define HAVE_MEMORY_H 1 [ 82s] | #define HAVE_STRINGS_H 1 [ 82s] | #define HAVE_INTTYPES_H 1 [ 82s] | #define HAVE_STDINT_H 1 [ 82s] | #define HAVE_UNISTD_H 1 [ 82s] | #define HAVE_DLFCN_H 1 [ 82s] | #define LT_OBJDIR ".libs/" [ 82s] | #define STDC_HEADERS 1 [ 82s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 82s] | [ 82s] | configure: exit 0 [ 82s] [ 82s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 82s] make[1]: *** [override_dh_auto_test] Error 1 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 82s] debian/rules:45: recipe for target 'build' failed [ 82s] make: *** [build] Error 2 [ 82s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 82s] [ 82s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:16 UTC 2019. [ 82s] [ 82s] ### VM INTERACTION START ### [ 86s] [ 78.600942] sysrq: SysRq : Power Off [ 86s] [ 78.606799] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 86s] [ 86s] sheep83 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:20 UTC 2019. [ 86s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:13:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:13:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5c466e67b11bb_2c16f5067c539531@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_8.0/i586 Package network:osmocom:latest/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 117s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 117s] ^ [ 117s] cc1: some warnings being treated as errors [ 117s] Makefile:501: recipe for target 'gsm_04_80.o' failed [ 117s] make[4]: *** [gsm_04_80.o] Error 1 [ 117s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 117s] Makefile:412: recipe for target 'all-recursive' failed [ 117s] make[3]: *** [all-recursive] Error 1 [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 117s] Makefile:452: recipe for target 'all-recursive' failed [ 117s] make[2]: *** [all-recursive] Error 1 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 117s] Makefile:383: recipe for target 'all' failed [ 117s] make[1]: *** [all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s] dh_auto_build: make -j1 returned exit code 2 [ 117s] debian/rules:45: recipe for target 'build' failed [ 117s] make: *** [build] Error 2 [ 117s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 117s] [ 117s] cloud121 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:13:22 UTC 2019. [ 117s] [ 117s] ### VM INTERACTION START ### [ 118s] Powering off. [ 119s] [ 95.270544] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] cloud121 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:13:25 UTC 2019. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:14:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:14:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5c466e68e459d_2c16f5067c539678@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 123s] 06 [ 123s] [ 123s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 123s] - [ 123s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 123s] 07 [ 123s] [ 123s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 123s] + [ 123s] result (UNBLOCK) = 1 [ 123s] [ 123s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 123s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 123s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 123s] make[1]: *** [override_dh_auto_test] Error 1 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] build32 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:57 UTC 2019. [ 123s] [ 123s] ### VM INTERACTION START ### [ 124s] Powering off. [ 124s] [ 108.406766] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] build32 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:13:59 UTC 2019. [ 124s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:16:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c466ee082ba9_2c16f5067c53997b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 88s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 88s] ^ [ 88s] cc1: some warnings being treated as errors [ 88s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 88s] make[4]: *** [gsm_04_80.o] Error 1 [ 88s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 88s] Makefile:424: recipe for target 'all-recursive' failed [ 88s] make[3]: *** [all-recursive] Error 1 [ 88s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 88s] Makefile:464: recipe for target 'all-recursive' failed [ 88s] make[2]: *** [all-recursive] Error 1 [ 88s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 88s] Makefile:396: recipe for target 'all' failed [ 88s] make[1]: *** [all] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] dh_auto_build: make -j1 returned exit code 2 [ 88s] debian/rules:45: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 88s] [ 88s] lamb03 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:15:44 UTC 2019. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 81.310247] sysrq: SysRq : Power Off [ 91s] [ 81.315226] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] lamb03 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:15:48 UTC 2019. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:16:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:16:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c466eff610bb_2c16f5067c540076@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 106s] 06 [ 106s] [ 106s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 106s] - [ 106s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 106s] 07 [ 106s] [ 106s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 106s] + [ 106s] result (UNBLOCK) = 1 [ 106s] [ 106s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 106s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 106s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 106s] make[1]: *** [override_dh_auto_test] Error 1 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 106s] debian/rules:45: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] lamb52 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:16:04 UTC 2019. [ 106s] [ 106s] ### VM INTERACTION START ### [ 109s] [ 99.133464] sysrq: SysRq : Power Off [ 109s] [ 99.138982] reboot: Power down [ 109s] ### VM INTERACTION END ### [ 109s] [ 109s] lamb52 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:16:08 UTC 2019. [ 109s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:16:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:16:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c466f1a27e90_2c16f5067c54016@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 127s] | #define HAVE_STRING_H 1 [ 127s] | #define HAVE_MEMORY_H 1 [ 127s] | #define HAVE_STRINGS_H 1 [ 127s] | #define HAVE_INTTYPES_H 1 [ 127s] | #define HAVE_STDINT_H 1 [ 127s] | #define HAVE_UNISTD_H 1 [ 127s] | #define HAVE_DLFCN_H 1 [ 127s] | #define LT_OBJDIR ".libs/" [ 127s] | #define STDC_HEADERS 1 [ 127s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 127s] | [ 127s] | configure: exit 0 [ 127s] [ 127s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 127s] make[1]: *** [override_dh_auto_test] Error 1 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 127s] debian/rules:45: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] lamb62 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:16:36 UTC 2019. [ 127s] [ 127s] ### VM INTERACTION START ### [ 129s] [ 116.849072] sysrq: SysRq : Power Off [ 129s] [ 116.905186] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] lamb62 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:16:40 UTC 2019. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:17:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:17:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5c466f3b5f667_2c16f5067c540357@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/i586 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 124s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 124s] ^~~~~~~~~~~~~~~~~ [ 124s] cc1: some warnings being treated as errors [ 124s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 124s] make[4]: *** [gsm_04_80.o] Error 1 [ 124s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 124s] Makefile:424: recipe for target 'all-recursive' failed [ 124s] make[3]: *** [all-recursive] Error 1 [ 124s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 124s] Makefile:464: recipe for target 'all-recursive' failed [ 124s] make[2]: *** [all-recursive] Error 1 [ 124s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 124s] Makefile:396: recipe for target 'all' failed [ 124s] make[1]: *** [all] Error 2 [ 124s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 124s] dh_auto_build: make -j1 returned exit code 2 [ 124s] debian/rules:45: recipe for target 'build' failed [ 124s] make: *** [build] Error 2 [ 124s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 124s] [ 124s] cloud137 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:07 UTC 2019. [ 124s] [ 124s] ### VM INTERACTION START ### [ 127s] [ 103.957926] sysrq: SysRq : Power Off [ 127s] [ 103.975554] reboot: Power down [ 128s] ### VM INTERACTION END ### [ 128s] [ 128s] cloud137 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:12 UTC 2019. [ 128s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:17:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:17:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c466f3c3b577_2c16f5067c5404d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 73s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 73s] ^ [ 73s] cc1: some warnings being treated as errors [ 73s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 73s] make[4]: *** [gsm_04_80.o] Error 1 [ 73s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 73s] Makefile:424: recipe for target 'all-recursive' failed [ 73s] make[3]: *** [all-recursive] Error 1 [ 73s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 73s] Makefile:464: recipe for target 'all-recursive' failed [ 73s] make[2]: *** [all-recursive] Error 1 [ 73s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 73s] Makefile:396: recipe for target 'all' failed [ 73s] make[1]: *** [all] Error 2 [ 73s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 73s] dh_auto_build: make -j1 returned exit code 2 [ 73s] debian/rules:45: recipe for target 'build' failed [ 73s] make: *** [build] Error 2 [ 73s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 73s] [ 73s] sheep82 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:17 UTC 2019. [ 73s] [ 73s] ### VM INTERACTION START ### [ 76s] [ 69.277170] sysrq: SysRq : Power Off [ 76s] [ 69.283426] reboot: Power down [ 76s] ### VM INTERACTION END ### [ 76s] [ 76s] sheep82 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:21 UTC 2019. [ 76s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:17:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:17:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c466f3d7a674_2c16f5067c5405f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 58s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 58s] ^~~~~~~~~~~~~~~~~ [ 58s] cc1: some warnings being treated as errors [ 58s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 58s] make[4]: *** [gsm_04_80.o] Error 1 [ 58s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 58s] Makefile:424: recipe for target 'all-recursive' failed [ 58s] make[3]: *** [all-recursive] Error 1 [ 58s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 58s] Makefile:464: recipe for target 'all-recursive' failed [ 58s] make[2]: *** [all-recursive] Error 1 [ 58s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 58s] Makefile:396: recipe for target 'all' failed [ 58s] make[1]: *** [all] Error 2 [ 58s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 58s] dh_auto_build: make -j1 returned exit code 2 [ 58s] debian/rules:45: recipe for target 'build' failed [ 58s] make: *** [build] Error 2 [ 58s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 58s] [ 58s] build71 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:33 UTC 2019. [ 58s] [ 58s] ### VM INTERACTION START ### [ 61s] [ 53.419697] sysrq: SysRq : Power Off [ 61s] [ 53.421280] reboot: Power down [ 61s] ### VM INTERACTION END ### [ 61s] [ 61s] build71 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:37 UTC 2019. [ 61s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c466f594803e_2c16f5067c540674@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 87s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 87s] ^~~~~~~~~~~~~~~~~ [ 87s] cc1: some warnings being treated as errors [ 87s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 87s] make[4]: *** [gsm_04_80.o] Error 1 [ 87s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 87s] Makefile:424: recipe for target 'all-recursive' failed [ 87s] make[3]: *** [all-recursive] Error 1 [ 87s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 87s] Makefile:464: recipe for target 'all-recursive' failed [ 87s] make[2]: *** [all-recursive] Error 1 [ 87s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 87s] Makefile:396: recipe for target 'all' failed [ 87s] make[1]: *** [all] Error 2 [ 87s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 87s] dh_auto_build: make -j1 returned exit code 2 [ 87s] debian/rules:45: recipe for target 'build' failed [ 87s] make: *** [build] Error 2 [ 87s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 87s] [ 87s] lamb26 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:42 UTC 2019. [ 87s] [ 87s] ### VM INTERACTION START ### [ 90s] [ 79.672745] sysrq: SysRq : Power Off [ 90s] [ 79.678318] reboot: Power down [ 90s] ### VM INTERACTION END ### [ 90s] [ 90s] lamb26 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:17:45 UTC 2019. [ 90s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:00 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c466f59b23c9_2c16f5067c54078f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/armv7l Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 214s] msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); [ 214s] ^~~~~~~~~~~~~~~~~ [ 214s] cc1: some warnings being treated as errors [ 214s] Makefile:487: recipe for target 'gsm_04_80.o' failed [ 214s] make[4]: *** [gsm_04_80.o] Error 1 [ 214s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/src/libmsc' [ 214s] Makefile:450: recipe for target 'all-recursive' failed [ 214s] make[3]: *** [all-recursive] Error 1 [ 214s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/src' [ 214s] Makefile:525: recipe for target 'all-recursive' failed [ 214s] make[2]: *** [all-recursive] Error 1 [ 214s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 214s] Makefile:434: recipe for target 'all' failed [ 214s] make[1]: *** [all] Error 2 [ 214s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 214s] dh_auto_build: make -j1 returned exit code 2 [ 214s] debian/rules:13: recipe for target 'build' failed [ 214s] make: *** [build] Error 2 [ 214s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 214s] [ 214s] armbuild02 failed "build openbsc_1.1.0.20190121.dsc" at Tue Jan 22 01:17:46 UTC 2019. [ 214s] [ 215s] ### VM INTERACTION START ### [ 218s] [ 184.562091] SysRq : Power Off [ 218s] [ 184.568828] reboot: Power down [ 218s] ### VM INTERACTION END ### [ 218s] [ 218s] armbuild02 failed "build openbsc_1.1.0.20190121.dsc" at Tue Jan 22 01:17:49 UTC 2019. [ 218s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c466f747293c_2c16f5067c541038@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 83s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 83s] ^~~~~~~~~~~~~~~~~ [ 83s] cc1: some warnings being treated as errors [ 83s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 83s] make[4]: *** [gsm_04_80.o] Error 1 [ 83s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 83s] Makefile:424: recipe for target 'all-recursive' failed [ 83s] make[3]: *** [all-recursive] Error 1 [ 83s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 83s] Makefile:464: recipe for target 'all-recursive' failed [ 83s] make[2]: *** [all-recursive] Error 1 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 83s] Makefile:396: recipe for target 'all' failed [ 83s] make[1]: *** [all] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] dh_auto_build: make -j1 returned exit code 2 [ 83s] debian/rules:45: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] lamb61 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:04 UTC 2019. [ 83s] [ 83s] ### VM INTERACTION START ### [ 86s] [ 75.756735] sysrq: SysRq : Power Off [ 86s] [ 75.765211] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] lamb61 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:08 UTC 2019. [ 87s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c466f7569a19_2c16f5067c5411a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 123s] | #define HAVE_STRING_H 1 [ 123s] | #define HAVE_MEMORY_H 1 [ 123s] | #define HAVE_STRINGS_H 1 [ 123s] | #define HAVE_INTTYPES_H 1 [ 123s] | #define HAVE_STDINT_H 1 [ 123s] | #define HAVE_UNISTD_H 1 [ 123s] | #define HAVE_DLFCN_H 1 [ 123s] | #define LT_OBJDIR ".libs/" [ 123s] | #define STDC_HEADERS 1 [ 123s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 123s] | [ 123s] | configure: exit 0 [ 123s] [ 123s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 123s] make[1]: *** [override_dh_auto_test] Error 1 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:21 UTC 2019. [ 123s] [ 123s] ### VM INTERACTION START ### [ 127s] [ 114.847617] sysrq: SysRq : Power Off [ 127s] [ 114.861881] reboot: Power down [ 127s] ### VM INTERACTION END ### [ 127s] [ 127s] lamb54 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:26 UTC 2019. [ 127s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c466f75cb2b0_2c16f5067c54122@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 105s] 06 [ 105s] [ 105s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 105s] - [ 105s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 105s] 07 [ 105s] [ 105s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 105s] + [ 105s] result (UNBLOCK) = 1 [ 105s] [ 105s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 105s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 105s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 105s] make[1]: *** [override_dh_auto_test] Error 1 [ 105s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 105s] debian/rules:45: recipe for target 'build' failed [ 105s] make: *** [build] Error 2 [ 105s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 105s] [ 105s] lamb15 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:23 UTC 2019. [ 105s] [ 105s] ### VM INTERACTION START ### [ 108s] [ 98.527837] sysrq: SysRq : Power Off [ 108s] [ 98.535460] reboot: Power down [ 109s] ### VM INTERACTION END ### [ 109s] [ 109s] lamb15 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:28 UTC 2019. [ 109s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c466f763f567_2c16f5067c54133e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 117s] 06 [ 117s] [ 117s] -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 117s] - [ 117s] MESSAGE to BSS at 0x01020304:1111, msg length 1 [ 117s] 07 [ 117s] [ 117s] +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 [ 117s] + [ 117s] result (UNBLOCK) = 1 [ 117s] [ 117s] PROCESSING ALIVE_ACK from 0x01020304:1111 [ 117s] 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) [ 117s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 117s] make[1]: *** [override_dh_auto_test] Error 1 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s] debian/rules:45: recipe for target 'build' failed [ 117s] make: *** [build] Error 2 [ 117s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 117s] [ 117s] lamb57 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:13 UTC 2019. [ 117s] [ 117s] ### VM INTERACTION START ### [ 120s] [ 109.208459] sysrq: SysRq : Power Off [ 120s] [ 109.214291] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb57 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:17 UTC 2019. [ 120s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c466f94f1b30_2c16f5067c54142a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 124s] | #define HAVE_STRING_H 1 [ 124s] | #define HAVE_MEMORY_H 1 [ 124s] | #define HAVE_STRINGS_H 1 [ 124s] | #define HAVE_INTTYPES_H 1 [ 124s] | #define HAVE_STDINT_H 1 [ 124s] | #define HAVE_UNISTD_H 1 [ 124s] | #define HAVE_DLFCN_H 1 [ 124s] | #define LT_OBJDIR ".libs/" [ 124s] | #define STDC_HEADERS 1 [ 124s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 124s] | [ 124s] | configure: exit 0 [ 124s] [ 124s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 124s] make[1]: *** [override_dh_auto_test] Error 1 [ 124s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 124s] debian/rules:45: recipe for target 'build' failed [ 124s] make: *** [build] Error 2 [ 124s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 124s] [ 124s] lamb05 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:45 UTC 2019. [ 124s] [ 124s] ### VM INTERACTION START ### [ 128s] [ 117.286331] sysrq: SysRq : Power Off [ 128s] [ 117.296467] reboot: Power down [ 128s] ### VM INTERACTION END ### [ 128s] [ 128s] lamb05 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:49 UTC 2019. [ 128s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c466f955556e_2c16f5067c541525@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 117s] | #define HAVE_STRING_H 1 [ 117s] | #define HAVE_MEMORY_H 1 [ 117s] | #define HAVE_STRINGS_H 1 [ 117s] | #define HAVE_INTTYPES_H 1 [ 117s] | #define HAVE_STDINT_H 1 [ 117s] | #define HAVE_UNISTD_H 1 [ 117s] | #define HAVE_DLFCN_H 1 [ 117s] | #define LT_OBJDIR ".libs/" [ 117s] | #define STDC_HEADERS 1 [ 117s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 117s] | [ 117s] | configure: exit 0 [ 117s] [ 117s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 117s] make[1]: *** [override_dh_auto_test] Error 1 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s] debian/rules:45: recipe for target 'build' failed [ 117s] make: *** [build] Error 2 [ 117s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 117s] [ 117s] wildcard2 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:30 UTC 2019. [ 117s] [ 117s] ### VM INTERACTION START ### [ 120s] [ 101.914578] sysrq: SysRq : Power Off [ 120s] [ 101.917614] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] wildcard2 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:18:34 UTC 2019. [ 120s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c466f95b6174_2c16f5067c54165c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 114s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 114s] ^~~~~~~~~~~~~~~~~ [ 114s] cc1: some warnings being treated as errors [ 114s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 114s] make[4]: *** [gsm_04_80.o] Error 1 [ 114s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 114s] Makefile:424: recipe for target 'all-recursive' failed [ 114s] make[3]: *** [all-recursive] Error 1 [ 114s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 114s] Makefile:464: recipe for target 'all-recursive' failed [ 114s] make[2]: *** [all-recursive] Error 1 [ 114s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 114s] Makefile:396: recipe for target 'all' failed [ 114s] make[1]: *** [all] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 114s] dh_auto_build: make -j1 returned exit code 2 [ 114s] debian/rules:45: recipe for target 'build' failed [ 114s] make: *** [build] Error 2 [ 114s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 114s] [ 114s] build32 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:33 UTC 2019. [ 114s] [ 114s] ### VM INTERACTION START ### [ 117s] [ 102.522565] sysrq: SysRq : Power Off [ 117s] [ 102.546126] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] build32 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:37 UTC 2019. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:18:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:18:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c466f9640751_2c16f5067c5417b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-msc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 95s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 95s] ^~~~~~~~~~~~~~~~~ [ 95s] cc1: some warnings being treated as errors [ 95s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 95s] make[4]: *** [gsm_04_80.o] Error 1 [ 95s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 95s] Makefile:424: recipe for target 'all-recursive' failed [ 95s] make[3]: *** [all-recursive] Error 1 [ 95s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 95s] Makefile:464: recipe for target 'all-recursive' failed [ 95s] make[2]: *** [all-recursive] Error 1 [ 95s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 95s] Makefile:396: recipe for target 'all' failed [ 95s] make[1]: *** [all] Error 2 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] dh_auto_build: make -j1 returned exit code 2 [ 95s] debian/rules:45: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb57 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:37 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 86.600533] sysrq: SysRq : Power Off [ 98s] [ 86.606952] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb57 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:18:40 UTC 2019. [ 98s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:19:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:19:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c466fb227c53_2c16f5067c54195d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 81s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 81s] ^~~~~~~~~~~~~~~~~ [ 81s] cc1: some warnings being treated as errors [ 81s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 81s] make[4]: *** [gsm_04_80.o] Error 1 [ 81s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 81s] Makefile:424: recipe for target 'all-recursive' failed [ 81s] make[3]: *** [all-recursive] Error 1 [ 81s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 81s] Makefile:464: recipe for target 'all-recursive' failed [ 81s] make[2]: *** [all-recursive] Error 1 [ 81s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 81s] Makefile:396: recipe for target 'all' failed [ 81s] make[1]: *** [all] Error 2 [ 81s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 81s] dh_auto_build: make -j1 returned exit code 2 [ 81s] debian/rules:45: recipe for target 'build' failed [ 81s] make: *** [build] Error 2 [ 81s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 81s] [ 81s] lamb10 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:19:07 UTC 2019. [ 81s] [ 81s] ### VM INTERACTION START ### [ 85s] [ 72.878276] sysrq: SysRq : Power Off [ 85s] [ 72.885129] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] lamb10 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:19:11 UTC 2019. [ 85s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:19:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:19:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5c466fb2a4e6d_2c16f5067c542061@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-sgsn failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 139s] | #define HAVE_STRING_H 1 [ 139s] | #define HAVE_MEMORY_H 1 [ 139s] | #define HAVE_STRINGS_H 1 [ 139s] | #define HAVE_INTTYPES_H 1 [ 139s] | #define HAVE_STDINT_H 1 [ 139s] | #define HAVE_UNISTD_H 1 [ 139s] | #define HAVE_DLFCN_H 1 [ 139s] | #define LT_OBJDIR ".libs/" [ 139s] | #define STDC_HEADERS 1 [ 139s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 139s] | [ 139s] | configure: exit 0 [ 139s] [ 139s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 139s] make[1]: *** [override_dh_auto_test] Error 1 [ 139s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 139s] debian/rules:45: recipe for target 'build' failed [ 139s] make: *** [build] Error 2 [ 139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 139s] [ 139s] lamb51 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:19:31 UTC 2019. [ 139s] [ 139s] ### VM INTERACTION START ### [ 142s] [ 131.135252] sysrq: SysRq : Power Off [ 142s] [ 131.143674] reboot: Power down [ 142s] ### VM INTERACTION END ### [ 142s] [ 142s] lamb51 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:19:35 UTC 2019. [ 142s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:19:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:19:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5c466fb322169_2c16f5067c54216@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 80s] | #define HAVE_STRING_H 1 [ 80s] | #define HAVE_MEMORY_H 1 [ 80s] | #define HAVE_STRINGS_H 1 [ 80s] | #define HAVE_INTTYPES_H 1 [ 80s] | #define HAVE_STDINT_H 1 [ 80s] | #define HAVE_UNISTD_H 1 [ 80s] | #define HAVE_DLFCN_H 1 [ 80s] | #define LT_OBJDIR ".libs/" [ 80s] | #define STDC_HEADERS 1 [ 80s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 80s] | [ 80s] | configure: exit 0 [ 80s] [ 80s] debian/rules:65: recipe for target 'override_dh_auto_test' failed [ 80s] make[1]: *** [override_dh_auto_test] Error 1 [ 80s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 80s] debian/rules:45: recipe for target 'build' failed [ 80s] make: *** [build] Error 2 [ 80s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 80s] [ 80s] sheep82 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:19:21 UTC 2019. [ 80s] [ 80s] ### VM INTERACTION START ### [ 84s] [ 75.281471] sysrq: SysRq : Power Off [ 84s] [ 75.287527] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] sheep82 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:19:25 UTC 2019. [ 84s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:35:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:35:03 +0000 Subject: Change in osmo-msc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 01:35:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:35:05 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:35:05 +0000 Subject: Change in osmo-msc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12663 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the osmo-msc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build. Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 --- M src/libmsc/gsm_04_80.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index fb5a091..119f0e1 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -59,7 +59,7 @@ return -1; /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); -- To view, visit https://gerrit.osmocom.org/12663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:36:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:36:50 +0000 Subject: Change in openbsc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by Max. ( https://gerrit.osmocom.org/12664 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the openbsc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build. Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/64/12664/2 -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:41:05 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:41:05 +0000 Subject: Change in openbsc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3) to the change originally created by Max. ( https://gerrit.osmocom.org/12664 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the openbsc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build. Also related is commit e8cd09dd6f3378a8137afb581dcd7ed554daa24c in this repository, which removed the locally defined msgb_wrap_with_TL() definition. The libosmocore mistake should have become obvious then and there... Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/64/12664/3 -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 01:41:39 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:41:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8234?= In-Reply-To: <339320974.740.1548119031121.JavaMail.jenkins@jenkins.osmocom.org> References: <339320974.740.1548119031121.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <695008381.744.1548121299228.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:42:12 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:42:12 +0000 Subject: Change in openbsc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 01:42:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 01:42:18 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 01:42:18 +0000 Subject: Change in openbsc[master]: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12664 ) Change subject: fix build: apply msgb_wrap_with_TL() rename ...................................................................... fix build: apply msgb_wrap_with_TL() rename After libosmocore commit If1e851ac605c8d2fde3da565b0bd674ea6350c2e b27e6feb699712345373e87a48187dc622e4fa92 the openbsc master build is broken. Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build. Also related is commit e8cd09dd6f3378a8137afb581dcd7ed554daa24c in this repository, which removed the locally defined msgb_wrap_with_TL() definition. The libosmocore mistake should have become obvious then and there... Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index dc9ae23..1c08d99 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -67,29 +67,29 @@ msgb_put(msg, response_len); /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); + msgb_push_tl(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + msgb_push_tl(msg, GSM0480_CTYPE_RETURN_RESULT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); @@ -115,10 +115,10 @@ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msgb_push_tl(msg, GSM0480_CTYPE_REJECT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 01:42:35 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:42:35 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8234?= In-Reply-To: <1070929035.741.1548119145204.JavaMail.jenkins@jenkins.osmocom.org> References: <1070929035.741.1548119145204.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <65999485.745.1548121355444.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Tue Jan 22 01:43:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:43:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c46755129e20_2c16f5067c5434d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 317s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 317s] ^~~~~~~~~~~~~~~~~ [ 317s] cc1: some warnings being treated as errors [ 317s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 317s] make[4]: *** [gsm_04_80.o] Error 1 [ 317s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 317s] Makefile:424: recipe for target 'all-recursive' failed [ 317s] make[3]: *** [all-recursive] Error 1 [ 317s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 317s] Makefile:464: recipe for target 'all-recursive' failed [ 317s] make[2]: *** [all-recursive] Error 1 [ 317s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 317s] Makefile:396: recipe for target 'all' failed [ 317s] make[1]: *** [all] Error 2 [ 317s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 317s] dh_auto_build: make -j1 returned exit code 2 [ 317s] debian/rules:45: recipe for target 'build' failed [ 317s] make: *** [build] Error 2 [ 317s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 317s] [ 317s] obs-arm-2 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:43:14 UTC 2019. [ 317s] [ 317s] ### VM INTERACTION START ### [ 321s] [ 288.325065] sysrq: SysRq : Power Off [ 321s] [ 288.335205] reboot: Power down [ 321s] ### VM INTERACTION END ### [ 321s] [ 321s] obs-arm-2 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 01:43:18 UTC 2019. [ 321s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 01:48:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 01:48:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5c46769a39025_2c16f5067c54392@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 280s] gbproxy_validate_tlli({current = efe2b700, assigned = 00000000, net_vld = 1, bss_vld = 1}, efe2b700) [ 280s] Unregistering TLLI efe2b700 [ 280s] NSEI=4096 proxying BTS->SGSN (NS_BVCI=4098, NSEI=256) [ 280s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0x26c6f3 CMD=UI DATA [ 280s] Got LLC message, CRC: 26c6f3 (computed 26c6f3) [ 280s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0x1285e4 CMD=UI DATA [ 280s] Got LLC message, CRC: 1285e4 (computed 1285e4) [ 280s] ATTACH_REQ: Got TLLI afe2b700, BSSGP RAID 112-332-16464-96, old RAID 112-332-16464-96, PTMSI efe2b700 [ 280s] Updated LLC message, CRC: 1285e4 -> 1285e4 [ 280s] NSEI=4096 proxying BTS->SGSN (NS_BVCI=4098, NSEI=256) [ 280s] LLC SAPI=1 C U GEA? IOV-UI=0x000000 FCS=0x1285e4 CMD=UI DATA [ 280s] Got LLC message, CRC: 1285e4 (computed 1285e4) [ 280s] LLC SAPI=1 R U GEA? IOV-UI=0x000000 FCS=0x3ed1d2 CMD=UI DATA [ 280s] Got LLC message, CRC: 3ed1d2 (computed 3ed1d2) [ 280s] ATTACH_ACK: Got TLLI afe2b700, RAID 123-456-16464-96, new PTMSI efe2b700, IMSI 12131415161718 [ 280s] Got new PTMSI efe2b700 from SGSN, using efe2b700 for BSS [ 280s] Updated LLC message, CRC: 3ed1d2 -> 3ed1d2 [ 280s] Assigning new TLLI efe2b700 to SGSN, efe2b700 to BSS [ 280s] The TLLI has been reassigned from afe2b700 to efe2b700 [ 280s] The TLLI has been reassigned from afe2b700 to efe2b700 [ 280s] NSEI=256 proxying SGSN->BSS (NS_BVCI=4098, NSEI=4096) [ 280s] LLC SAPI=1 R U GEA? IOV-UI=0x000000 FCS=0x3ed1d2 CMD=UI DATA [ 280s] Got LLC message, CRC: 3ed1d2 (computed 3ed1d2) [ 282s] LLC SAPI=1 C U GEA? IOV-UI=0x000000[ 256.017209] sysrq: SysRq : Power Off [ 282s] [ 256.021124] reboot: Power down [ 282s] ### VM INTERACTION END ### [ 282s] [ 282s] obs-arm-4 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 01:48:48 UTC 2019. [ 282s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue Jan 22 01:50:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:50:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--disa?= =?UTF-8?Q?ble-mgcp-transcoding,--enable-smpp,?= =?UTF-8?Q?default,osmocom-master-debian9_#3691?= In-Reply-To: <780743733.736.1548118605395.JavaMail.jenkins@jenkins.osmocom.org> References: <780743733.736.1548118605395.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <83944456.747.1548121858566.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Jan 22 01:51:00 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 01:51:00 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,d?= =?UTF-8?Q?efault,osmocom-master-debian9_#3691?= In-Reply-To: <2079963533.737.1548118642739.JavaMail.jenkins@jenkins.osmocom.org> References: <2079963533.737.1548118642739.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1897115699.748.1548121860477.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Tue Jan 22 02:28:51 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 02:28:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c467ff9e4350_2c16f5067c54699b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 240s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 240s] ^~~~~~~~~~~~~~~~~ [ 241s] cc1: some warnings being treated as errors [ 241s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 241s] make[4]: *** [gsm_04_80.o] Error 1 [ 241s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 241s] Makefile:424: recipe for target 'all-recursive' failed [ 241s] make[3]: *** [all-recursive] Error 1 [ 241s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 241s] Makefile:464: recipe for target 'all-recursive' failed [ 241s] make[2]: *** [all-recursive] Error 1 [ 241s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 241s] Makefile:396: recipe for target 'all' failed [ 241s] make[1]: *** [all] Error 2 [ 241s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 241s] dh_auto_build: make -j1 returned exit code 2 [ 241s] debian/rules:45: recipe for target 'build' failed [ 241s] make: *** [build] Error 2 [ 241s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 241s] [ 241s] armbuild04 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 02:28:46 UTC 2019. [ 241s] [ 241s] ### VM INTERACTION START ### [ 244s] [ 185.821726] SysRq : Power Off [ 244s] [ 185.830284] reboot: Power down [ 244s] ### VM INTERACTION END ### [ 244s] [ 244s] armbuild04 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 02:28:49 UTC 2019. [ 244s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 02:58:16 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 02:58:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c4686e7401a4_2c16f5067c5489b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_9.0/armv7l Package network:osmocom:latest/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 149s] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); [ 149s] ^~~~~~~~~~~~~~~~~ [ 149s] cc1: some warnings being treated as errors [ 149s] Makefile:513: recipe for target 'gsm_04_80.o' failed [ 149s] make[4]: *** [gsm_04_80.o] Error 1 [ 149s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 149s] Makefile:424: recipe for target 'all-recursive' failed [ 149s] make[3]: *** [all-recursive] Error 1 [ 149s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 149s] Makefile:464: recipe for target 'all-recursive' failed [ 149s] make[2]: *** [all-recursive] Error 1 [ 149s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 149s] Makefile:396: recipe for target 'all' failed [ 149s] make[1]: *** [all] Error 2 [ 149s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 149s] dh_auto_build: make -j1 returned exit code 2 [ 149s] debian/rules:45: recipe for target 'build' failed [ 149s] make: *** [build] Error 2 [ 149s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 149s] [ 149s] armbuild01 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 02:58:10 UTC 2019. [ 149s] [ 149s] ### VM INTERACTION START ### [ 152s] [ 113.431011] SysRq : Power Off [ 152s] [ 113.434566] reboot: Power down [ 152s] ### VM INTERACTION END ### [ 152s] [ 152s] armbuild01 failed "build osmo-msc_1.3.0.dsc" at Tue Jan 22 02:58:13 UTC 2019. [ 152s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 22 04:51:07 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Jan 2019 04:51:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5c46a145e8827_2c16f5067c556844@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 300s] | configure:4760: 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 [ 300s] | configure:4763: /usr/bin/nm -B "conftest.o" [ 300s] | configure:4766: output [ 300s] | 00000000 B some_variable [ 300s] | configure:4773: result: BSD nm [ 300s] | configure:4776: checking whether ln -s works [ 300s] | configure:4780: result: yes [ 300s] | configure:4788: checking the maximum length of command line arguments [ 300s] | configure:4919: result: 1572864 [ 300s] | configure:4967: checking how to convert arm-unknown-linux-gnueabihf file names to arm-unknown-linux-gnueabihf format [ 300s] | configure:5007: result: func_convert_file_noop [ 300s] | configure:5014: checking how to convert arm-unknown-linux-gnueabihf file names to toolchain format [ 300s] | configure:5034: result: func_convert_file_noop [ 300s] | configure:5041: checking for /usr/bin/ld option to reload object files [ 300s] | configure:5048: result: -r [ 300s] | configure:5122: checking for objdump [ 300s] | configure:5138: found /usr/bin/objdump [ 300s] | configure:5149: result: objdump [ 300s] | configure:5181: checking how to recognize dependent libraries [ 300s] | configure:5381: result: pass_all [ 300s] | configure:5466: checking for dlltool [ 300s] | configure:5496: result: no [ 300s] | configure:5526: checking how to associate runtime and link libraries [ 302s] | configure:5553: resul[ 254.231533] sysrq: SysRq : Power Off [ 302s] [ 254.233423] reboot: Power down [ 302s] ### VM INTERACTION END ### [ 302s] [ 302s] armbuild14 failed "build osmo-sgsn_1.3.0.dsc" at Tue Jan 22 04:51:03 UTC 2019. [ 302s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 22 08:05:56 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 08:05:56 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#32). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 49 files changed, 2,920 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/32 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 32 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 08:32:51 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 08:32:51 +0000 Subject: Change in osmo-bsc[master]: lchan_select: dont allow half rate EFR to be selected In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12622 ) Change subject: lchan_select: dont allow half rate EFR to be selected ...................................................................... lchan_select: dont allow half rate EFR to be selected The function lchan_select_by_chan_mode() is prone to select an half rate lchan when EFR is used, even though EFR is not defined for half-rate. Lets protect against that. Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Related: OS#3503 --- M src/osmo-bsc/lchan_select.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved Objections: Neels Hofmeyr: I would prefer this is not merged as is diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index f70ad4a..b63dcd2 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -136,8 +136,12 @@ case GSM48_CMODE_SIGN: type = GSM_LCHAN_SDCCH; break; - case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: + /* EFR works over FR channels only */ + if (!full_rate) + return NULL; + /* fall through */ + case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_AMR: type = full_rate ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H; break; -- To view, visit https://gerrit.osmocom.org/12622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I961d9aaba81424053ab1dc04ce7799e716af4cd8 Gerrit-Change-Number: 12622 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 09:26:12 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 09:26:12 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Do not unsolicitedly select a TCH/F In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12623 ) Change subject: lchan_select: Do not unsolicitedly select a TCH/F ...................................................................... lchan_select: Do not unsolicitedly select a TCH/F The function lchan_select_by_type() will unsolicitedly select a TCH/F when it is asked for a TCH/H but a TCH/H is not available. This behavior is presumably a leftover from before the split. Now every fallback to another rate must be agreed with the MSC in advance, it is a spec violation to silently fallback to TCH/F when asked for a TCH/H. Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Related: OS#3503 --- M src/osmo-bsc/lchan_select.c 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index b63dcd2..0f4dd65 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -207,12 +207,6 @@ break; case GSM_LCHAN_TCH_H: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); - /* If we don't have TCH/H available, fall-back to TCH/F */ - if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F); - if (lchan) - type = GSM_LCHAN_TCH_F; - } /* No dedicated TCH/x available -- try fully dynamic * TCH/F_TCH/H_PDCH */ if (!lchan) { @@ -222,17 +216,6 @@ if (lchan) type = GSM_LCHAN_TCH_H; } - /* - * No need to check TCH/F_TCH/H_PDCH channels for TCH/F: - * if no TCH/H was available, neither will be TCH/F. - */ - /* If we don't have TCH/F either, try dynamic TCH/F_PDCH */ - if (!lchan) { - lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, - GSM_PCHAN_TCH_F); - if (lchan) - type = GSM_LCHAN_TCH_F; - } break; default: LOGP(DRLL, LOGL_ERROR, "Unknown gsm_chan_t %u\n", type); -- To view, visit https://gerrit.osmocom.org/12623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I057e70bc81b3dac470f6d1d2a37533ec3a7a79d0 Gerrit-Change-Number: 12623 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:13:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 10:13:42 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status ...................................................................... Patch Set 4: Code-Review-1 (1 comment) Looks good, except for the indentation. https://gerrit.osmocom.org/#/c/12486/4/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12486/4/src/osmo-bsc/assignment_fsm.c at 181 PS4, Line 181: addr_local_p, sc_ptr, NULL, lcls_get_status(conn)); The indentation is not consistent, missing space before chosen_channel, and lchan->encr.alg_id. -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 10:13:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:52:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:52:47 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 32: Code-Review+1 (8 comments) In general, looks good. Just a few cosmetic issues and more or less important note about SS/USSD. https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/gsm_09_11.c at 347 PS32, Line 347: SGSAP_SERV_IND_SMS Hmm, according to TS 129.118, section 9.4.17, CS call indicator is used for all the CS services except the SMS. So, I think we should use SGSAP_SERV_IND_CS_CALL here. https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/gsm_subscriber.c File src/libmsc/gsm_subscriber.c: https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/gsm_subscriber.c at 134 PS32, Line 134: LOGP This change seems to be unrelated. https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_iface.c at 66 PS32, Line 66: struct sgs_state; : struct sgs_connection; You're referencing both structures a few lines above, so it looks like we don't need this forward declaration? Otherwise it should have been placed *before* the first reference(s). https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_iface.c at 113 PS32, Line 113: complete_layer3_type Alternatively: conn->complete_layer3_type = mt ? COMPLETE_LAYER3_PAGING_RESP : COMPLETE_LAYER3_CM_SERVICE_REQ; ran_conn_update_id(conn); or you could move ran_conn_update_id() outside the 'if'. https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_iface.c at 335 PS32, Line 335: vlr_subscr_put Where is the corresponding vlr_subscr_get()? Why do we need this call? https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_iface.c at 519 PS32, Line 519: osmo_hexdump(err_msg, (cosmetic) could be moved to the next line, so there would be no need to add such long spacing (\t\t\t\t\t\t...). https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_server.c File src/libmsc/sgs_server.c: https://gerrit.osmocom.org/#/c/11642/32/src/libmsc/sgs_server.c at 68 PS32, Line 68: /* do we have to notify the SGs code about this? */ Should be marked with TODO or FIXME. https://gerrit.osmocom.org/#/c/11642/32/src/libvlr/vlr_sgs_fsm.c File src/libvlr/vlr_sgs_fsm.c: https://gerrit.osmocom.org/#/c/11642/32/src/libvlr/vlr_sgs_fsm.c at 279 PS32, Line 279: S(SGS_UE_E_RX_LU_FROM_MME) | S(SGS_UE_E_TX_PAGING) I think it would be better to have each state / event on a separate line, like we do in osmo-bsc. This would improve readability and make the git diff cleaner when adding new states / events... Example: https://git.osmocom.org/osmo-bsc/tree/src/osmo-bsc/lchan_fsm.c#n1125 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 32 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 22 Jan 2019 10:52:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:56:34 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if.py: use relative import for UDPLink Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12672 Change subject: trx/ctrl_if.py: use relative import for UDPLink ...................................................................... trx/ctrl_if.py: use relative import for UDPLink Change-Id: If4b00f6332461d3c37cde5a1f724906ca3d3a30f --- M python/trx/ctrl_if.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/72/12672/1 diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py index fc43b7f..1a7c0c3 100644 --- a/python/trx/ctrl_if.py +++ b/python/trx/ctrl_if.py @@ -22,7 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from grgsm.trx import UDPLink +from udp_link import UDPLink class CTRLInterface(UDPLink): def handle_rx(self, data, remote): -- To view, visit https://gerrit.osmocom.org/12672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If4b00f6332461d3c37cde5a1f724906ca3d3a30f Gerrit-Change-Number: 12672 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:56:34 +0000 Subject: Change in gr-gsm[master]: python/trx: fork RadioInterfaceUHD from RadioInterface Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12673 Change subject: python/trx: fork RadioInterfaceUHD from RadioInterface ...................................................................... python/trx: fork RadioInterfaceUHD from RadioInterface Change-Id: I1644a3f6b8da0d5f2a1a133058269e5383948fda --- M apps/grgsm_trx M python/trx/CMakeLists.txt M python/trx/__init__.py M python/trx/radio_if.py A python/trx/radio_if_uhd.py 5 files changed, 97 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/73/12673/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 5e5e3be..b911719 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -29,6 +29,7 @@ from argparse import ArgumentTypeError from gnuradio import eng_notation +from grgsm.trx import RadioInterfaceUHD from grgsm.trx import RadioInterface from grgsm.trx import Transceiver @@ -58,7 +59,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Init Radio interface - self.radio = RadioInterface(self.phy_args, self.phy_sample_rate, + self.radio = RadioInterfaceUHD(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, self.phy_rx_antenna, self.phy_tx_antenna, self.phy_freq_offset, self.bind_addr, diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index 11290f3..dbb3daa9 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -24,6 +24,7 @@ ctrl_if.py ctrl_if_bb.py radio_if.py + radio_if_uhd.py radio_if_grc.py transceiver.py dict_toggle_sign.py diff --git a/python/trx/__init__.py b/python/trx/__init__.py index 00d370b..17ff9d7 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -25,6 +25,7 @@ from ctrl_if_bb import CTRLInterfaceBB from radio_if_grc import RadioInterfaceGRC from radio_if import RadioInterface +from radio_if import RadioInterfaceUHD from transceiver import Transceiver from dict_toggle_sign import dict_toggle_sign diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 4c678e7..c4d4bd1 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # GR-GSM based transceiver -# Follow graph implementation +# Generic (device independent) flow-graph implementation # # (C) 2016-2019 by Vadim Yanitskiy # (C) 2017 by Piotr Krysik @@ -33,7 +33,6 @@ from gnuradio import eng_notation from gnuradio import digital from gnuradio import blocks -from gnuradio import uhd from gnuradio import gr from gnuradio import filter @@ -57,11 +56,6 @@ GSM_SYM_RATE = (1.0 / GSM_SYM_PERIOD_uS) * 1e6 SAMPLE_RATE = GSM_SYM_RATE * osr - # FIXME: shall be measured (automatically?) for - # particular device and particular clock rate. - # The current value is measured for USRP B2X0 at 26e6. - delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 - # Dummy freq. value that is used during initialization # basically, the DL freq. of ARFCN 0 DUMMY_FREQ = 935e6 @@ -83,6 +77,10 @@ self.ppm = phy_ppm self.freq_offset = phy_freq_offset + self.phy_args = phy_args + self.rx_antenna = phy_rx_antenna + self.tx_antenna = phy_tx_antenna + gr.top_block.__init__(self, "GR-GSM TRX") # TRX Burst Interface @@ -91,15 +89,7 @@ str(trx_base_port)) # RX path definition - self.phy_src = uhd.usrp_source(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1))) - - self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_src.set_antenna(phy_rx_antenna, 0) - self.phy_src.set_samp_rate(phy_sample_rate) - self.phy_src.set_bandwidth(650e3, 0) - self.phy_src.set_gain(phy_rx_gain) + self.phy_init_source() self.msg_to_tag_src = grgsm.msg_to_tag() @@ -115,7 +105,7 @@ # Connections self.connect( - (self.phy_src, 0), + (self._phy_src, 0), (self.msg_to_tag_src, 0)) self.connect( @@ -140,18 +130,11 @@ # TX Path Definition - self.phy_sink = uhd.usrp_sink(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1)), "packet_len") - - self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_sink.set_antenna(phy_tx_antenna, 0) - self.phy_sink.set_samp_rate(phy_sample_rate) - self.phy_sink.set_gain(self.tx_gain) + self.phy_init_sink() self.tx_time_setter = grgsm.txtime_setter( 0xffffffff, 0, 0, 0, 0, 0, - self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6) + self.phy_proc_delay + self.GSM_UL_DL_SHIFT_uS * 1e-6) self.tx_burst_proc = grgsm.preprocess_tx_burst() @@ -200,7 +183,7 @@ self.connect( (self.rotator_sink, 0), - (self.phy_sink, 0)) + (self._phy_sink, 0)) # RX & TX synchronization @@ -245,11 +228,11 @@ (self.dict_toggle_sign, 'dict_out'), (self.msg_to_tag_sink, 'msg')) + def phy_init_source(self): + raise NotImplementedError - # Some UHD devices (such as UmTRX) do start the clock - # not from 0, so it's required to reset it manually. - # Resetting UHD source will also affect the sink. - self.phy_src.set_time_now(uhd.time_spec(0.0)) + def phy_init_sink(self): + raise NotImplementedError def shutdown(self): print("[i] Shutdown Radio interface") @@ -281,9 +264,10 @@ print("[#] Shifting RX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), eng_notation.num_to_str(self.freq_offset))) - self.phy_src.set_center_freq(fc, 0) + self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.gsm_clck_ctrl.set_fc(fc) + self.phy_set_rx_freq(fc) self.rx_freq = fc def set_tx_freq(self, fc): @@ -292,16 +276,17 @@ print("[#] Shifting TX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), eng_notation.num_to_str(self.freq_offset))) - self.phy_sink.set_center_freq(fc, 0) + self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) + self.phy_set_tx_freq(fc) self.tx_freq = fc def set_rx_gain(self, gain): - self.phy_src.set_gain(gain, 0) + self.phy_set_rx_gain(gain) self.rx_gain = gain def set_tx_gain(self, gain): - self.phy_sink.set_gain(gain, 0) + self.phy_set_tx_gain(gain) self.tx_gain = gain def set_slot(self, slot, config): diff --git a/python/trx/radio_if_uhd.py b/python/trx/radio_if_uhd.py new file mode 100644 index 0000000..b431fb6 --- /dev/null +++ b/python/trx/radio_if_uhd.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# GR-GSM based transceiver +# Radio interface for UHD devices +# +# (C) 2019 by Vadim Yanitskiy +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +from gnuradio import uhd + +from radio_if import RadioInterface + +class RadioInterfaceUHD(RadioInterface): + @property + def phy_proc_delay(self): + # FIXME: shall be measured (automatically?) for + # particular device and particular clock rate. + # The current value is measured for USRP B2X0 at 26e6. + return (285.616 + 2 * self.GSM_SYM_PERIOD_uS) * 1e-6 + + def phy_init_source(self): + self._phy_src = uhd.usrp_source(self.phy_args, + uhd.stream_args(cpu_format = "fc32", + channels = range(1))) + + self._phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self._phy_src.set_antenna(self.rx_antenna, 0) + self._phy_src.set_samp_rate(self.sample_rate) + self._phy_src.set_bandwidth(650e3, 0) + self._phy_src.set_gain(self.rx_gain) + + # Some UHD devices (such as UmTRX) do start the clock + # not from 0, so it's required to reset it manually. + # Resetting UHD source will also affect the sink. + self._phy_src.set_time_now(uhd.time_spec(0.0)) + + def phy_init_sink(self): + self._phy_sink = uhd.usrp_sink(self.phy_args, + uhd.stream_args(cpu_format = "fc32", + channels = range(1)), "packet_len") + + self._phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self._phy_sink.set_antenna(self.tx_antenna, 0) + self._phy_sink.set_samp_rate(self.sample_rate) + self._phy_sink.set_gain(self.tx_gain) + + def phy_set_rx_freq(self, freq): + self._phy_src.set_center_freq(freq, 0) + + def phy_set_tx_freq(self, freq): + self._phy_sink.set_center_freq(freq, 0) + + def phy_set_rx_gain(self, gain): + self._phy_src.set_gain(gain, 0) + + def phy_set_tx_gain(self, gain): + self._phy_sink.set_gain(gain, 0) -- To view, visit https://gerrit.osmocom.org/12673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1644a3f6b8da0d5f2a1a133058269e5383948fda Gerrit-Change-Number: 12673 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:56:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:56:35 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: print type of RadioInterface Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12674 Change subject: trx/radio_if.py: print type of RadioInterface ...................................................................... trx/radio_if.py: print type of RadioInterface Change-Id: I6c1ba8546caec122cd1ea0ed87656f691abec068 --- M python/trx/radio_if.py M python/trx/radio_if_uhd.py 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/74/12674/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index c4d4bd1..0d844c0 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -60,14 +60,18 @@ # basically, the DL freq. of ARFCN 0 DUMMY_FREQ = 935e6 + # Human-readable description + def __str__(self): + return "(generic)" + def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, phy_freq_offset, trx_bind_addr, trx_remote_addr, trx_base_port): - print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" - % (trx_bind_addr, trx_base_port + 2, + print("[i] Init %s Radio interface (L:%s:%u <-> R:%s:%u)" + % (self, trx_bind_addr, trx_base_port + 2, trx_remote_addr, trx_base_port + 102)) # PHY specific variables diff --git a/python/trx/radio_if_uhd.py b/python/trx/radio_if_uhd.py index b431fb6..ef2e0ed 100644 --- a/python/trx/radio_if_uhd.py +++ b/python/trx/radio_if_uhd.py @@ -27,6 +27,10 @@ from radio_if import RadioInterface class RadioInterfaceUHD(RadioInterface): + # Human-readable description + def __str__(self): + return "UHD" + @property def phy_proc_delay(self): # FIXME: shall be measured (automatically?) for -- To view, visit https://gerrit.osmocom.org/12674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6c1ba8546caec122cd1ea0ed87656f691abec068 Gerrit-Change-Number: 12674 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:56:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:56:35 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add RadioInterface driver selection argument Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12675 Change subject: apps/grgsm_trx: add RadioInterface driver selection argument ...................................................................... apps/grgsm_trx: add RadioInterface driver selection argument Change-Id: Ic11f878c176bad16b057f25725ab0cfecc01782f --- M apps/grgsm_trx M python/trx/__init__.py 2 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/75/12675/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index b911719..7da9e06 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -29,7 +29,6 @@ from argparse import ArgumentTypeError from gnuradio import eng_notation -from grgsm.trx import RadioInterfaceUHD from grgsm.trx import RadioInterface from grgsm.trx import Transceiver @@ -58,8 +57,13 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + if argv.driver == "uhd": + from grgsm.trx.radio_if_uhd import RadioInterfaceUHD as Radio + else: + raise ValueError("Unknown RadioInterface driver '%s'" % argv.driver) + # Init Radio interface - self.radio = RadioInterfaceUHD(self.phy_args, self.phy_sample_rate, + self.radio = Radio(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, self.phy_rx_antenna, self.phy_tx_antenna, self.phy_freq_offset, self.bind_addr, @@ -111,6 +115,10 @@ # PHY specific phy_group = parser.add_argument_group("PHY parameters") + phy_group.add_argument("--driver", + dest = "driver", type = str, default = "uhd", + choices = ["uhd"], + help = "Set device driver (default %(default)s)") phy_group.add_argument("-a", "--args", dest = "args", type = str, default = "", help = "Set device arguments") diff --git a/python/trx/__init__.py b/python/trx/__init__.py index 17ff9d7..c8bddbe 100644 --- a/python/trx/__init__.py +++ b/python/trx/__init__.py @@ -23,9 +23,7 @@ from udp_link import UDPLink from ctrl_if import CTRLInterface from ctrl_if_bb import CTRLInterfaceBB -from radio_if_grc import RadioInterfaceGRC from radio_if import RadioInterface -from radio_if import RadioInterfaceUHD from transceiver import Transceiver from dict_toggle_sign import dict_toggle_sign -- To view, visit https://gerrit.osmocom.org/12675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic11f878c176bad16b057f25725ab0cfecc01782f Gerrit-Change-Number: 12675 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 10:56:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 10:56:35 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce initial LMS driver support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12676 Change subject: apps/grgsm_trx: introduce initial LMS driver support ...................................................................... apps/grgsm_trx: introduce initial LMS driver support Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 --- M apps/grgsm_trx M python/trx/CMakeLists.txt A python/trx/radio_if_lms.py 3 files changed, 82 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/76/12676/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 7da9e06..fb5a005 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -59,6 +59,8 @@ if argv.driver == "uhd": from grgsm.trx.radio_if_uhd import RadioInterfaceUHD as Radio + elif argv.driver == "lms": + from grgsm.trx.radio_if_lms import RadioInterfaceLMS as Radio else: raise ValueError("Unknown RadioInterface driver '%s'" % argv.driver) @@ -117,7 +119,7 @@ phy_group = parser.add_argument_group("PHY parameters") phy_group.add_argument("--driver", dest = "driver", type = str, default = "uhd", - choices = ["uhd"], + choices = ["uhd", "lms"], help = "Set device driver (default %(default)s)") phy_group.add_argument("-a", "--args", dest = "args", type = str, default = "", diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index dbb3daa9..697687b 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -25,6 +25,7 @@ ctrl_if_bb.py radio_if.py radio_if_uhd.py + radio_if_lms.py radio_if_grc.py transceiver.py dict_toggle_sign.py diff --git a/python/trx/radio_if_lms.py b/python/trx/radio_if_lms.py new file mode 100644 index 0000000..4585a5a --- /dev/null +++ b/python/trx/radio_if_lms.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# GR-GSM based transceiver +# Radio interface for Lime devices +# +# (C) 2019 by Vadim Yanitskiy +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import limesdr + +from radio_if import RadioInterface + +class RadioInterfaceLMS(RadioInterface): + LMS_DEV_TYPE_LIMESDR_MINI = 0x01 + LMS_DEV_TYPE_LIMENET_MICRO = 0x02 + LMS_DEV_TYPE_LIMESDR_USB = 0x03 + + # FIXME: hard-coded variables shall be replaced + # by command line arguments (or even auto-detected)! + lms_dev_serial = "1D3937DA65C85F" + lms_dev_type = LMS_DEV_TYPE_LIMESDR_MINI + lms_len_tag_name = "packet_len" + lms_dev_ch_mode = 1 + + # Human-readable description + def __str__(self): + return "LMS" + + @property # Signal processing delay of PHY + def phy_proc_delay(self): + # FIXME: the current value is measured for USRP B2X0 at 26e6, + # we should measure it for LimeSDR separately! + return (285.616 + 2 * self.GSM_SYM_PERIOD_uS) * 1e-6 + + def phy_init_source(self): + self._phy_src = limesdr.source( + self.lms_dev_serial, self.lms_dev_type, + self.lms_dev_ch_mode, 0, "") + + self._phy_src.set_sample_rate(self.sample_rate) + self._phy_src.set_gain(self.rx_gain, 0) + + def phy_init_sink(self): + self._phy_sink = limesdr.sink( + self.lms_dev_serial, self.lms_dev_type, + self.lms_dev_ch_mode, 0, "", + self.lms_len_tag_name) + + self._phy_sink.set_sample_rate(self.sample_rate) + self._phy_sink.set_gain(self.tx_gain, 0) + + def phy_set_rx_freq(self, freq): + self._phy_src.set_center_freq(freq, 0) + + def phy_set_tx_freq(self, freq): + self._phy_sink.set_center_freq(freq, 0) + + def phy_set_rx_gain(self, gain): + self._phy_src.set_gain(gain, 0) + + def phy_set_tx_gain(self, gain): + self._phy_sink.set_gain(gain, 0) -- To view, visit https://gerrit.osmocom.org/12676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 Gerrit-Change-Number: 12676 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:21:42 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:21:42 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#3). Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... bsc_vty: add features to disable specific lchans via vty In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us to mark certain lchans as disabled and check that condition while doing the channel allocation Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 4 files changed, 43 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/3 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:21:42 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:21:42 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12625 to look at the new patch set (#3). Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... assignment_fsm: fix channel allocator preferences When the MSC allocates a channel through the ASSIGNMENT REQUEST, it may ask for a TCH/H and a TCH/F at the same time and tell which of the two types it prefers. The process of channel allocation currently selects, based on the BTS, MSC and MS capabilites exactly one apropriate codec/rate (e.g. TCH/H) and then trys to allocate it. If that allocation fails, there is no way to try the second choice and the assignment fails. For example: The MSC asks for TCH/F and TCH/H, prefering TCH/F, then the channel allocator will try TCH/F and if it fails (all TCH/F are currently in use), then TCH/H is never tried. Since the BSC currently only trys the first best codec/rate that is supported it also ignores the preference. Lets fix those problems by including the preference information and both possible codec/rate settings into the channel allocation decision. Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Related: OS#3503 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 7 files changed, 363 insertions(+), 123 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/12625/3 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:21:44 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:21:44 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12677 Change subject: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request ...................................................................... abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request On rsl_rx_chan_rqd(), so far osmo-bsc tried to preferably assign the lchan type that was asked for in the RACH. Firstly, this contained a bug, and secondly, it does not make sense to heed that preference, since we do late assignment. Ignore the preference for the MS' TCH kind. We do late assignment to avoid codec mismatches. In the "old days", we would heed the MS' TCH channel kind, even if the MSC or BSC didn't actually allow or prefer that channel kind. Hence, in the presence of both TCH/F and TCH/H, the MS could ask for TCH/F (which we would grant on the MO side) and the BSC or MSC could prefer TCH/H (which we would apply on the MT side), and hence fabricate a codec mismatch. Instead, since quite some time now, we *always* assign an SDCCH first, and only later on do another Assignment to hand out a proper voice lchan that heeds the MS capability bits as well as MSC's and BSC's preferences. By completely ignoring the channel kind the MS asked for in the RACH, we also eliminate this bug in rsl_rx_chan_rqd(): - If the first "lchan_select_by_type(GSM_LCHAN_SDDCH)" fails (all SDDCH in use), we should try to fall back to any TCH instead, to serve as SDCCH. - the first "if (!lchan && lctype != GSM_LCHAN_SDCCH)" was an attempt to prefer a fallback to the lchan type the MS requested. - the remaining two "if (!lchan && lctype == GSM_LCHAN_SDCCH)" were obviously only applied if the MS asked for an SDCCH, and skipped if the type was TCH/*. - hence, missing was: if the MS asked for a TCH, to also try the *other* TCH kind that the MS did not ask for. (Example: all SDCCH in use, MS asks for TCH/F, but BSC has only TCH/H lchans; we should assign TCH/H as SDCCH, instead we said "no resources") Change-Id: Ie3684cf071751f9528183d761c588102936e498c Related: OS#3503 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/12677/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index d67573f..fd6dbdb 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1375,22 +1375,12 @@ /* check availability / allocate channel * * - First try to allocate SDCCH. - * - If SDCCH is not available, try whatever MS requested, if not SDCCH. - * - If there is still no channel available, reject channel request. + * - If SDCCH is not available, try a TCH/H (less bandwith). + * - If there is still no channel available, try a TCH/F. * - * Note: If the MS requests not TCH/H, we don't know if the phone - * supports TCH/H, so we must assign TCH/F or SDCCH. */ lchan = lchan_select_by_type(bts, GSM_LCHAN_SDCCH); - if (!lchan && lctype != GSM_LCHAN_SDCCH) { - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " - "0x%x, retrying with %s\n", - msg->lchan->ts->trx->bts->nr, - gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, - gsm_lchant_name(lctype)); - lchan = lchan_select_by_type(bts, lctype); - } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, @@ -1398,7 +1388,7 @@ gsm_lchant_name(GSM_LCHAN_TCH_H)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_H); } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, -- To view, visit https://gerrit.osmocom.org/12677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3684cf071751f9528183d761c588102936e498c Gerrit-Change-Number: 12677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:21:44 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:21:44 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12678 Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: Ifcf5d4ca2f22f7cb994dd15135cdcc9d05aa9dab Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/12678/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 791aebe..31e1c71 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1441,11 +1441,12 @@ static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_lchan *lchan; ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false) continue; dump_cb(vty, lchan); } @@ -1454,33 +1455,36 @@ } static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - dump_lchan_trx_ts(ts, vty, dump_cb); + dump_lchan_trx_ts(ts, vty, dump_cb, all); } return CMD_SUCCESS; } static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); - dump_lchan_trx(trx, vty, dump_cb); + dump_lchan_trx(trx, vty, dump_cb, all); } return CMD_SUCCESS; } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_bts *bts = NULL; @@ -1500,7 +1504,7 @@ bts = gsm_bts_num(net, bts_nr); if (argc == 1) - return dump_lchan_bts(bts, vty, dump_cb); + return dump_lchan_bts(bts, vty, dump_cb, all); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1512,7 +1516,7 @@ trx = gsm_bts_trx_num(bts, trx_nr); if (argc == 2) - return dump_lchan_trx(trx, vty, dump_cb); + return dump_lchan_trx(trx, vty, dump_cb, all); } if (argc >= 3) { ts_nr = atoi(argv[2]); @@ -1524,7 +1528,7 @@ ts = &trx->ts[ts_nr]; if (argc == 3) - return dump_lchan_trx_ts(ts, vty, dump_cb); + return dump_lchan_trx_ts(ts, vty, dump_cb, all); } if (argc >= 4) { lchan_nr = atoi(argv[3]); @@ -1541,7 +1545,7 @@ for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { bts = gsm_bts_num(net, bts_nr); - dump_lchan_bts(bts, vty, dump_cb); + dump_lchan_bts(bts, vty, dump_cb, all); } return CMD_SUCCESS; @@ -1554,17 +1558,27 @@ SHOW_STR "Display information about a logical channel\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_full_vty); + return lchan_summary(vty, argc, argv, lchan_dump_full_vty, true); } DEFUN(show_lchan_summary, show_lchan_summary_cmd, "show lchan summary [<0-255>] [<0-255>] [<0-7>] [<0-7>]", SHOW_STR "Display information about a logical channel\n" - "Short summary\n" + "Short summary (in use lchans)\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_short_vty); + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, false); +} + +DEFUN(show_lchan_all, + show_lchan_all_cmd, + "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", + SHOW_STR "Display information about a logical channel\n" + "Short summary (all lchans)\n" + BTS_TRX_TS_LCHAN_STR) +{ + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, true); } static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) @@ -5085,6 +5099,7 @@ install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); + install_element_ve(&show_lchan_all_cmd); install_element_ve(&show_subscr_conn_cmd); -- To view, visit https://gerrit.osmocom.org/12678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcf5d4ca2f22f7cb994dd15135cdcc9d05aa9dab Gerrit-Change-Number: 12678 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:23:45 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:23:45 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#4). Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/4 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:25:34 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:25:34 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/12678 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Abandoned This is duplicate -- To view, visit https://gerrit.osmocom.org/12678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ifcf5d4ca2f22f7cb994dd15135cdcc9d05aa9dab Gerrit-Change-Number: 12678 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:30:06 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:30:06 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#5). Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... bsc_vty: add features to disable specific lchans via vty In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us to mark certain lchans as disabled and check that condition while doing the channel allocation Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 4 files changed, 43 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/5 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:30:08 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12679 Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/12679/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 791aebe..31e1c71 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1441,11 +1441,12 @@ static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_lchan *lchan; ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false) continue; dump_cb(vty, lchan); } @@ -1454,33 +1455,36 @@ } static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - dump_lchan_trx_ts(ts, vty, dump_cb); + dump_lchan_trx_ts(ts, vty, dump_cb, all); } return CMD_SUCCESS; } static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); - dump_lchan_trx(trx, vty, dump_cb); + dump_lchan_trx(trx, vty, dump_cb, all); } return CMD_SUCCESS; } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_bts *bts = NULL; @@ -1500,7 +1504,7 @@ bts = gsm_bts_num(net, bts_nr); if (argc == 1) - return dump_lchan_bts(bts, vty, dump_cb); + return dump_lchan_bts(bts, vty, dump_cb, all); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1512,7 +1516,7 @@ trx = gsm_bts_trx_num(bts, trx_nr); if (argc == 2) - return dump_lchan_trx(trx, vty, dump_cb); + return dump_lchan_trx(trx, vty, dump_cb, all); } if (argc >= 3) { ts_nr = atoi(argv[2]); @@ -1524,7 +1528,7 @@ ts = &trx->ts[ts_nr]; if (argc == 3) - return dump_lchan_trx_ts(ts, vty, dump_cb); + return dump_lchan_trx_ts(ts, vty, dump_cb, all); } if (argc >= 4) { lchan_nr = atoi(argv[3]); @@ -1541,7 +1545,7 @@ for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { bts = gsm_bts_num(net, bts_nr); - dump_lchan_bts(bts, vty, dump_cb); + dump_lchan_bts(bts, vty, dump_cb, all); } return CMD_SUCCESS; @@ -1554,17 +1558,27 @@ SHOW_STR "Display information about a logical channel\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_full_vty); + return lchan_summary(vty, argc, argv, lchan_dump_full_vty, true); } DEFUN(show_lchan_summary, show_lchan_summary_cmd, "show lchan summary [<0-255>] [<0-255>] [<0-7>] [<0-7>]", SHOW_STR "Display information about a logical channel\n" - "Short summary\n" + "Short summary (in use lchans)\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_short_vty); + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, false); +} + +DEFUN(show_lchan_all, + show_lchan_all_cmd, + "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", + SHOW_STR "Display information about a logical channel\n" + "Short summary (all lchans)\n" + BTS_TRX_TS_LCHAN_STR) +{ + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, true); } static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) @@ -5085,6 +5099,7 @@ install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); + install_element_ve(&show_lchan_all_cmd); install_element_ve(&show_subscr_conn_cmd); -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 11:36:06 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 11:36:06 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 5: (9 comments) > I'm genrally worried when we introduce patches like this. I get the point, but there are already some other debug commands as well. I have now changed it into a hidden command. > Specifically regarding this patch: Why introduce a new "disabled" member? My idea was to stay away from the lchan FSM as far as possible. I am using this for test in order to simulate an occupied lchan. I fear that when I mess with the FSM, I might introduce bugs or change the behaviour in the way that the tests become less realistic. Basically I want to trick the channel allocator into thinking that the LCHAN is not suitable and the rest should work normally. https://gerrit.osmocom.org/#/c/12624/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12624/2/include/osmocom/bsc/gsm_data.h at 619 PS2, Line 619: bool disabled; > In general I dislike double-negation booleans, enabled = false is much more straightforward. [?] I intentionally use a negated boolean because when the struct is initialized with zeros it will be set to false automatically. Apart from that the normal state of the disabled flag is false. I decided not to mess with the lchan state machine or with the broken (borken?) state. I want to keep this feature away from the normal code. (This probably requires a discussion on Thursday) https://gerrit.osmocom.org/#/c/12624/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12624/1/include/osmocom/bsc/gsm_data.h at 619 PS1, Line 619: disa > As this flag is related to debug feature, it makes sense to prefix it somehow, e.g. '_shun'... i have now renamed it to "disabled". I think prefixing it with an underscore is not a good idea. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1447 PS2, Line 1447: bool all) > why do you add this 'all' flag? There are two views: One only shows the currently used lchans and one shows all available. For normal inspection it may make sens to hide the lchans that are currently not in use. For debugging i may want to see all of them, regardless of their state. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1570 PS2, Line 1570: "Short summary (in use lchans)\n" > "used lchans" [?] I have split the patch now into two so that we can handle the flag and the show problem separately. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 1578 PS2, Line 1578: "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", > why pass TS and subslot arguments to "show lchan all"? I thought it shows them all? [?] 'show lchan summary' shows only the lchans that are in use. 'show lchan summary 1 2' shows all lchans that are in use on bts 1, trx 2. If no lchan is in use, nothing is displayed. This command is already current master. And yes, I want to see all lchans, also the disabled ones. So I added 'show lchan all' that works exactly the same like the already existing 'show lchan summary' Maybe we can add some option to the existing 'show lchan summary' somehow, but I have no Idea how to do that. I also think its best when we discuss this on thursday. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/bsc_vty.c at 4796 PS2, Line 4796: DEFUN > if we merge this at all, this should be a hidden command that is now displayed to the normal user. Done https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 83 PS2, Line 83: if (lchan->fi->state == LCHAN_ST_UNUSED && lchan->disabled == false) > you can re-use LCHAN_ST_BORKEN Messing with the FSM is what I am trying to avoid. I fear that messing with the FSM might change the behavior to much. I am using this to assist integration tests and I want to simulate an occupied lchan as close as possible. https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 89 PS2, Line 89: LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s %s\n", > ws Done https://gerrit.osmocom.org/#/c/12624/2/src/osmo-bsc/lchan_select.c at 94 PS2, Line 94: > This additional logging would also be unneeded. I need this to see if the lchan was just "not suitable" (rate/mode does not match) or if it had been intentionally disabled. -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 Jan 2019 11:36:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 12:14:24 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 12:14:24 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12677 ) Change subject: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3684cf071751f9528183d761c588102936e498c Gerrit-Change-Number: 12677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 Jan 2019 12:14:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 12:16:15 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 12:16:15 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 1: Code-Review-1 I still don't like this. I could copy all the previous review here now. -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 Jan 2019 12:16:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 12:42:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 12:42:19 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#11). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 136 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/11 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 12:42:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 12:42:53 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 11: (8 comments) https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 62 PS10, Line 62: vty_out(vty, " IMEI: %s%c%s", subscr->imei, osmo_luhn(subscr->imei, 14), VTY_NEWLINE); > if the IMEI in the db were too short, we will feed -EINVAL into "%c". [?] Is this necessary? This can only happen if the user modified the SQL db file directly without osmo-hlr. Because we are *always* checking the length, before writing into it (see db_hlr.c using osmo_imei_str_valid()). I don't think we are assuming that the user may change the database directly anywhere else. With that being said, I could add a check like the following if you prefer: if (*subscr->imei) { char checksum = osmo_luhn(subscr->imei, 14); if (checksum == -EINVAL) vty_out(vty, " IMEI: %s (INVALID LENGTH!)%s", subscr->imei, VTY_NEWLINE); else vty_out(vty, " IMEI: %s%c%s", subscr->imei, checksum, VTY_NEWLINE); } https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 150 PS10, Line 150: vty_out(vty, "%% Checksum validated and stripped for search: imei = '%s'%s", id, > (I was going to complain about the checksum-digit-present-but-invalid case, but saw the vty test for [?] Like that? ;) https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/8/src/hlr_vty_subscr.c at 151 https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 167 PS10, Line 167: "Identify subscriber by MSISDN (phone number)\n" \ > here you say "14 digits" but above you explicitly allow 15. Maybe cut out the "(14 ... [?] Oh, that's a left over. Thanks, fixed! https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 176 PS10, Line 176: #define SUBSCR_UPDATE_HELP SUBSCR_HELP "Set or update subscriber data\n" > IIUC this string is used only once, so could drop the #define? [?] Done https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 547 PS10, Line 547: imei = imei_buf; > osmocom coding style is [?] Done https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty File tests/test_subscriber.vty: https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 50 PS10, Line 50: OsmoHLR# show subscriber imei 357613004448485 > so, the user entered "...485" and is told "no ...48". [?] Okay, it says now (right checksum, no entry in DB): OsmoHLR# show subscriber imei 357613004448485 % Checksum validated and stripped for search: imei = '35761300444848' % No subscriber for imei = '35761300444848' and (wrong checksum): OsmoHLR# show subscriber imei 357613004448484 % No subscriber for imei = '357613004448484' and (right checksum, with entry in DB): OsmoHLR# show subscriber imei 357613004448485 % Checksum validated and stripped for search: imei = '35761300444848' ID: 1 IMSI: 123456789023000 MSISDN: none IMEI: 357613004448485 https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 401 PS10, Line 401: > (BTW, the 'subscriber foo show' ordering was a mistake by me. [?] OK, changed to "show subscriber foo" ordering. https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty at 407 PS10, Line 407: > also have a valid checksum case plz [?] Done -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Tue, 22 Jan 2019 12:42:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 12:53:27 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 12:53:27 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 5: Code-Review-1 (1 comment) Thanks for splitting away the other changes! Now for the "disabled" feature... https://gerrit.osmocom.org/#/c/12624/5/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12624/5/include/osmocom/bsc/gsm_data.h at 619 PS5, Line 619: bool disabled; > Messing with the FSM is what I am trying to avoid. ok, I understand. It makes sense from the distance, but in my point of view the lchan FSM is designed to completely wipe its state when it goes to UNUSED. So as soon as we go back out of the broken state, things will be perfectly the same as before. Also in the ttcn3 tests, IIUC, the RSL and OML re-connect for each test case, so the FSM instances will anyway be completely blown away and re-initialized between test cases. I am asking myself whether I am bikeshedding on this; I really don't want to generate more work for you than necessary ... ... no, it is better to avoid introducing a new flag: this flag may have to be checked in numerous conditions all around the code base. Where ever we check the lchan state, we may have to add a side check for the "disabled" flag. We should keep the lchan state as the single place to indicate lchan use and usability. I made this kind of mistake with introducing dynamic timeslots: I wanted to avoid messing with the ts->pchan, so instead of re-using the ts->pchan as the single place to indicate the current ts type, I added more flags next to it, to be checked in case of a dynamic ts. That rippled all over the bts and bsc code base and a lot of bugs had to be fixed in a lot of if-statements that I had overlooked in the first patches, even months and years later. To implement changing the lchan FSM to the broken state: - we may have to add a transition from the broken state back to "unused", or you may decide to instead completely re-allocate the lchan fsm instance. - The vty command should probably only change to broken if the lchan is currently UNUSED. (at least for now, to avoid complexity.) - Besides adding a vty command to place lchans *in* the broken state (for testing), we also allow *removing* the broken state, which might even be useful for manual recovery in tight situations like rhizomatica had back in the days. So I would argue to keep that vty command public. Let me know if I should help with that, since designing that stuff is still fresh in my mind I should be comparatively quick with implementing. (though I should probably stick with inter-MSC) -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 Jan 2019 12:53:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 13:24:26 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 13:24:26 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#33). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 49 files changed, 2,939 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/33 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 33 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 13:40:40 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 Jan 2019 13:40:40 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 33: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 33 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 22 Jan 2019 13:40:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 13:47:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 13:47:31 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at a351 PS4, Line 351: noticing a bug in this code path: it is leaving the assignment fi allocated. maybe we can... https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 495 PS4, Line 495: if (check_for_existing_lchan(conn)) ...maybe we can deallocate the assignment.fi in this if condition's body -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 Jan 2019 13:47:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 13:50:35 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 Jan 2019 13:50:35 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h at 121 PS4, Line 121: struct channel_mode_and_rate ch_mode_rate_alt; Are there really only two possible mode,rate combinations? In my idea for this, we would call lchan_select() from that loop that iterates all possible mode,rate combinations. It seems odd to just collect two of the possible combinations and try to pick those only later. Maybe there's something I'm not seeing, might be good to look at it together, in person. -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 Jan 2019 13:50:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:04:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:04:37 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#12). Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty M tests/test_subscriber.vty.sql 4 files changed, 152 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/12 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:04:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:04:37 +0000 Subject: Change in osmo-hlr[master]: VTY tests: fill DB before running test Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12680 Change subject: VTY tests: fill DB before running test ...................................................................... VTY tests: fill DB before running test Create a test_subscriber.vty.sql file with a dummy entry that has the ID 100. All entries created in test_subscriber.vty have an ID > 100 now. This will be used in follow-up commit [1] to create a database entry with an invalid IMEI value to test the related error handling code path (that entry could not be created through the VTY). [1]: change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Related: OS#3733 Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e --- M tests/Makefile.am M tests/test_subscriber.vty A tests/test_subscriber.vty.sql 3 files changed, 65 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/80/12680/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index e07749c..4da8ab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,6 +56,8 @@ # make vty-test U=-u vty-test: -rm -f $(VTY_TEST_DB) + sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql + sqlite3 $(VTY_TEST_DB) < $(srcdir)/test_subscriber.vty.sql osmo_verify_transcript_vty.py -v \ -n OsmoHLR -p 4258 \ -r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \ diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index 8677c9b..d310eb3 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -29,15 +29,15 @@ OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' -OsmoHLR# subscriber id 1 show -% No subscriber for id = '1' +OsmoHLR# subscriber id 101 show +% No subscriber for id = '101' OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' OsmoHLR# show subscriber imsi 123456789023000 % No subscriber for imsi = '123456789023000' -OsmoHLR# show subscriber id 1 -% No subscriber for id = '1' +OsmoHLR# show subscriber id 101 +% No subscriber for id = '101' OsmoHLR# show subscriber msisdn 12345 % No subscriber for msisdn = '12345' @@ -50,16 +50,16 @@ OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber msisdn 12345 show @@ -69,15 +69,15 @@ % Updated subscriber IMSI='123456789023000' to MSISDN='12345' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 12345 -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 12345 OsmoHLR# subscriber msisdn 12345 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 12345 @@ -91,26 +91,26 @@ OsmoHLR# subscriber msisdn 423 show % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 % Updated subscriber IMSI='123456789023000' to MSISDN='423' OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 @@ -141,7 +141,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g xor ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: XOR @@ -149,39 +149,39 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 @@ -189,63 +189,63 @@ OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee +OsmoHLR# subscriber id 101 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee +OsmoHLR# subscriber id 101 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa +OsmoHLR# subscriber id 101 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX +OsmoHLR# subscriber id 101 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g none -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g none +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 @@ -275,7 +275,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -286,7 +286,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -296,13 +296,13 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -313,7 +313,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -324,7 +324,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -336,7 +336,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -344,9 +344,9 @@ OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 -OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 @@ -361,14 +361,14 @@ OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' -OsmoHLR# subscriber id 1 show -% No subscriber for id = '1' +OsmoHLR# subscriber id 101 show +% No subscriber for id = '101' OsmoHLR# subscriber msisdn 423 show % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none diff --git a/tests/test_subscriber.vty.sql b/tests/test_subscriber.vty.sql new file mode 100644 index 0000000..ff167aa --- /dev/null +++ b/tests/test_subscriber.vty.sql @@ -0,0 +1,3 @@ +-- Dummy entry with ID=100 gives all subscribers created in the VTY test an +-- ID > 100, so we can pre-fill the database with IDs < 100. +INSERT INTO subscriber (id, imsi) VALUES(100, '000000000000100'); -- To view, visit https://gerrit.osmocom.org/12680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e Gerrit-Change-Number: 12680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:06:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:06:03 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 12: (1 comment) https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c at 62 PS10, Line 62: if (*subscr->imei) { > Is this necessary? This can only happen if the user modified the SQL db file directly without osmo-h [?] As discussed in the chat, the check above is implemented now - together with a test case. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Tue, 22 Jan 2019 14:06:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:08:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 22 Jan 2019 14:08:04 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12486 to look at the new patch set (#5). Change subject: LCLS: use libosmocore function to add status ...................................................................... LCLS: use libosmocore function to add status * use gsm0808_create_ass_compl2() to add BSS Status IE to Assignment Complete message * drop local helpers Depends-on: (libosmocore) I547c6b8707123aa8c1ef636db88908df112d90a4 Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Related: OS#2487 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 3 files changed, 4 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/12486/5 -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:11:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:11:21 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 14:11:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:41:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:41:38 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 14:41:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:43:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 22 Jan 2019 14:43:57 +0000 Subject: Change in osmo-hlr[master]: docs: running: document --db-upgrade In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade ...................................................................... docs: running: document --db-upgrade Related: OS#3759 Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: osmith: Verified Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index ad89974..ff75c7f 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,7 +5,7 @@ === SYNOPSIS -*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-U] [-V] === OPTIONS @@ -38,6 +38,11 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. +*-U, --db-upgrade*:: + Allow HLR database schema upgrades. If OsmoHLR was updated and + requires a newer database schema, it will refuse to start unless + this option is specified. The updated database can not be + downgraded, make backups as necessary. *-V, --version*:: Print the compile-time version number of the OsmoHLR program -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:44:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Jan 2019 14:44:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12681 Change subject: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing ...................................................................... MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing The testcase TC_lu_and_mt_sms_paging_and_nothing is currently using an IMSI that ends on 43. The same IMSI is used by TC_mo_cc_bssmap_clear as well. Since TC_lu_and_mt_sms_paging_and_nothing is running before TC_mo_cc_bssmap_clear, the re-use of the IMSI triggers the MSC to continue the paging procedure. The MSC then eventually tries to deliver the SMS from TC_lu_and_mt_sms_paging_and_nothing. This will disturb the execution of TC_mo_cc_bssmap_clear, which then fails. Lets make sure that TC_lu_and_mt_sms_paging_and_nothing uses an individual IMSI that is never used again throught the execution of the testsuite. Change-Id: I66f8310981078dd032c47fcc97810944cf0c856f Related: OS#3762 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/12681/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index b72c580..a8f37bd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2071,7 +2071,7 @@ var BSC_ConnHdlrPars pars; var BSC_ConnHdlr vc_conn; f_init(); - pars := f_init_pars(43); + pars := f_init_pars(1843); vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_and_nothing), pars); f_sleep(2.0); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); -- To view, visit https://gerrit.osmocom.org/12681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66f8310981078dd032c47fcc97810944cf0c856f Gerrit-Change-Number: 12681 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:51:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:51:43 +0000 Subject: Change in libosmocore[master]: WIP: Work around bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12643 ) Change subject: WIP: Work around bogus gcc-8.2 array-bounds warning/error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec Gerrit-Change-Number: 12643 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 22 Jan 2019 14:51:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:52:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:52:33 +0000 Subject: Change in libosmocore[master]: Work around bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12643 to look at the new patch set (#2). Change subject: Work around bogus gcc-8.2 array-bounds warning/error ...................................................................... Work around bogus gcc-8.2 array-bounds warning/error gcc-8.2 is printing the following warning, which is an error when used -Werror like our --enable-werror: In file included from gprs_bssgp.c:34: In function ?tl16v_put?, inlined from ?tvlv_put.part.3? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_push? at ../../include/osmocom/gsm/tlv.h:386:2, inlined from ?bssgp_tx_dl_ud? at gprs_bssgp.c:1162:4: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? forming offset [12, 130] is out of the bounds [0, 11] of object ?mi? with type ?uint8_t[11]? {aka ?unsigned char[11]?} [-Werror=array-bounds] memcpy(buf, val, len); Where "130" seems to be the maximum value of uint8_t, shifted right one + 2. But even as we use strnlen() with "16" as maximum upper bound, gcc still believes there's a way that the return value of gsm48_generate_mid_from_imsi() could be 130. In fact, even the newly-added OSMO_ASSERT() inside gsm48_generate_mid() doesn't help and gcc still insists there is a problem :( Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec --- M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/12643/2 -- To view, visit https://gerrit.osmocom.org/12643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec Gerrit-Change-Number: 12643 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:52:36 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:52:36 +0000 Subject: Change in libosmocore[master]: Work around bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12643 ) Change subject: Work around bogus gcc-8.2 array-bounds warning/error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec Gerrit-Change-Number: 12643 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 22 Jan 2019 14:52:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:53:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:53:43 +0000 Subject: Change in libosmocore[master]: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12642 ) Change subject: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 Gerrit-Change-Number: 12642 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 22 Jan 2019 14:53:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:53:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:53:46 +0000 Subject: Change in libosmocore[master]: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12642 ) Change subject: gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits ...................................................................... gsm0408_test: Fix IMEI-SV related tests to use no more than 16 digits The IMEI-SV is speified as a 16 digit number: 14 digits of IMEI plus two digits of software version. Let's not try to feed 18 digit long numbers into our functions, as the resulting behavior is unspecified. Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 16 insertions(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 6902e8e..2d60b84 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -422,17 +422,17 @@ }, { .mi_type = GSM_MI_TYPE_IMEISV, - .mi_str = "987654321098765432", - .mi_name = "IMEI-SV-987654321098765432", - .expect_mi_tlv_hex = "170a937856341290785634f2", + .mi_str = "9876543210987654", + .mi_name = "IMEI-SV-9876543210987654", + .expect_mi_tlv_hex = "17099378563412907856f4", }, { .mi_type = GSM_MI_TYPE_IMEISV, - .mi_str = "987654321098765432", - .mi_name = "IMEI-SV-987654321098765432", - .expect_mi_tlv_hex = "170a937856341290785634f2", - .str_size = 16, - .expect_str = "987654321098765", + .mi_str = "9876543210987654", + .mi_name = "IMEI-SV-9876543210987654", + .expect_mi_tlv_hex = "17099378563412907856f4", + .str_size = 17, + .expect_str = "9876543210987654", }, { /* gsm48 treats TMSI as decimal string */ diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 8f6630b..0bd101d 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -40,14 +40,14 @@ -> MI-TLV-hex='17089a78563412907856' -> MI-str="987654321098765" rc=16 -> MI-name="IMEI-987654321098765" -- IMEI-SV 987654321098765432 - -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765432" rc=19 - -> MI-name="IMEI-SV-987654321098765432" -- IMEI-SV 987654321098765432 - -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765" rc=16 - -> MI-name="IMEI-SV-987654321098765432" +- IMEI-SV 9876543210987654 + -> MI-TLV-hex='17099378563412907856f4' + -> MI-str="9876543210987654" rc=17 + -> MI-name="IMEI-SV-9876543210987654" +- IMEI-SV 9876543210987654 + -> MI-TLV-hex='17099378563412907856f4' + -> MI-str="9876543210987654" rc=17 + -> MI-name="IMEI-SV-9876543210987654" - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 -- To view, visit https://gerrit.osmocom.org/12642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6fb85a0516dc387902ad9de4fe8c1ba82d68cae6 Gerrit-Change-Number: 12642 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:53:48 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 14:53:48 +0000 Subject: Change in libosmocore[master]: constrain gsm48_generate_mid() output array bounds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12641 ) Change subject: constrain gsm48_generate_mid() output array bounds ...................................................................... constrain gsm48_generate_mid() output array bounds The longest BCd-digit type identity is the IMEISV with 16, so there's no point in trying to parse up to 255 decimal digits, which will do nothing but to overflow the caller-provided output buffer. Let's also clearly define the required minimum size of the output buffer and add a reltead #define for it. Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 --- M include/osmocom/gsm/gsm48.h M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c M src/gsm/gsm48.c 4 files changed, 12 insertions(+), 7 deletions(-) Approvals: Max: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index 0f5727a..7e0e5c4 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -45,6 +45,7 @@ OSMO_DEPRECATED("Use gsm48_generate_lai2() instead, to not lose leading zeros in the MNC"); void gsm48_generate_lai2(struct gsm48_loc_area_id *lai48, const struct osmo_location_area_id *lai); +#define GSM48_MID_MAX_SIZE 11 int gsm48_generate_mid_from_tmsi(uint8_t *buf, uint32_t tmsi); int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi); uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type); diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 3b9fbf9..be7ef9f 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1156,7 +1156,7 @@ /* IMSI */ if (dup->imsi && strlen(dup->imsi)) { - uint8_t mi[10]; + uint8_t mi[GSM48_MID_MAX_SIZE]; int imsi_len = gsm48_generate_mid_from_imsi(mi, dup->imsi); if (imsi_len > 2) msgb_tvlv_push(msg, BSSGP_IE_IMSI, @@ -1205,7 +1205,7 @@ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph)); uint16_t drx_params = osmo_htons(pinfo->drx_params); - uint8_t mi[10]; + uint8_t mi[GSM48_MID_MAX_SIZE]; int imsi_len = gsm48_generate_mid_from_imsi(mi, pinfo->imsi); struct gsm48_ra_id ra; diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index 487286c..77350e2 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -178,7 +178,7 @@ const char *imsi) { struct msgb *msg = common_tx_radio_status(bctx); - uint8_t mi[10]; + uint8_t mi[GSM48_MID_MAX_SIZE]; int imsi_len = gsm48_generate_mid_from_imsi(mi, imsi); if (!msg) diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 795e98b..86d40d4 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -637,20 +637,23 @@ return 7; } -/*! Generate TS 24.008 ?10.5.1.4 Mobile ID - * \param[out] buf Caller-provided output buffer +/*! Generate TS 24.008 ?10.5.1.4 Mobile ID of BCD type from ASCII string + * \param[out] buf Caller-provided output buffer of at least GSM48_MID_MAX_SIZE bytes * \param[in] id Identity to be encoded - * \param[in] mi_type Type of identity (e.g. GSM_MI_TYPE_TMSI) + * \param[in] mi_type Type of identity (e.g. GSM_MI_TYPE_IMSI, IMEI, IMEISV) * \returns number of bytes used in \a buf */ uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type) { - uint8_t length = strnlen(id, 255), i, off = 0, odd = (length & 1) == 1; + uint8_t length = strnlen(id, 16), i, off = 0, odd = (length & 1) == 1; + /* maximum length == 16 (IMEISV) */ buf[0] = GSM48_IE_MOBILE_ID; buf[2] = osmo_char2bcd(id[0]) << 4 | (mi_type & GSM_MI_TYPE_MASK) | (odd << 3); /* if the length is even we will fill half of the last octet */ buf[1] = (length + (odd ? 1 : 2)) >> 1; + /* buf[1] maximum = 18/2 = 9 */ + OSMO_ASSERT(buf[1] <= 9); for (i = 1; i < buf[1]; ++i) { uint8_t upper, lower = osmo_char2bcd(id[++off]); @@ -662,6 +665,7 @@ buf[2 + i] = (upper << 4) | lower; } + /* maximum return value: 2 + 9 = 11 */ return 2 + buf[1]; } -- To view, visit https://gerrit.osmocom.org/12641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic8488bc7f77dc9182e372741b88f0f06100dddc9 Gerrit-Change-Number: 12641 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: tnt Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:57:19 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 22 Jan 2019 14:57:19 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12682 Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/1 diff --git a/src/mncc.c b/src/mncc.c index ea6a9fc..e42f932 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -424,6 +424,11 @@ data = (const struct gsm_mncc *) buf; + if (data->emergency) { + strcpy((char *)data->called.number, "emergency"); + goto cont_setup; + } + /* screen arguments */ if ((data->fields & MNCC_F_CALLED) == 0) { LOGP(DMNCC, LOGL_ERROR, @@ -445,6 +450,7 @@ return mncc_send(conn, MNCC_REJ_REQ, data->callref); } + cont_setup: /* Create an RTP port and then allocate a call */ call = call_mncc_create(); if (!call) { -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 14:58:34 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 22 Jan 2019 14:58:34 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { This "works", but looks wrong, even to me. I'd appreciate tips on the right way. :) -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 22 Jan 2019 14:58:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 14:59:21 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 14:59:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1170?= In-Reply-To: <2054936042.721.1548115154192.JavaMail.jenkins@jenkins.osmocom.org> References: <2054936042.721.1548115154192.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <827055490.759.1548169161884.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.50 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:01:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:01:15 +0000 Subject: Change in libosmocore[master]: Work around bogus gcc-8.2 array-bounds warning/error In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12643 ) Change subject: Work around bogus gcc-8.2 array-bounds warning/error ...................................................................... Work around bogus gcc-8.2 array-bounds warning/error gcc-8.2 is printing the following warning, which is an error when used -Werror like our --enable-werror: In file included from gprs_bssgp.c:34: In function ?tl16v_put?, inlined from ?tvlv_put.part.3? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_push? at ../../include/osmocom/gsm/tlv.h:386:2, inlined from ?bssgp_tx_dl_ud? at gprs_bssgp.c:1162:4: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? forming offset [12, 130] is out of the bounds [0, 11] of object ?mi? with type ?uint8_t[11]? {aka ?unsigned char[11]?} [-Werror=array-bounds] memcpy(buf, val, len); Where "130" seems to be the maximum value of uint8_t, shifted right one + 2. But even as we use strnlen() with "16" as maximum upper bound, gcc still believes there's a way that the return value of gsm48_generate_mid_from_imsi() could be 130. In fact, even the newly-added OSMO_ASSERT() inside gsm48_generate_mid() doesn't help and gcc still insists there is a problem :( Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec --- M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index be7ef9f..4a4bab3 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1157,10 +1157,17 @@ /* IMSI */ if (dup->imsi && strlen(dup->imsi)) { uint8_t mi[GSM48_MID_MAX_SIZE]; +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" int imsi_len = gsm48_generate_mid_from_imsi(mi, dup->imsi); if (imsi_len > 2) msgb_tvlv_push(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop } /* DRX parameters */ @@ -1220,7 +1227,14 @@ else bgph->pdu_type = BSSGP_PDUT_PAGING_CS; /* IMSI */ +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop /* DRX Parameters */ msgb_tvlv_put(msg, BSSGP_IE_DRX_PARAMS, 2, (uint8_t *) &drx_params); diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index 77350e2..bef9bb1 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -183,10 +183,16 @@ if (!msg) return -ENOMEM; - +/* gsm48_generate_mid_from_imsi() is guaranteed to never return more than 11, + * but somehow gcc (8.2) is not smart enough to figure this out and claims that + * the memcpy in msgb_tvlv_put() below will cause and out-of-bounds access up to + * mi[131], which is wrong */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" /* strip the MI type and length values (2 bytes) */ if (imsi_len > 2) msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); +#pragma GCC diagnostic pop LOGPC(DBSSGP, LOGL_NOTICE, "IMSI=%s ", imsi); return common_tx_radio_status2(msg, cause); -- To view, visit https://gerrit.osmocom.org/12643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a06daa19b7b5b5badbb8b3d81a54c45b88a60ec Gerrit-Change-Number: 12643 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:02:35 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0_=E2=86=92_1=2E3=2E1?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12683 Change subject: Bump version: 1.3.0 ? 1.3.1 ...................................................................... Bump version: 1.3.0 ? 1.3.1 Change-Id: I624144d6f8919d1dd237cdffc9122f685a8e4d6b --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/12683/1 diff --git a/debian/changelog b/debian/changelog index 76d4fce..8aec381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-msc (1.3.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix build: apply msgb_wrap_with_TL() rename + + -- Harald Welte Tue, 22 Jan 2019 16:02:11 +0100 + osmo-msc (1.3.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/12683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I624144d6f8919d1dd237cdffc9122f685a8e4d6b Gerrit-Change-Number: 12683 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:13:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:13:01 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > This "works", but looks wrong, even to me. [?] which part? I thin the if (data->emergency) is correct. However, the goto is ugly in this situation. I think you simply need to do "if (!data->emergency) {" and then indent the entire block below. The other way of approaching this would be to have osmo-msc map the "GSM Special emergency" call already to a destination number (with specified TON / NPI) and this way have no special case handling here? We could still keep the "emergency" field to indicate that this was an emergency call that was remapped. Is there some standard way how to express emergency calls in SIP? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 22 Jan 2019 15:13:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:13:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:13:07 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12683 ) Change subject: Bump version: 1.3.0 ? 1.3.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I624144d6f8919d1dd237cdffc9122f685a8e4d6b Gerrit-Change-Number: 12683 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 22 Jan 2019 15:13:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:13:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:13:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12683 ) Change subject: Bump version: 1.3.0 ? 1.3.1 ...................................................................... Bump version: 1.3.0 ? 1.3.1 Change-Id: I624144d6f8919d1dd237cdffc9122f685a8e4d6b --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 76d4fce..8aec381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-msc (1.3.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix build: apply msgb_wrap_with_TL() rename + + -- Harald Welte Tue, 22 Jan 2019 16:02:11 +0100 + osmo-msc (1.3.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/12683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I624144d6f8919d1dd237cdffc9122f685a8e4d6b Gerrit-Change-Number: 12683 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:15:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:15:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12681 ) Change subject: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66f8310981078dd032c47fcc97810944cf0c856f Gerrit-Change-Number: 12681 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 22 Jan 2019 15:15:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 22 15:15:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 Jan 2019 15:15:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12681 ) Change subject: MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing ...................................................................... MSC_Tests: individual IMSI for TC_lu_and_mt_sms_paging_and_nothing The testcase TC_lu_and_mt_sms_paging_and_nothing is currently using an IMSI that ends on 43. The same IMSI is used by TC_mo_cc_bssmap_clear as well. Since TC_lu_and_mt_sms_paging_and_nothing is running before TC_mo_cc_bssmap_clear, the re-use of the IMSI triggers the MSC to continue the paging procedure. The MSC then eventually tries to deliver the SMS from TC_lu_and_mt_sms_paging_and_nothing. This will disturb the execution of TC_mo_cc_bssmap_clear, which then fails. Lets make sure that TC_lu_and_mt_sms_paging_and_nothing uses an individual IMSI that is never used again throught the execution of the testsuite. Change-Id: I66f8310981078dd032c47fcc97810944cf0c856f Related: OS#3762 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index b72c580..a8f37bd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2071,7 +2071,7 @@ var BSC_ConnHdlrPars pars; var BSC_ConnHdlr vc_conn; f_init(); - pars := f_init_pars(43); + pars := f_init_pars(1843); vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_and_nothing), pars); f_sleep(2.0); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); -- To view, visit https://gerrit.osmocom.org/12681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66f8310981078dd032c47fcc97810944cf0c856f Gerrit-Change-Number: 12681 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 22 15:17:26 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 15:17:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1171?= In-Reply-To: <827055490.759.1548169161884.JavaMail.jenkins@jenkins.osmocom.org> References: <827055490.759.1548169161884.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1036019384.760.1548170246436.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 92.52 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 21:15:48 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 21:15:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1172?= In-Reply-To: <1036019384.760.1548170246436.JavaMail.jenkins@jenkins.osmocom.org> References: <1036019384.760.1548170246436.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <19654316.761.1548191748449.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 97.88 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 23:58:35 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 23:58:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3697?= Message-ID: <1563114711.762.1548201515846.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 37.57 KB...] Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/src/gsm' CC a5.lo CC comp128.lo CC gsm_utils.lo CC rxlev_stat.lo CC gsm48.lo CC tlv_parser.lo CC comp128v23.lo CC rsl.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^ CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC gsm29205.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gsup_sms.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 11:0:0 -no-undefined -o libosmogsm.la -rpath /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.11.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.11.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogsm.so.11.0.0 libosmogsm.so.11 || { rm -f libosmogsm.so.11 && ln -s libosmogsm.so.11.0.0 libosmogsm.so.11; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogsm.so.11.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.11.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath /build/deps/install/stow/libosmocore/lib gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_ns_frgre.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 8:0:2 -o libosmogb.la -rpath /build/deps/install/stow/libosmocore/lib gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.2.0T /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.2.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogb.so.6.2.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.2.0 libosmogb.so.6; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogb.so.6.2.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.2.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmoctrl.map -version-info 3:0:3 -no-undefined -o libosmoctrl.la -rpath /build/deps/install/stow/libosmocore/lib control_cmd.lo control_if.lo fsm_ctrl_commands.lo control_vty.lo -ltalloc ../../src/libosmocore.la ../../src/gsm/libosmogsm.la ../../src/vty/libosmovty.la ) libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader_pcsc.lo CC card_fs_sim.lo CC reader.lo CC card_fs_isim.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_uicc.lo In file included from /usr/include/netinet/in.h:37:0, from reader.c:33: /usr/include/x86_64-linux-gnu/bits/in.h:1:0: internal compiler error: Segmentation fault /* Copyright (C) 1991-2014 Free Software Foundation, Inc. ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. CC card_fs_tetra.lo The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:489: recipe for target 'reader.lo' failed make[2]: *** [reader.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/src/sim' make[1]: *** [install-recursive] Error 1 Makefile:604: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:903: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Jan 22 23:59:08 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 Jan 2019 23:59:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1173?= In-Reply-To: <19654316.761.1548191748449.JavaMail.jenkins@jenkins.osmocom.org> References: <19654316.761.1548191748449.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <351749740.763.1548201548846.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 98.46 KB...] checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_fsm.o CC sap_proto.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o gsm322.c: In function ?gsm322_cs_select?: gsm322.c:1870:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(index2arfcn(i)); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_check?: gsm322.c:4201:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] band = gsm_arfcn2band(nb->arfcn); ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_nb_new_rxlev?: gsm322.c:4698:2: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] int band = gsm_arfcn2band(cs->arfcn); ^~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from ../../include/osmocom/bb/common/l1ctl.h:5, from gsm322.c:37: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC gsm480_ss.o gsm480_ss.c: In function ?gsm480_tx_invoke?: gsm480_ss.c:441:3: warning: implicit declaration of function ?msgb_wrap_with_TL? [-Wimplicit-function-declaration] msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); ^~~~~~~~~~~~~~~~~ CC gsm411_sms.o CC gsm48_cc.o CC gsm48_mm.o CC gsm48_rr.o gsm48_rr.c: In function ?gsm48_rr_tx_rand_acc?: gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1659:3: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n", ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1667:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ gsm48_rr.c:1674:4: warning: ?gsm_arfcn2band? is deprecated: Use gsm_arfcn2band_rc() instead [-Wdeprecated-declarations] LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value " ^~~~ In file included from ../../include/osmocom/bb/common/osmocom_data.h:5:0, from gsm48_rr.c:75: :165:15: note: declared here enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); ^~~~~~~~~~~~~~ CC mnccms.o CC settings.o CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o CC script_lua.o AR libmobile.a ar: `u' modifier ignored since `D' is the default (see `U') CC main.o CC app_mobile.o CCLD mobile libmobile.a(gsm480_ss.o): In function `gsm480_tx_invoke': :441: undefined reference to `msgb_wrap_with_TL' collect2: error: ld returned 1 exit status Makefile:393: recipe for target 'mobile' failed make[2]: *** [mobile] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Jan 23 00:17:38 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 Jan 2019 00:17:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--disa?= =?UTF-8?Q?ble-mgcp-transcoding,--enable-smpp,?= =?UTF-8?Q?default,osmocom-master-debian9_#3698?= In-Reply-To: <1563114711.762.1548201515846.JavaMail.jenkins@jenkins.osmocom.org> References: <1563114711.762.1548201515846.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <737078232.764.1548202658016.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Jan 23 00:25:19 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 00:25:19 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 33: (1 comment) https://gerrit.osmocom.org/#/c/11642/33/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/33/src/libmsc/sgs_iface.c at 112 PS33, Line 112: ran_conn_put(conn, RAN_CONN_USE_SGs_SERVICE); I need to understand the intention, so I can move this to the inter-MSC role stuff without breaking it: I thought the above ran_conn_get(USE_SGs) would remain in place until the SGs conn gets released (if there is such a thing). Why is this put() down again immediately? Or, from another angle, why do we then need to get() it in the first place? (does it get deallocated by those events otherwise?) And then, in the end of this function, the conn that we return, is it only used by compl_l3 (??) and gets deallocated immediately? -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 33 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 23 Jan 2019 00:25:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 01:51:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 01:51:53 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 33: (2 comments) https://gerrit.osmocom.org/#/c/11642/33/src/libmsc/sgs_iface.c File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/#/c/11642/33/src/libmsc/sgs_iface.c at 120 PS33, Line 120: static void subscr_conn_toss(struct sgs_connection *sgc, struct vlr_subscr *vsub) (sgc arg is not used) https://gerrit.osmocom.org/#/c/11642/33/src/libmsc/sgs_iface.c at 821 PS33, Line 821: "Receiving uplink unit-data for non-sgs connection -- discarding message!\n"); Is the message being discarded? Not seeing a free nor return -1... -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 33 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 23 Jan 2019 01:51:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 23 06:51:20 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 Jan 2019 06:51:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-simtrace2_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#261?= Message-ID: <32680631.776.1548226280232.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 25.55 KB...] CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse_avx.lo CC conv_acc_sse.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.12.0.1 libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so.12 || { rm -f libosmocore.so.12 && ln -s libosmocore.so.12.0.1 libosmocore.so.12; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.12.0.1 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC logging_vty.lo CC utils.lo CC vty.lo CC vector.lo CC command.lo CC telnet_interface.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 6:0:2 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.2.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.2.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.2.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC comp128.lo CC tlv_parser.lo CC comp128v23.lo CC gsm48.lo CC gsm_utils.lo CC rsl.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:453:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_ie.lo CC gsm48_arfcn_range_encode.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsup.lo CC gsup_sms.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo /bin/bash: line 2: 705 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT oap_client.lo -MD -MP -MF $depbase.Tpo -c -o oap_client.lo oap_client.c Makefile:600: recipe for target 'oap_client.lo' failed make[3]: *** [oap_client.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:705: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Jan 23 09:09:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 Jan 2019 09:09:10 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#34). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 49 files changed, 2,939 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/34 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 34 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 11:25:51 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 11:25:51 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... Patch Set 3: > It seems like this doesn't really fix an issue - it rather works around it by disabling some code. The code it disables is broken. Without that code, Assignment works, with that code it doesn't. I thought I had explained that in abundance. -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 Jan 2019 11:25:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 11:35:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 11:35:07 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... Patch Set 3: (1 comment) I'm annoyed that this patch is still here a month later. For me it is so obviously necessary to disable that phony lchan re-use code, because it so obviously cannot work. And since obviously assigning a new lchan *does* work, the re-use attempt is just not useful. We are not going to fix the re-use at the moment, so there is one trivial way to fix the two scenarios explained: don't try to re-use the lchan! I would welcome to get over this now. If the way to merge this is to shift explanations around from code comments to issue tracker, I can do that, but I don't see a benefit. https://gerrit.osmocom.org/#/c/12401/3/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12401/3/src/osmo-bsc/assignment_fsm.c at 369 PS3, Line 369: Test scenario: > This looks like it belong to TTCN3 instead. [?] unfortunately I can't spend time on that now -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 Jan 2019 11:35:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 12:02:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 23 Jan 2019 12:02:08 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... Patch Set 3: > The code it disables is broken. Than why disable it instead of removing? > Without that code, Assignment works, with that code it doesn't. > I thought I had explained that in abundance. Having a test which demonstrate this would be way more convincing than any explanation. -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 Jan 2019 12:02:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 12:07:51 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 23 Jan 2019 12:07:51 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > which part? I thin the if (data->emergency) is correct. [?] Curious, why the goto necessary in a first place? We don't have to screen parameters in case of emergency? Which of the conditions below trigger call reject and why? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Wed, 23 Jan 2019 12:07:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 12:10:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 23 Jan 2019 12:10:00 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 1: Code-Review+1 > I still don't like this. I could copy all the previous review here now. Could you perhaps post a link to your previous review? -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 23 Jan 2019 12:10:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 12:51:59 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 12:51:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12627 to look at the new patch set (#2). Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr The idea of this test case is to verify SM-RP-MR assignment for a few MT SMS being sent over GSUP. Basically, the algorythm is the following: 1.0 send the 1st SMS using MT-ForwardSM-Req on GSUP, 1.1 expect Paging Request on RAN, 1.2 establish a RAN connection, 1.3 expect CP-DATA/RP-DATA for the 1st SMS, 2.0 send the 2nd SMS using MT-ForwardSM-Req on GSUP, 2.1 expect CP-DATA/RP-DATA for the 2nd SMS, 3.0 compare both SM-RP-MR values assigned by the MSC, 3.1 send CP-DATA/RP-ACK for both 1st and 2nd SMS messages, 3.2 expect MT-ForwardSM-Res for both 1st and 2nd SMS messages. The SM-RP-MR values for both 1st and 2nd messages shall not match. Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/12627/2 -- To view, visit https://gerrit.osmocom.org/12627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc Gerrit-Change-Number: 12627 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 12:59:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 12:59:41 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12628 ) Change subject: libmsc/gsm_04_11.c: fix SM-RP-MR assignment for MT SMS ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12628/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/12628/1/src/libmsc/gsm_04_11.c at 1063 PS1, Line 1063: * by the paging call-back. */ (could use more line width here. leave this and do it next time.) -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 23 Jan 2019 12:59:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 23 14:18:34 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 Jan 2019 14:18:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#832?= Message-ID: <1990478012.781.1548253114478.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.67 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c ../common/fpga_load.c:181: warning 126: unreachable code board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Jan 23 14:42:30 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 14:42:30 +0000 Subject: Change in osmo-hlr[master]: VTY tests: fill DB before running test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12680 ) Change subject: VTY tests: fill DB before running test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e Gerrit-Change-Number: 12680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 23 Jan 2019 14:42:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 14:45:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 Jan 2019 14:45:41 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Wed, 23 Jan 2019 14:45:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 14:53:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 Jan 2019 14:53:00 +0000 Subject: Change in osmo-sim-auth[master]: Check return code of u.authenticate() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12684 Change subject: Check return code of u.authenticate() ...................................................................... Check return code of u.authenticate() The method authenticate() of the class USIM may return None in some error cases. Lets check this fore passing the return code into len() Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Related: OS#1967 --- M osmo-sim-auth.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sim-auth refs/changes/84/12684/1 diff --git a/osmo-sim-auth.py b/osmo-sim-auth.py index 89deac4..6ba9557 100755 --- a/osmo-sim-auth.py +++ b/osmo-sim-auth.py @@ -41,6 +41,9 @@ print "\nUMTS Authentication" ret = u.authenticate(rand_bin, autn_bin, ctx='3G') + if ret == None: + print "UMTS Authentication failed" + exit(1) if len(ret) == 1: print "AUTS:\t%s" % b2a_hex(byteToString(ret[0])) else: -- To view, visit https://gerrit.osmocom.org/12684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sim-auth Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Gerrit-Change-Number: 12684 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 15:51:59 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 15:51:59 +0000 Subject: Change in osmocom-bb[master]: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12685 Change subject: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename ...................................................................... mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename In If1e851ac605c8d2fde3da565b0bd674ea6350c2e, msgb_wrap_with_TL() was renamed to msgb_push_tl(). Let's use the new symbol name. Change-Id: Ief37424e0ca3cd696054518a0ffb07b7ef17a462 --- M src/host/layer23/src/mobile/gsm480_ss.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/12685/1 diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index 116c72f..5ff3ce6 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -438,7 +438,7 @@ if (msg_type == GSM0480_MTYPE_FACILITY) msgb_wrap_with_L(msg); else - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* FIXME: If phase 2, we need SSVERSION to be added */ -- To view, visit https://gerrit.osmocom.org/12685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief37424e0ca3cd696054518a0ffb07b7ef17a462 Gerrit-Change-Number: 12685 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 16:01:13 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 16:01:13 +0000 Subject: Change in osmocom-bb[master]: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12685 ) Change subject: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief37424e0ca3cd696054518a0ffb07b7ef17a462 Gerrit-Change-Number: 12685 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 Jan 2019 16:01:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 16:01:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 16:01:21 +0000 Subject: Change in osmocom-bb[master]: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12685 ) Change subject: mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename ...................................................................... mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename In If1e851ac605c8d2fde3da565b0bd674ea6350c2e, msgb_wrap_with_TL() was renamed to msgb_push_tl(). Let's use the new symbol name. Change-Id: Ief37424e0ca3cd696054518a0ffb07b7ef17a462 --- M src/host/layer23/src/mobile/gsm480_ss.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index 116c72f..5ff3ce6 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -438,7 +438,7 @@ if (msg_type == GSM0480_MTYPE_FACILITY) msgb_wrap_with_L(msg); else - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* FIXME: If phase 2, we need SSVERSION to be added */ -- To view, visit https://gerrit.osmocom.org/12685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief37424e0ca3cd696054518a0ffb07b7ef17a462 Gerrit-Change-Number: 12685 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 23 16:06:28 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 Jan 2019 16:06:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmocom-bb_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1174?= In-Reply-To: <351749740.763.1548201548846.JavaMail.jenkins@jenkins.osmocom.org> References: <351749740.763.1548201548846.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1687051779.782.1548259588355.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Jan 23 16:13:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 Jan 2019 16:13:35 +0000 Subject: Change in osmo-sim-auth[master]: Check return code of u.authenticate() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12684 ) Change subject: Check return code of u.authenticate() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sim-auth Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Gerrit-Change-Number: 12684 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 23 Jan 2019 16:13:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 17:18:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 17:18:34 +0000 Subject: Change in osmo-msc[master]: transaction: change arguments of trans_find_by_sm_rp_mr() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12686 Change subject: transaction: change arguments of trans_find_by_sm_rp_mr() ...................................................................... transaction: change arguments of trans_find_by_sm_rp_mr() The need to pass a pointer to RAN connection in order to find a transaction limits possible use cases of trans_find_by_sm_rp_mr(), e.g. when we need to find a transaction, but RAN connection is not established yet. Moreover, the pointer to RAN connection was only used to obtain pointers to gsm_network and vlr_subscr, so we can just pass them directly. Change-Id: I093f36d63e671e50e54fc6236e97a777cc6da77b --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_11_gsup.c M src/libmsc/transaction.c 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/12686/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 6e67f39..36e9bc1 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -100,7 +100,8 @@ uint8_t proto, uint8_t trans_id); struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, uint32_t callref); -struct gsm_trans *trans_find_by_sm_rp_mr(const struct ran_conn *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(const struct gsm_network *net, + const struct vlr_subscr *vsub, uint8_t sm_rp_mr); struct gsm_trans *trans_alloc(struct gsm_network *net, diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index f2de95f..8b1225e 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -176,7 +176,7 @@ } /* Attempt to find DTAP-transaction */ - trans = trans_find_by_sm_rp_mr(conn, *(gsup_msg->sm_rp_mr)); + trans = trans_find_by_sm_rp_mr(net, vsub, *(gsup_msg->sm_rp_mr)); if (!trans) { LOGP(DLSMS, LOGL_NOTICE, "No transaction found for %s, " "ignoring %s-%s message...\n", vlr_subscr_name(vsub), diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index df770ed..df85d9a 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -72,15 +72,15 @@ } /*! Find a transaction by SM-RP-MR (RP Message Reference) - * \param[in] conn Connection in which we want to find transaction + * \param[in] net Network in which we should search + * \param[in] vsub Subscriber for which we should search * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) * \returns Matching transaction, NULL otherwise */ -struct gsm_trans *trans_find_by_sm_rp_mr(const struct ran_conn *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(const struct gsm_network *net, + const struct vlr_subscr *vsub, uint8_t sm_rp_mr) { - struct gsm_network *net = conn->network; - struct vlr_subscr *vsub = conn->vsub; struct gsm_trans *trans; llist_for_each_entry(trans, &net->trans_list, entry) { -- To view, visit https://gerrit.osmocom.org/12686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I093f36d63e671e50e54fc6236e97a777cc6da77b Gerrit-Change-Number: 12686 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 17:18:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 Jan 2019 17:18:34 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12687 Change subject: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions ...................................................................... libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions Previously, SM-RP Message Reference was assigned to MT transactions only, but not to MO transactions. As a result, this could lead to having a few transactions with duplicate SM-RP-MR value, because in case of MO SMS, trans->sms.sm_rp_mr would remain 0x00. Let's parse SM-RP-MR from MO SMS messages in gsm0411_rcv_sms(), and assign it to the new transaction after allocation. Change-Id: I4d07354175444f9764fb0dd6ea188a64494d79fe --- M src/libmsc/gsm_04_11.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12687/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 4dc07bd..2f39b06 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1179,6 +1179,7 @@ struct gsm48_hdr *gh = msgb_l3(msg); uint8_t msg_type = gh->msg_type; uint8_t transaction_id = gsm48_hdr_trans_id_flip_ti(gh); + struct gsm411_rp_hdr *rph = (struct gsm411_rp_hdr *) gh->data; struct gsm_trans *trans; int new_trans = 0; int rc = 0; @@ -1210,6 +1211,7 @@ return -ENOMEM; } + trans->sms.sm_rp_mr = rph->msg_ref; /* SM-RP Message Reference */ trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ new_trans = 1; -- To view, visit https://gerrit.osmocom.org/12687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4d07354175444f9764fb0dd6ea188a64494d79fe Gerrit-Change-Number: 12687 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 17:33:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 Jan 2019 17:33:35 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E120-88220-dirty_=E2=86=92_1=2E4=2E0?= Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12688 Change subject: Bump version: 1.3.0.120-88220-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.120-88220-dirty ? 1.4.0 Change-Id: I9d37bb897d34ad973e93706003bdecc0cf6be816 --- M configure.ac M debian/changelog 2 files changed, 158 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/12688/1 diff --git a/configure.ac b/configure.ac index c0d3770..e72e9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -39,29 +39,29 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.4.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.2.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index b39abb8..5461745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,150 @@ +osmo-sgsn (1.4.0) unstable; urgency=medium + + [ Alexander Couzens ] + * gprs_subscriber: gsup_auth_error: reject MS in all cases + * gprs_gmm: make functions relating to GMM Attach Request public + * gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public + * gprs_gmm: Cancel Location: use detach type IMSI + * vty: add cmd "reset sgsn state" + * tests: remove gmm unit tests + * gprs_gmm: introduce a GMM Attach Request FSM + * debian: add missing build dependencies + * sgsn: use gtp_clear_queues() when reset sgsn state + * vty: restart sgsn state: improve output message + * sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone + * gprs_sgsn.h: fix wrong type of re-attempts + * GTP: refactor the echo timer + * gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL + * gprs_gmm: Fix missing Security Command for 3G when attaching + * sgsn_libgtp: fix a potential memleak when the GGSN is not reachable + * gprs_llc: remove the FCS from the msgb by trim'ing the msgb + * OsmoSGSN: add rate counter documentation + + [ Daniel Willmann ] + * gb_proxy: tallocate memory for gbproxy cfg so it can be a talloc ctx + * gb_proxy: Add ctrl interface and nsvc-state, gbproxy-state commands + * git-version-gen: Don't check for .git directory + + [ Stefan Sperling ] + * add a test for OS#3178 (invalid unitdata message) + * finish gbproxy_parse_bssgp_unitdata test + * fix bogus assertion in encode_comp_field() + * fix bogus error check in gprs_sndcp_comp_create() + * use enums consistently instead of falling back to int + * update gbproxy test expected output + * consistently check the result of osmo_shift_v_fixed() + * remove pointless declaration of struct gsm_network + * make gsup ipa name configurable in osmo-sgsn.cfg + + [ Pau Espin Pedrol ] + * jenkins.sh: Use --enable-werror only when iu support is disabled + * jenkins.sh: Remove non-existent configure options + * Drop all references of unused SMPP + * Drop all references of unused MGCP + * Drop unused common_vty.c + * sgsn_libgtp.c: Log pointer of deleted context + * Maintain per ggsn pdp ctx list + * osmo-sgsn: ping GGSN periodically and check for restart counter + * Disarm T3395 when dettaching mmctx from pdpctx + * examples: Enable by default echo req towards active GGSNs + * vty: Add cmd to disable echo loop explictly + * Add optional TearDownInd IE in PDP DEACT REQ towards PCU + * sgsn: Don't attempt to delete GTP pdp ctx if GGSN was restarted + * Forward GGSN originated DEACT PDP CTX REQ + * sgsn: Fix T3395 firing forever + * sgsn: subscriber: Avoid calling memcpy with NULL src + * sgsn: cdr: Fix uninitialized string access if ggsn is detached + * sgsn: gtp: Use new API to send PDP DEL CTX REQ without freeing ctx locally + * sgsn: Fix crash using new libgtp cb_recovery2 API + * gbproxy: Replace '.' in counter names with ':' + * Drop gprs_msgb_copy with libosmocore replacement + * Drop gprs_msgb_resize_area with libosmocore replacement + * Use osmo_clock_gettime from libosmocore + * gbproxy: Add VTY parameter: link stored-msgs-max-length + * gbproxy: Add new VTY-managed timer: link-list clean-stale-timer + * gbproxy: Replace '.' in counter names with ':' + * Add osmo-gtphub systemd service file + * debian: Fix typo in rules preventing build with IU support + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * Update wrong references to bsc in sgsn code + * Allocate sgsn_instance with talloc + * gbproxy: flag gbproxy_assign_imsi as static + * gbproxy: Fix abort during APN patch + * gbproxy: Remove unneeded parse_ctx param + * gbproxy: flush_stored_messages: Move comment to func description + * gbproxy: flush_stored_messages: Log and route using stored_msg info + * gbproxy: flush_stored_messages: Get rid of msg param + * Allow easily disabling GFDL references + * OsmoSGSN: configuration: Move pdp ctx specific CDR fields to its own table + * OsmoSGSN: configuration: Add missing pdp-periodic event + * OsmoSGSN: configuration: Document CDR CTRL interface + * OsmoSGSN: overview: Fix typo and reference OpenGGSN->OsmoGGSN + + [ Harald Welte ] + * migrate to oap_client in libosmogsm + * remove libcommon + * gbproxy-legacy: Ensure well-formed config file + * Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * OsmoSGSN: Fix formatting/cross reference in CDR section + * Update GSUP chapter regarding UMTS AKA and other recent changes + * GSUP: Add ladder diagrams for protocol transactions / procedures + * share chapters/gsup.adoc from OsmoSGSN to OsmoMSC + OsmoHLR + * vty-ref: Update URI of docbook 5.0 schema + + [ Neels Hofmeyr ] + * use __FILE__, not __BASE_FILE__ + * vty: fix doc str for 'reset sgsn state' + * vty: add SCCP related vty commands + * fix build: remove unused variable + * Importing history from osmo-gsm-manuals.git + * add 'make check' target + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + * OsmoSGSN: update VTY reference + * sgsn: update vty reference + + [ Oliver Smith ] + * gtphub: Add --version cmdline option + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Max ] + * Cleanup non-existent files from debian/copyright + * Use safer functions for IMSI ACL + * gbproxy: fix formatting in gbproxy-state command + * gbproxy: add number-of-peers ctrl command + * Revert "gbproxy: fix formatting in gbproxy-state command" + * Add OsmoSGSN control interface description + * Remove misleading comment + * Constify sgsn_acl_lookup() parameter + * Drop unused osmo-sgsn.pc + * Use explicit length check + * Use explicit parameter for sgsn_auth_init() + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ ikostov ] + * SGSN: add Auth. policy, NS Statistics and BSSGP state examples, tweaks + * GSUP, OAP: fix AUTS length to 14, not 16 + + [ Philipp Maier ] + * osmo-sgsn: Update VTY command reference + * osmo-sgsn: improve auth-policy explaination + * osmo-sgsn: Explain TCP/IP header compression + * osmo-sgsn: fix arrow tips in flow diagrams + + [ Holger Hans Peter Freyther ] + * sgsn: Fix numbering of QoS and add basic description for APN + * sgsn: Add charging characteristics to GSUP + + -- Harald Welte Wed, 23 Jan 2019 18:32:41 +0100 + osmo-sgsn (1.3.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d37bb897d34ad973e93706003bdecc0cf6be816 Gerrit-Change-Number: 12688 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 17:40:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 Jan 2019 17:40:27 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E120-88220-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12688 ) Change subject: Bump version: 1.3.0.120-88220-dirty ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d37bb897d34ad973e93706003bdecc0cf6be816 Gerrit-Change-Number: 12688 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 23 Jan 2019 17:40:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 17:40:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 Jan 2019 17:40:28 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E120-88220-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12688 ) Change subject: Bump version: 1.3.0.120-88220-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.120-88220-dirty ? 1.4.0 Change-Id: I9d37bb897d34ad973e93706003bdecc0cf6be816 --- M configure.ac M debian/changelog 2 files changed, 158 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index c0d3770..e72e9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -39,29 +39,29 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.4.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.2.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index b39abb8..5461745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,150 @@ +osmo-sgsn (1.4.0) unstable; urgency=medium + + [ Alexander Couzens ] + * gprs_subscriber: gsup_auth_error: reject MS in all cases + * gprs_gmm: make functions relating to GMM Attach Request public + * gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public + * gprs_gmm: Cancel Location: use detach type IMSI + * vty: add cmd "reset sgsn state" + * tests: remove gmm unit tests + * gprs_gmm: introduce a GMM Attach Request FSM + * debian: add missing build dependencies + * sgsn: use gtp_clear_queues() when reset sgsn state + * vty: restart sgsn state: improve output message + * sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone + * gprs_sgsn.h: fix wrong type of re-attempts + * GTP: refactor the echo timer + * gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL + * gprs_gmm: Fix missing Security Command for 3G when attaching + * sgsn_libgtp: fix a potential memleak when the GGSN is not reachable + * gprs_llc: remove the FCS from the msgb by trim'ing the msgb + * OsmoSGSN: add rate counter documentation + + [ Daniel Willmann ] + * gb_proxy: tallocate memory for gbproxy cfg so it can be a talloc ctx + * gb_proxy: Add ctrl interface and nsvc-state, gbproxy-state commands + * git-version-gen: Don't check for .git directory + + [ Stefan Sperling ] + * add a test for OS#3178 (invalid unitdata message) + * finish gbproxy_parse_bssgp_unitdata test + * fix bogus assertion in encode_comp_field() + * fix bogus error check in gprs_sndcp_comp_create() + * use enums consistently instead of falling back to int + * update gbproxy test expected output + * consistently check the result of osmo_shift_v_fixed() + * remove pointless declaration of struct gsm_network + * make gsup ipa name configurable in osmo-sgsn.cfg + + [ Pau Espin Pedrol ] + * jenkins.sh: Use --enable-werror only when iu support is disabled + * jenkins.sh: Remove non-existent configure options + * Drop all references of unused SMPP + * Drop all references of unused MGCP + * Drop unused common_vty.c + * sgsn_libgtp.c: Log pointer of deleted context + * Maintain per ggsn pdp ctx list + * osmo-sgsn: ping GGSN periodically and check for restart counter + * Disarm T3395 when dettaching mmctx from pdpctx + * examples: Enable by default echo req towards active GGSNs + * vty: Add cmd to disable echo loop explictly + * Add optional TearDownInd IE in PDP DEACT REQ towards PCU + * sgsn: Don't attempt to delete GTP pdp ctx if GGSN was restarted + * Forward GGSN originated DEACT PDP CTX REQ + * sgsn: Fix T3395 firing forever + * sgsn: subscriber: Avoid calling memcpy with NULL src + * sgsn: cdr: Fix uninitialized string access if ggsn is detached + * sgsn: gtp: Use new API to send PDP DEL CTX REQ without freeing ctx locally + * sgsn: Fix crash using new libgtp cb_recovery2 API + * gbproxy: Replace '.' in counter names with ':' + * Drop gprs_msgb_copy with libosmocore replacement + * Drop gprs_msgb_resize_area with libosmocore replacement + * Use osmo_clock_gettime from libosmocore + * gbproxy: Add VTY parameter: link stored-msgs-max-length + * gbproxy: Add new VTY-managed timer: link-list clean-stale-timer + * gbproxy: Replace '.' in counter names with ':' + * Add osmo-gtphub systemd service file + * debian: Fix typo in rules preventing build with IU support + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * Update wrong references to bsc in sgsn code + * Allocate sgsn_instance with talloc + * gbproxy: flag gbproxy_assign_imsi as static + * gbproxy: Fix abort during APN patch + * gbproxy: Remove unneeded parse_ctx param + * gbproxy: flush_stored_messages: Move comment to func description + * gbproxy: flush_stored_messages: Log and route using stored_msg info + * gbproxy: flush_stored_messages: Get rid of msg param + * Allow easily disabling GFDL references + * OsmoSGSN: configuration: Move pdp ctx specific CDR fields to its own table + * OsmoSGSN: configuration: Add missing pdp-periodic event + * OsmoSGSN: configuration: Document CDR CTRL interface + * OsmoSGSN: overview: Fix typo and reference OpenGGSN->OsmoGGSN + + [ Harald Welte ] + * migrate to oap_client in libosmogsm + * remove libcommon + * gbproxy-legacy: Ensure well-formed config file + * Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * OsmoSGSN: Fix formatting/cross reference in CDR section + * Update GSUP chapter regarding UMTS AKA and other recent changes + * GSUP: Add ladder diagrams for protocol transactions / procedures + * share chapters/gsup.adoc from OsmoSGSN to OsmoMSC + OsmoHLR + * vty-ref: Update URI of docbook 5.0 schema + + [ Neels Hofmeyr ] + * use __FILE__, not __BASE_FILE__ + * vty: fix doc str for 'reset sgsn state' + * vty: add SCCP related vty commands + * fix build: remove unused variable + * Importing history from osmo-gsm-manuals.git + * add 'make check' target + * fix 'make clean': shell glob, ignore failure + * refactor Makefile build rules, don't use the FORCE + * OsmoSGSN: update VTY reference + * sgsn: update vty reference + + [ Oliver Smith ] + * gtphub: Add --version cmdline option + * build manuals moved here from osmo-gsm-manuals.git + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib/jenkins.sh: build and publish manuals + * contrib: fix makedistcheck with disabled systemd + + [ Max ] + * Cleanup non-existent files from debian/copyright + * Use safer functions for IMSI ACL + * gbproxy: fix formatting in gbproxy-state command + * gbproxy: add number-of-peers ctrl command + * Revert "gbproxy: fix formatting in gbproxy-state command" + * Add OsmoSGSN control interface description + * Remove misleading comment + * Constify sgsn_acl_lookup() parameter + * Drop unused osmo-sgsn.pc + * Use explicit length check + * Use explicit parameter for sgsn_auth_init() + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ ikostov ] + * SGSN: add Auth. policy, NS Statistics and BSSGP state examples, tweaks + * GSUP, OAP: fix AUTS length to 14, not 16 + + [ Philipp Maier ] + * osmo-sgsn: Update VTY command reference + * osmo-sgsn: improve auth-policy explaination + * osmo-sgsn: Explain TCP/IP header compression + * osmo-sgsn: fix arrow tips in flow diagrams + + [ Holger Hans Peter Freyther ] + * sgsn: Fix numbering of QoS and add basic description for APN + * sgsn: Add charging characteristics to GSUP + + -- Harald Welte Wed, 23 Jan 2019 18:32:41 +0100 + osmo-sgsn (1.3.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9d37bb897d34ad973e93706003bdecc0cf6be816 Gerrit-Change-Number: 12688 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 23 22:51:26 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Wed, 23 Jan 2019 22:51:26 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > Curious, why the goto necessary in a first place? We don't have to screen parameters in case of emer [?] In the case it is an emergency call, then data->called is invalid. the line directly below this fails. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Wed, 23 Jan 2019 22:51:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 23 23:04:02 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 Jan 2019 23:04:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8265?= Message-ID: <1112559476.783.1548284642863.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC db.o CC msc_vty.o CC a_iface_bssap.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_11_gsup.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o CC gsm_subscriber.o CC mncc.o CC mncc_builtin.o CC mncc_sock.o CC msc_ifaces.o CC msc_mgcp.o CC ran_conn.o CC rrlp.o CC silent_call.o CC sms_queue.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC iucs.o CC iucs_ranap.o CC smpp_smsc.o CC smpp_openbsc.o In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_IE-Extensions.h:15, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h:18, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_common.h:8, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:7, from iucs_ranap.c:29: /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: 'struct Member' declared inside parameter list A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_IE-Extensions.h:15, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h:18, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_common.h:8, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:7, from iucs_ranap.c:29: /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: 'struct MemberC' declared inside parameter list A_SEQUENCE_OF(struct MemberC { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberC { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: 'struct MemberF' declared inside parameter list A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct MemberG' declared inside parameter list A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: 'struct MemberH' declared inside parameter list A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: 'struct MemberJ' declared inside parameter list A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberJ { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: 'struct MemberA' declared inside parameter list A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:23: warning: 'struct MemberK' declared inside parameter list A_SEQUENCE_OF(struct MemberK { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberK { ^ CC smpp_vty.o /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: 'struct MemberL' declared inside parameter list A_SEQUENCE_OF(struct MemberL { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberL { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: 'struct MemberM' declared inside parameter list A_SEQUENCE_OF(struct MemberM { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC smpp_utils.o In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_IE-Extensions.h:15, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h:18, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_common.h:8, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:7, from iucs_ranap.c:29: /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: 'struct MemberB' declared inside parameter list A_SEQUENCE_OF(struct MemberB { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberB { ^ smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:173:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:23: warning: 'struct MemberD' declared inside parameter list A_SEQUENCE_OF(struct MemberD { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberD { ^ In file included from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_common.h:592:0, from /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:7, from iucs_ranap.c:29: /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:126:0: warning: "ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT" redefined #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 1) ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:125:0: note: this is the location of the previous definition #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 0) ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:436:0: warning: "RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT" redefined #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT (1 << 2) ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:434:0: note: this is the location of the previous definition #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT (1 << 0) ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:437:0: warning: "RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT" redefined #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT (1 << 3) ^ /build/deps/install/stow/osmo-iuh/include/osmocom/ranap/ranap_ies_defs.h:435:0: note: this is the location of the previous definition #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT (1 << 1) ^ AR libmsc.a make[3]: Leaving directory '/build/src/libmsc' Making all in osmo-msc make[3]: Entering directory '/build/src/osmo-msc' CC msc_main.o CCLD osmo-msc /bin/bash: line 1: 9540 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmo-abis/include/ -I/build/deps/install/stow/libsmpp34/include/ -I/build/deps/install/stow/osmo-iuh/include/ -I/build/deps/install/stow/libasn1c/include/ -I/build/deps/install/stow/libasn1c/include/asn1c -I/build/deps/install/stow/libosmo-sccp/include/ -I/build/deps/install/stow/osmo-mgw/include/ -I/build/deps/install/stow/osmo-hlr/include/ -g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmogsm -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmovty -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmoctrl -losmogsm -losmocore -L/build/deps/install/stow/libosmo-abis/lib -losmoabis -L/build/deps/install/stow/libsmpp34/lib -lsmpp34 -L/build/deps/install/stow/libosmo-sccp/lib -losmo-sigtran -L/build/deps/install/stow/osmo-mgw/lib -losmo-mgcp-client -L/build/deps/install/stow/osmo-hlr/lib -losmo-gsup-client -ldbi -L/build/deps/install/stow/osmo-iuh/lib -losmo-ranap Makefile:464: recipe for target 'osmo-msc' failed make[3]: Leaving directory '/build/src/osmo-msc' make[3]: *** [osmo-msc] Error 139 make[2]: *** [all-recursive] Error 1 Makefile:412: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Jan 24 00:59:32 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 00:59:32 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8267?= Message-ID: <624108072.0.1548291572353.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 24 00:59:35 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 00:59:35 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8267?= Message-ID: <1623800245.1.1548291575711.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 24 01:00:39 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 01:00:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--disa?= =?UTF-8?Q?ble-mgcp-transcoding,--enable-smpp,?= =?UTF-8?Q?default,osmocom-master-debian9_#3704?= Message-ID: <761992773.2.1548291639925.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 24 01:01:39 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 01:01:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,d?= =?UTF-8?Q?efault,osmocom-master-debian9_#3704?= Message-ID: <1394327691.3.1548291699888.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 24 06:53:40 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 06:53:40 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-simtrace2_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#262?= In-Reply-To: <32680631.776.1548226280232.JavaMail.jenkins@jenkins.osmocom.org> References: <32680631.776.1548226280232.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1436330500.13.1548312820041.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 24 09:41:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 09:41:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#833?= In-Reply-To: <1990478012.781.1548253114478.JavaMail.jenkins@jenkins.osmocom.org> References: <1990478012.781.1548253114478.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <206227255.17.1548322919088.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 122.34 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 24 10:05:05 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 24 Jan 2019 10:05:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12689 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr The idea of this test case is to verify SM-RP-MR assignment for a few concurrent MO/MT SMS being sent over GSUP. Basically, the algorythm is the following: 1.0 establish a RAN connection, 1.1 send CM Service Request for MO SMMA indication, 1.2 submit MO SMMA indication on DTAP, 1.3 expect MO-ForwardSM-Req on GSUP, 2.0 send MT SMS using MT-ForwardSM-Req on GSUP, 2.1 expect CP-DATA/RP-DATA for MT SMS on DTAP, 3.0 compare both SM-RP-MR values (for MT, assigned by the MSC), 3.1 send MO-ForwardSM-Res for MO SMMA on GSUP, 3.1.1 expect CP-DATA/RP-ACK for MO SMMA on DTAP, 3.2 send CP-DATA/RP-ACK for MT SMS on DTAP, 3.2.1 expect MT-ForwardSM-Res for MT SMS on GSUP. Change-Id: I17cbbaa64d9bce770f985588e93cd3eecd732120 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/12689/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index fb0798c..8d29e7a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2521,6 +2521,110 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Test SM-RP-MR assignment for MT-SMS over GSUP */ +private function f_tc_gsup_mo_mt_sms_rp_mr(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars_mo := valueof(t_SmsPars); /* MO SMMA */ + var SmsParameters spars_mt := valueof(t_SmsPars); /* MT SMS */ + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + /* Send CM Service Request for MO SMMA */ + f_establish_fully(EST_TYPE_MO_SMS); + + /* Submit MO SMMA on DTAP */ + log("Submit MO SMMA on DTAP, SM-RP-MR is '00'O"); + spars_mo.rp.msg_ref := '00'O; + f_mo_smma(spars_mo); + + /* Expect MO-forwardSM-Req for MO SMMA on GSUP */ + alt { + [] GSUP.receive(tr_GSUP_MO_READY_FOR_SM_REQ( + imsi := g_pars.imsi, + sm_rp_mr := spars_mo.rp.msg_ref, + sm_alert_rsn := GSUP_SM_ALERT_RSN_TYPE_MEM_AVAIL + )) { + log("RX MO-ReadyForSM-Req, SM-RP-MR is '00'O"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Submit MT SMS on GSUP */ + log("TX MT-forwardSM-Req for the MT SMS"); + f_gsup_forwardSM_req(spars_mt); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars_mt); + log("RX MT SMS on DTAP, DTAP TID is ", spars_mt.tid, + ", SM-RP-MR is ", spars_mt.rp.msg_ref); + + /* Both SM-RP-MR values shall be different */ + if (spars_mo.rp.msg_ref == spars_mt.rp.msg_ref) { + log("Both SM-RP-MR values shall be different"); + setverdict(fail); + } + + /* SM-RP-MR value for MT SMS shall be assigned */ + if (spars_mt.rp.msg_ref == 'FF'O) { + log("Unassigned SM-RP-MR value for the MT SMS"); + setverdict(fail); + } + + /* Trigger RP-ACK for MO SMMA by sending MO-forwardSM-Res */ + GSUP.send(valueof(ts_GSUP_MO_READY_FOR_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars_mo.rp.msg_ref))); + /* Expect RP-ACK for MO SMMA on DTAP */ + f_mo_sms_wait_rp_ack(spars_mo); + + /* Send RP-ACK for MT SMS and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars_mt); + alt { + [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + sm_rp_mr := spars_mt.rp.msg_ref + )) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mo_mt_sms_rp_mr() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(93); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mo_mt_sms_rp_mr), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* Test multi-part MT-SMS over GSUP */ private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -4457,6 +4561,7 @@ execute( TC_gsup_mt_sms_ack() ); execute( TC_gsup_mt_sms_err() ); execute( TC_gsup_mt_sms_rp_mr() ); + execute( TC_gsup_mo_mt_sms_rp_mr() ); execute( TC_gsup_mt_multi_part_sms() ); execute( TC_lu_and_mo_ussd_single_request() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 84df264..efe7219 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -59,6 +59,7 @@ + Tguard timeout MSC_Tests.ttcn:MASKED MSC_Tests control part -- To view, visit https://gerrit.osmocom.org/12689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I17cbbaa64d9bce770f985588e93cd3eecd732120 Gerrit-Change-Number: 12689 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 10:08:17 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 24 Jan 2019 10:08:17 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12687 ) Change subject: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d07354175444f9764fb0dd6ea188a64494d79fe Gerrit-Change-Number: 12687 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 10:08:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 10:08:22 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 24 Jan 2019 10:08:22 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12628 ) Change subject: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 24 Jan 2019 10:08:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 12:11:25 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 12:11:25 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity in ran_conn ...................................................................... Patch Set 6: (1 comment) > Meta: AFAIK we already store the entire CGI in the vlr_subscr? > maybe we should instead drop the LAC info from struct ran_conn completely? Fine by me. > (code looks like we are never storing the CI part of vls_subscr->cgi, that would be nice to fix) The question is if it's ok to use vls_subscr's CGI - do we have 1:1 relation between ran_conn and vls_subscr after your handover changes? > Meta meta: in the course of inter-MSC HO I am refactoring what the ran_conn represents, so I'd prefer to park this patch and revisit after the inter-MSC changes, to avoid merge conflicts and back-and-forths. I understand your concerns although it's kinda inconvenient to halt all OsmoMSC development until you're done with HO. Any chance you could start pushing ran_conn related changes to gerrit perhaps? https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 320 PS2, Line 320: case CELL_IDENT_CI: > a CELL_IDENT_CI is *only* a CI without a LAC; So it's impossible to have CI without LAC? Do you have a spec reference I can add in here instead of FIXME? -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 12:11:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 12:42:55 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 24 Jan 2019 12:42:55 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 Jan 2019 12:42:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 24 14:18:35 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 14:18:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#834?= In-Reply-To: <206227255.17.1548322919088.JavaMail.jenkins@jenkins.osmocom.org> References: <206227255.17.1548322919088.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1267881000.18.1548339515267.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 122.97 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type timer.c:45: warning 158: overflow in implicit constant conversion usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 24 14:45:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 14:45:36 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Max has uploaded a new patch set (#4) to the change originally created by Vadim Yanitskiy. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... VTY: add extended (11-bit) RACH detection toggle Since I838c21db29c54f1924dd478c2b34b46b70aab2cd we have both TS1 and TS2 synch. sequences, in addition to "default" TS0. Let's finally introduce the VTY configuration parameter, that can be used to toggle optional detection of both TS1 and TS2. Note: we keep this optional because of potentially bad impact on performance. There's no point in paying the performance penalty unless upper levels (BTS, PCU) actually make use of it. Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Related: OS#3054 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 37 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/11423/4 -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 14:48:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 14:48:06 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Max has uploaded a new patch set (#5) to the change originally created by Vadim Yanitskiy. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... VTY: add extended (11-bit) RACH detection toggle Since I838c21db29c54f1924dd478c2b34b46b70aab2cd we have both TS1 and TS2 synch. sequences, in addition to "default" TS0. Let's finally introduce the VTY configuration parameter, that can be used to toggle optional detection of both TS1 and TS2. Note: we keep this optional because of potentially bad impact on performance. There's no point in paying the performance penalty unless upper levels (BTS, PCU) actually make use of it. Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Related: OS#3054 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 36 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/11423/5 -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 14:50:24 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 14:50:24 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Patch Set 5: Code-Review+1 I've dropped changes from .cfg - after all, it's a temporary plug until further optimizations are implemented to allow developers to run tests without affecting regular users. Once optimizations are in place than we can simply enable this by default without the need to change configs as well. -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Tom Tsou Gerrit-CC: tnt Gerrit-Comment-Date: Thu, 24 Jan 2019 14:50:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jan 24 14:58:38 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 24 Jan 2019 14:58:38 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5c49d2a08e66d_55db748678136876@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/xUbuntu_17.04/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 525s] "Build date (Base Library): " __DATE__ " " __TIME__ "\n" [ 525s] ^~~~~~~~ [ 526s] ar -r libttcn3-parallel.a RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_static.o Parallel_main.o [ 526s] ar: creating libttcn3-parallel.a [ 526s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -I. -IRT1 -I/usr/include/libxml2 -I../common -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC LoggerPlugin_dynamic.cc -o LoggerPlugin_dynamic.o [ 526s] g++ -shared -Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -fPIC -o libttcn3-dynamic.so RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_dynamic.o Single_main.o -Ldefault/lib -lcrypto -lxml2 [ 526s] /usr/bin/ld: LoggerPlugin_dynamic.o: undefined reference to symbol 'dlclose@@GLIBC_2.2.5' [ 526s] //lib/x86_64-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line [ 526s] collect2: error: ld returned 1 exit status [ 526s] Makefile:344: recipe for target 'libttcn3-dynamic.so' failed [ 526s] make[2]: *** [libttcn3-dynamic.so] Error 1 [ 526s] make[2]: Leaving directory '/usr/src/packages/BUILD/core' [ 526s] Makefile:65: recipe for target 'all' failed [ 526s] make[1]: *** [all] Error 2 [ 526s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 526s] dh_auto_build: make -j1 returned exit code 2 [ 526s] debian/rules:6: recipe for target 'build' failed [ 526s] make: *** [build] Error 2 [ 526s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 526s] [ 526s] lamb12 failed "build eclipse-titan_6.3.1-1.dsc" at Thu Jan 24 14:58:33 UTC 2019. [ 526s] [ 526s] ### VM INTERACTION START ### [ 530s] [ 517.832903] sysrq: SysRq : Power Off [ 530s] [ 517.844169] reboot: Power down [ 530s] ### VM INTERACTION END ### [ 530s] [ 530s] lamb12 failed "build eclipse-titan_6.3.1-1.dsc" at Thu Jan 24 14:58:37 UTC 2019. [ 530s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jan 24 15:03:12 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 24 Jan 2019 15:03:12 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5c49d3c83cfde_55db74867813718b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/xUbuntu_17.04/i586 Package network:osmocom:latest/eclipse-titan failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 790s] "Build date (Base Library): " __DATE__ " " __TIME__ "\n" [ 790s] ^~~~~~~~ [ 791s] ar -r libttcn3-parallel.a RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_static.o Parallel_main.o [ 791s] ar: creating libttcn3-parallel.a [ 791s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -I. -IRT1 -I/usr/include/libxml2 -I../common -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC LoggerPlugin_dynamic.cc -o LoggerPlugin_dynamic.o [ 791s] g++ -shared -Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -fPIC -o libttcn3-dynamic.so RT1/TitanLoggerApi.o RT1/TitanLoggerControl.o config_process.lex.o config_process.tab.o RT1/PreGenRecordOf.o Addfunc.o Array.o ASN_Any.o ASN_CharacterString.o ASN_EmbeddedPDV.o ASN_External.o ASN_Null.o Basetype.o BER.o Bitstring.o Boolean.o Charstring.o Communication.o Component.o Default.o Encdec.o Error.o Float.o Hexstring.o RInt.o Integer.o Logger.o LoggerPlugin.o LoggerPluginManager.o LegacyLogger.o LoggingBits.o Module_list.o Objid.o Octetstring.o Port.o RAW.o Runtime.o Snapshot.o Struct_of.o Template.o TEXT.o Textbuf.o Timer.o Param_Types.o Universal_charstring.o Verdicttype.o XER.o XmlReader.o TitanLoggerControlImpl.o TCov.o JSON.o Profiler.o ProfilerTools.o Debugger.o DebuggerUI.o OER.o ../common/memory.o ../common/pattern_la.o ../common/pattern_p.o ../common/config_preproc.o ../common/config_preproc_la.o ../common/config_preproc_p.tab.o ../common/path.o ../common/pattern_uni.o ../common/Quadruple.o ../common/NetworkHandler.o ../common/Path2.o ../common/ModuleVersion.o ../common/JSON_Tokenizer.o ../common/UnicharPattern.o LoggerPlugin_dynamic.o Single_main.o -Ldefault/lib -lcrypto -lxml2 [ 792s] /usr/bin/ld: LoggerPlugin_dynamic.o: undefined reference to symbol 'dlopen@@GLIBC_2.1' [ 792s] //lib/i386-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line [ 792s] collect2: error: ld returned 1 exit status [ 792s] Makefile:344: recipe for target 'libttcn3-dynamic.so' failed [ 792s] make[2]: *** [libttcn3-dynamic.so] Error 1 [ 792s] make[2]: Leaving directory '/usr/src/packages/BUILD/core' [ 792s] Makefile:65: recipe for target 'all' failed [ 792s] make[1]: *** [all] Error 2 [ 792s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 792s] dh_auto_build: make -j1 returned exit code 2 [ 792s] debian/rules:6: recipe for target 'build' failed [ 792s] make: *** [build] Error 2 [ 792s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 792s] [ 792s] cloud117 failed "build eclipse-titan_6.3.1-1.dsc" at Thu Jan 24 15:03:01 UTC 2019. [ 792s] [ 792s] ### VM INTERACTION START ### [ 795s] [ 737.358797] sysrq: SysRq : Power Off [ 795s] [ 737.363171] reboot: Power down [ 797s] ### VM INTERACTION END ### [ 797s] [ 797s] cloud117 failed "build eclipse-titan_6.3.1-1.dsc" at Thu Jan 24 15:03:08 UTC 2019. [ 797s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:06:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 15:06:28 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12690 Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index f3d6c61..4289d0b 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -7,7 +7,7 @@ # Trigger image build (cache will be used when up-to-date) if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" - make -C "../$i" + make -C "../$i" || exit 1 fi # Detect missing images (build skipped/failure) -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:09:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 15:09:38 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#2). Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/2 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:17:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:17:19 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... Patch Set 2: why is the entire script not executed within "set -e" to exit on any errors of all commands? -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 24 Jan 2019 15:17:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:18:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:18:58 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Tom Tsou Gerrit-CC: tnt Gerrit-Comment-Date: Thu, 24 Jan 2019 15:18:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:27:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:27:59 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 24 Jan 2019 15:27:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:28:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:28:23 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 15:28:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:28:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:28:47 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 15:28:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:29:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:29:04 +0000 Subject: Change in osmo-hlr[master]: VTY tests: fill DB before running test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12680 ) Change subject: VTY tests: fill DB before running test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e Gerrit-Change-Number: 12680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 24 Jan 2019 15:29:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:29:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:29:08 +0000 Subject: Change in osmo-hlr[master]: Add IMEI column to subscriber table In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table ...................................................................... Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_imsi() and db_subscr_get_by_imei(). The new functions are used in db_test, and in follow-up commits [1], [2]. Upgrade DB schema to version 2. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. Follow-up commit [1] will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. [1] change-id I09274ecbed64224f7ae305e09ede773931da2a57 "Optionally store IMEI in subscriber table" [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 203 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sql/hlr.sql b/sql/hlr.sql index 9ff9867..10838f2 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -5,8 +5,10 @@ imsi VARCHAR(15) UNIQUE NOT NULL, -- Chapter 2.1.2 msisdn VARCHAR(15) UNIQUE, - -- Chapter 2.2.3: Most recent / current IMEI + -- Chapter 2.2.3: Most recent / current IMEISV imeisv VARCHAR, + -- Chapter 2.1.9: Most recent / current IMEI + imei VARCHAR(14), -- Chapter 2.4.5 vlr_number VARCHAR(15), -- Chapter 2.4.6 @@ -74,4 +76,4 @@ -- 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 = 1; +PRAGMA user_version = 2; diff --git a/src/db.c b/src/db.c index f7cbace..09e1776 100644 --- a/src/db.c +++ b/src/db.c @@ -28,12 +28,13 @@ #include "db_bootstrap.h" /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ -#define CURRENT_SCHEMA_VERSION 1 +#define CURRENT_SCHEMA_VERSION 2 #define SEL_COLUMNS \ "id," \ "imsi," \ "msisdn," \ + "imei," \ "vlr_number," \ "sgsn_number," \ "sgsn_address," \ @@ -50,8 +51,10 @@ [DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?", [DB_STMT_SEL_BY_MSISDN] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE msisdn = ?", [DB_STMT_SEL_BY_ID] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE id = ?", + [DB_STMT_SEL_BY_IMEI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imei = ?", [DB_STMT_UPD_VLR_BY_ID] = "UPDATE subscriber SET vlr_number = $number WHERE id = $subscriber_id", [DB_STMT_UPD_SGSN_BY_ID] = "UPDATE subscriber SET sgsn_number = $number WHERE id = $subscriber_id", + [DB_STMT_UPD_IMEI_BY_IMSI] = "UPDATE subscriber SET imei = $imei WHERE imsi = $imsi", [DB_STMT_AUC_BY_IMSI] = "SELECT id, algo_id_2g, ki, algo_id_3g, k, op, opc, sqn, ind_bitlen" " FROM subscriber" @@ -290,6 +293,40 @@ return rc; } +static int db_upgrade_v2(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN imei VARCHAR(14) default NULL"; + const char *set_schema_version_sql = "PRAGMA user_version = 2"; + + rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql); + return rc; + } + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + sqlite3_finalize(stmt); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + return rc; + } + + rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql); + return rc; + } + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return rc; +} + static int db_get_user_version(struct db_context *dbc) { const char *user_version_sql = "PRAGMA user_version"; @@ -400,6 +437,15 @@ } version = 1; /* fall through */ + case 1: + rc = db_upgrade_v2(dbc); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 2: (rc=%d) %s\n", + rc, sqlite3_errmsg(dbc->db)); + goto out_free; + } + version = 2; + /* fall through */ /* case N: ... */ default: break; diff --git a/src/db.h b/src/db.h index ae592fb..c438b8d 100644 --- a/src/db.h +++ b/src/db.h @@ -9,8 +9,10 @@ DB_STMT_SEL_BY_IMSI, DB_STMT_SEL_BY_MSISDN, DB_STMT_SEL_BY_ID, + DB_STMT_SEL_BY_IMEI, DB_STMT_UPD_VLR_BY_ID, DB_STMT_UPD_SGSN_BY_ID, + DB_STMT_UPD_IMEI_BY_IMSI, DB_STMT_AUC_BY_IMSI, DB_STMT_AUC_UPD_SQN, DB_STMT_UPD_PURGE_CS_BY_IMSI, @@ -71,6 +73,7 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; char msisdn[GT_MAX_DIGITS+1]; /* imeisv? */ + char imei[GSM23003_IMEI_NUM_DIGITS+1]; char vlr_number[32]; char sgsn_number[32]; char sgsn_address[GT_MAX_DIGITS+1]; @@ -122,6 +125,7 @@ const char *msisdn); int db_subscr_update_aud_by_id(struct db_context *dbc, int64_t subscr_id, const struct sub_auth_data_str *aud); +int db_subscr_update_imei_by_imsi(struct db_context *dbc, const char* imsi, const char *imei); int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi, struct hlr_subscriber *subscr); @@ -129,6 +133,7 @@ struct hlr_subscriber *subscr); int db_subscr_get_by_id(struct db_context *dbc, int64_t id, struct hlr_subscriber *subscr); +int db_subscr_get_by_imei(struct db_context *dbc, const char *imei, struct hlr_subscriber *subscr); int db_subscr_nam(struct db_context *dbc, const char *imsi, bool nam_val, bool is_ps); int db_subscr_lu(struct db_context *dbc, int64_t subscr_id, const char *vlr_or_sgsn_number, bool is_ps); diff --git a/src/db_hlr.c b/src/db_hlr.c index 2569477..3ba457c 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -386,6 +386,53 @@ return ret; } +/*! Set a subscriber's IMEI in the HLR database. + * \param[in,out] dbc database context. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. + * \returns 0 on success, -ENOENT when the given subscriber does not exist, + * -EIO on database errors. + */ +int db_subscr_update_imei_by_imsi(struct db_context *dbc, const char* imsi, const char *imei) +{ + int rc, ret = 0; + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_UPD_IMEI_BY_IMSI]; + + if (imei && !osmo_imei_str_valid(imei, false)) { + LOGP(DAUC, LOGL_ERROR, "Cannot update subscriber IMSI='%s': invalid IMEI: '%s'\n", imsi, imei); + return -EINVAL; + } + + if (!db_bind_text(stmt, "$imsi", imsi)) + return -EIO; + if (imei && !db_bind_text(stmt, "$imei", imei)) + return -EIO; + + /* execute the statement */ + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber IMSI='%s': SQL Error: %s\n", imsi, + sqlite3_errmsg(dbc->db)); + ret = -EIO; + goto out; + } + + /* verify execution result */ + rc = sqlite3_changes(dbc->db); + if (!rc) { + LOGP(DAUC, LOGL_ERROR, "Cannot update IMEI for subscriber IMSI='%s': no such subscriber\n", imsi); + ret = -ENOENT; + } else if (rc != 1) { + LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber IMSI='%s': SQL modified %d rows (expected 1)\n", + imsi, rc); + ret = -EIO; + } + +out: + db_remove_reset(stmt); + return ret; +} + /* Common code for db_subscr_get_by_*() functions. */ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscriber *subscr, const char **err) @@ -415,18 +462,19 @@ subscr->id = sqlite3_column_int64(stmt, 0); copy_sqlite3_text_to_buf(subscr->imsi, stmt, 1); copy_sqlite3_text_to_buf(subscr->msisdn, stmt, 2); + copy_sqlite3_text_to_buf(subscr->imei, stmt, 3); /* FIXME: These should all be BLOBs as they might contain NUL */ - copy_sqlite3_text_to_buf(subscr->vlr_number, stmt, 3); - copy_sqlite3_text_to_buf(subscr->sgsn_number, stmt, 4); - copy_sqlite3_text_to_buf(subscr->sgsn_address, stmt, 5); - subscr->periodic_lu_timer = sqlite3_column_int(stmt, 6); - subscr->periodic_rau_tau_timer = sqlite3_column_int(stmt, 7); - subscr->nam_cs = sqlite3_column_int(stmt, 8); - subscr->nam_ps = sqlite3_column_int(stmt, 9); - subscr->lmsi = sqlite3_column_int(stmt, 10); - subscr->ms_purged_cs = sqlite3_column_int(stmt, 11); - subscr->ms_purged_ps = sqlite3_column_int(stmt, 12); - last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 13); + copy_sqlite3_text_to_buf(subscr->vlr_number, stmt, 4); + copy_sqlite3_text_to_buf(subscr->sgsn_number, stmt, 5); + copy_sqlite3_text_to_buf(subscr->sgsn_address, stmt, 6); + subscr->periodic_lu_timer = sqlite3_column_int(stmt, 7); + subscr->periodic_rau_tau_timer = sqlite3_column_int(stmt, 8); + subscr->nam_cs = sqlite3_column_int(stmt, 9); + subscr->nam_ps = sqlite3_column_int(stmt, 10); + subscr->lmsi = sqlite3_column_int(stmt, 11); + subscr->ms_purged_cs = sqlite3_column_int(stmt, 12); + subscr->ms_purged_ps = sqlite3_column_int(stmt, 13); + last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 14); if (last_lu_seen_str && last_lu_seen_str[0] != '\0') { if (strptime(last_lu_seen_str, DB_LAST_LU_SEEN_FMT, &tm) == NULL) { LOGP(DAUC, LOGL_ERROR, "Cannot parse last LU timestamp '%s' of subscriber with IMSI='%s': %s\n", @@ -530,6 +578,28 @@ return rc; } +/*! Retrieve subscriber data from the HLR database. + * \param[in,out] dbc database context. + * \param[in] imei ASCII string of identifier digits + * \param[out] subscr place retrieved data in this struct. + * \returns 0 on success, -ENOENT if no such subscriber was found, -EIO on + * database error. + */ +int db_subscr_get_by_imei(struct db_context *dbc, const char *imei, struct hlr_subscriber *subscr) +{ + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SEL_BY_IMEI]; + const char *err; + int rc; + + if (!db_bind_text(stmt, NULL, imei)) + return -EIO; + + rc = db_sel(dbc, stmt, subscr, &err); + if (rc) + LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: IMEI=%s: %s\n", imei, err); + return rc; +} + /*! You should use hlr_subscr_nam() instead; enable or disable PS or CS for a * subscriber without notifying GSUP clients. * \param[in,out] dbc database context. diff --git a/tests/db/db_test.c b/tests/db/db_test.c index c4ed6ed..56905a9 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -148,6 +148,7 @@ Pd(id); Ps(imsi); Ps(msisdn); + Ps(imei); Ps(vlr_number); Ps(sgsn_number); Ps(sgsn_address); @@ -296,6 +297,23 @@ ASSERT_RC(db_subscr_update_msisdn_by_imsi(dbc, "foobar", "99"), -ENOENT); ASSERT_SEL(msisdn, "99", -ENOENT); + comment("Set valid / invalid IMEI"); + + ASSERT_RC(db_subscr_update_imei_by_imsi(dbc, imsi0, "12345678901234"), 0); + ASSERT_SEL(imei, "12345678901234", 0); + + ASSERT_RC(db_subscr_update_imei_by_imsi(dbc, imsi0, "123456789012345"), -EINVAL); /* too long */ + ASSERT_SEL(imei, "12345678901234", 0); + ASSERT_SEL(imei, "123456789012345", -ENOENT); + + comment("Set the same IMEI again"); + ASSERT_RC(db_subscr_update_imei_by_imsi(dbc, imsi0, "12345678901234"), 0); + ASSERT_SEL(imei, "12345678901234", 0); + + comment("Remove IMEI"); + ASSERT_RC(db_subscr_update_imei_by_imsi(dbc, imsi0, NULL), 0); + ASSERT_SEL(imei, "12345678901234", -ENOENT); + comment("Set / unset nam_cs and nam_ps"); /* nam_val, is_ps */ diff --git a/tests/db/db_test.err b/tests/db/db_test.err index 1d34045..6ebdae2 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -227,6 +227,54 @@ DAUC Cannot read subscriber from db: MSISDN='99': No such subscriber +--- Set valid / invalid IMEI + +db_subscr_update_imei_by_imsi(dbc, imsi0, "12345678901234") --> 0 + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> 0 +struct hlr_subscriber { + .id = 1, + .imsi = '123456789000000', + .msisdn = '543210123456789', + .imei = '12345678901234', +} + +db_subscr_update_imei_by_imsi(dbc, imsi0, "123456789012345") --> -EINVAL +DAUC Cannot update subscriber IMSI='123456789000000': invalid IMEI: '123456789012345' + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> 0 +struct hlr_subscriber { + .id = 1, + .imsi = '123456789000000', + .msisdn = '543210123456789', + .imei = '12345678901234', +} + +db_subscr_get_by_imei(dbc, "123456789012345", &g_subscr) --> -ENOENT +DAUC Cannot read subscriber from db: IMEI=123456789012345: No such subscriber + + +--- Set the same IMEI again + +db_subscr_update_imei_by_imsi(dbc, imsi0, "12345678901234") --> 0 + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> 0 +struct hlr_subscriber { + .id = 1, + .imsi = '123456789000000', + .msisdn = '543210123456789', + .imei = '12345678901234', +} + + +--- Remove IMEI + +db_subscr_update_imei_by_imsi(dbc, imsi0, NULL) --> 0 + +db_subscr_get_by_imei(dbc, "12345678901234", &g_subscr) --> -ENOENT +DAUC Cannot read subscriber from db: IMEI=12345678901234: No such subscriber + + --- Set / unset nam_cs and nam_ps db_subscr_nam(dbc, imsi0, false, true) --> 0 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:29:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:29:09 +0000 Subject: Change in osmo-hlr[master]: Optionally store IMEI in subscriber table In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table ...................................................................... Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 43 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/hlr.c b/src/hlr.c index 614e99f..0098a32 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -419,8 +419,22 @@ return -1; } - /* Only print the IMEI for now, it's planned to store it here (OS#2541) */ - LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s\n", gsup->imsi, imei); + /* Save in DB if desired */ + if (g_hlr->store_imei) { + LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing IMEI = %s\n", gsup->imsi, imei); + if (db_subscr_update_imei_by_imsi(g_hlr->dbc, gsup->imsi, imei) < 0) { + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + } else { + /* Check if subscriber exists and print IMEI */ + LOGP(DMAIN, LOGL_INFO, "IMSI='%s': has IMEI = %s (consider setting 'store-imei')\n", gsup->imsi, imei); + struct hlr_subscriber subscr; + if (db_subscr_get_by_imsi(g_hlr->dbc, gsup->imsi, &subscr) < 0) { + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + } /* Accept all IMEIs */ gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK; diff --git a/src/hlr.h b/src/hlr.h index e9cc747..00fa43c 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -51,6 +51,8 @@ struct llist_head ussd_routes; struct llist_head ss_sessions; + + bool store_imei; }; extern struct hlr *g_hlr; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 6706aa4..04e0191 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -71,6 +71,8 @@ static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); + if (g_hlr->store_imei) + vty_out(vty, " store-imei%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -305,6 +307,23 @@ 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" + " Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1').") +{ + g_hlr->store_imei = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_no_store_imei, cfg_no_store_imei_cmd, + "no store-imei", + "Do not save the IMEI in the database, when receiving Check IMEI requests.") +{ + g_hlr->store_imei = false; + return CMD_SUCCESS; +} + /*********************************************************************** * Common Code ***********************************************************************/ @@ -368,6 +387,8 @@ install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd); + install_element(HLR_NODE, &cfg_store_imei_cmd); + install_element(HLR_NODE, &cfg_no_store_imei_cmd); hlr_vty_subscriber_init(); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 63d3da0..6e72ed0 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -79,6 +79,8 @@ ussd default-route external EUSE no ussd default-route ncss-guard-timeout <0-255> + store-imei + no store-imei OsmoHLR(config-hlr)# gsup OsmoHLR(config-hlr-gsup)# list @@ -98,6 +100,7 @@ OsmoHLR(config)# exit OsmoHLR# configure terminal OsmoHLR(config)# hlr +OsmoHLR(config-hlr)# store-imei OsmoHLR(config-hlr)# gsup OsmoHLR(config-hlr-gsup)# end OsmoHLR# disable @@ -116,6 +119,7 @@ logging level ss info ... hlr + store-imei gsup bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:29:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:29:09 +0000 Subject: Change in osmo-hlr[master]: VTY tests: fill DB before running test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12680 ) Change subject: VTY tests: fill DB before running test ...................................................................... VTY tests: fill DB before running test Create a test_subscriber.vty.sql file with a dummy entry that has the ID 100. All entries created in test_subscriber.vty have an ID > 100 now. This will be used in follow-up commit [1] to create a database entry with an invalid IMEI value to test the related error handling code path (that entry could not be created through the VTY). [1]: change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Related: OS#3733 Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e --- M tests/Makefile.am M tests/test_subscriber.vty A tests/test_subscriber.vty.sql 3 files changed, 65 insertions(+), 60 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index e07749c..4da8ab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,6 +56,8 @@ # make vty-test U=-u vty-test: -rm -f $(VTY_TEST_DB) + sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql + sqlite3 $(VTY_TEST_DB) < $(srcdir)/test_subscriber.vty.sql osmo_verify_transcript_vty.py -v \ -n OsmoHLR -p 4258 \ -r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \ diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index 8677c9b..d310eb3 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -29,15 +29,15 @@ OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' -OsmoHLR# subscriber id 1 show -% No subscriber for id = '1' +OsmoHLR# subscriber id 101 show +% No subscriber for id = '101' OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' OsmoHLR# show subscriber imsi 123456789023000 % No subscriber for imsi = '123456789023000' -OsmoHLR# show subscriber id 1 -% No subscriber for id = '1' +OsmoHLR# show subscriber id 101 +% No subscriber for id = '101' OsmoHLR# show subscriber msisdn 12345 % No subscriber for msisdn = '12345' @@ -50,16 +50,16 @@ OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber msisdn 12345 show @@ -69,15 +69,15 @@ % Updated subscriber IMSI='123456789023000' to MSISDN='12345' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 12345 -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 12345 OsmoHLR# subscriber msisdn 12345 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 12345 @@ -91,26 +91,26 @@ OsmoHLR# subscriber msisdn 423 show % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 % Updated subscriber IMSI='123456789023000' to MSISDN='423' OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 @@ -141,7 +141,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g xor ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: XOR @@ -149,39 +149,39 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 @@ -189,63 +189,63 @@ OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee +OsmoHLR# subscriber id 101 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee +OsmoHLR# subscriber id 101 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa +OsmoHLR# subscriber id 101 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX +OsmoHLR# subscriber id 101 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a -OsmoHLR# subscriber id 1 update aud2g none -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g none +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 @@ -275,7 +275,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -286,7 +286,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -296,13 +296,13 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -313,7 +313,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -324,7 +324,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -336,7 +336,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE @@ -344,9 +344,9 @@ OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 -OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef -OsmoHLR# subscriber id 1 show - ID: 1 +OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef +OsmoHLR# subscriber id 101 show + ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 @@ -361,14 +361,14 @@ OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' -OsmoHLR# subscriber id 1 show -% No subscriber for id = '1' +OsmoHLR# subscriber id 101 show +% No subscriber for id = '101' OsmoHLR# subscriber msisdn 423 show % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 - ID: 1 + ID: 101 IMSI: 123456789023000 MSISDN: none diff --git a/tests/test_subscriber.vty.sql b/tests/test_subscriber.vty.sql new file mode 100644 index 0000000..ff167aa --- /dev/null +++ b/tests/test_subscriber.vty.sql @@ -0,0 +1,3 @@ +-- Dummy entry with ID=100 gives all subscribers created in the VTY test an +-- ID > 100, so we can pre-fill the database with IDs < 100. +INSERT INTO subscriber (id, imsi) VALUES(100, '000000000000100'); -- To view, visit https://gerrit.osmocom.org/12680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e Gerrit-Change-Number: 12680 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:29:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 15:29:10 +0000 Subject: Change in osmo-hlr[master]: VTY: integrate IMEI In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI ...................................................................... VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty M tests/test_subscriber.vty.sql 4 files changed, 152 insertions(+), 15 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 92cfa2a..998d1be 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -58,6 +58,15 @@ vty_out(vty, " IMSI: %s%s", *subscr->imsi ? subscr->imsi : "none", VTY_NEWLINE); vty_out(vty, " MSISDN: %s%s", *subscr->msisdn ? subscr->msisdn : "none", VTY_NEWLINE); + + if (*subscr->imei) { + char checksum = osmo_luhn(subscr->imei, 14); + if (checksum == -EINVAL) + vty_out(vty, " IMEI: %s (INVALID LENGTH!)%s", subscr->imei, VTY_NEWLINE); + else + vty_out(vty, " IMEI: %s%c%s", subscr->imei, checksum, VTY_NEWLINE); + } + if (*subscr->vlr_number) vty_out(vty, " VLR number: %s%s", subscr->vlr_number, VTY_NEWLINE); if (*subscr->sgsn_number) @@ -131,6 +140,7 @@ static int get_subscr_by_argv(struct vty *vty, const char *type, const char *id, struct hlr_subscriber *subscr) { + char imei_buf[GSM23003_IMEI_NUM_DIGITS_NO_CHK+1]; int rc = -1; if (strcmp(type, "imsi") == 0) rc = db_subscr_get_by_imsi(g_hlr->dbc, id, subscr); @@ -138,6 +148,17 @@ rc = db_subscr_get_by_msisdn(g_hlr->dbc, id, subscr); else if (strcmp(type, "id") == 0) rc = db_subscr_get_by_id(g_hlr->dbc, atoll(id), subscr); + else if (strcmp(type, "imei") == 0) { + /* Verify IMEI with checksum digit */ + if (osmo_imei_str_valid(id, true)) { + /* Cut the checksum off */ + osmo_strlcpy(imei_buf, id, sizeof(imei_buf)); + id = imei_buf; + vty_out(vty, "%% Checksum validated and stripped for search: imei = '%s'%s", id, + VTY_NEWLINE); + } + rc = db_subscr_get_by_imei(g_hlr->dbc, id, subscr); + } if (rc) vty_out(vty, "%% No subscriber for %s = '%s'%s", type, id, VTY_NEWLINE); @@ -147,12 +168,13 @@ #define SUBSCR_CMD "subscriber " #define SUBSCR_CMD_HELP "Subscriber management commands\n" -#define SUBSCR_ID "(imsi|msisdn|id) IDENT" +#define SUBSCR_ID "(imsi|msisdn|id|imei) IDENT" #define SUBSCR_ID_HELP \ "Identify subscriber by IMSI\n" \ "Identify subscriber by MSISDN (phone number)\n" \ "Identify subscriber by database ID\n" \ - "IMSI/MSISDN/ID of the subscriber\n" + "Identify subscriber by IMEI\n" \ + "IMSI/MSISDN/ID/IMEI of the subscriber\n" #define SUBSCR SUBSCR_CMD SUBSCR_ID " " #define SUBSCR_HELP SUBSCR_CMD_HELP SUBSCR_ID_HELP @@ -508,6 +530,54 @@ return CMD_SUCCESS; } +DEFUN(subscriber_imei, + subscriber_imei_cmd, + SUBSCR_UPDATE "imei (none|IMEI)", + SUBSCR_UPDATE_HELP + "Set IMEI of the subscriber (normally populated from MSC, no need to set this manually)\n" + "Forget IMEI\n" + "Set IMEI (use for debug only!)\n") +{ + struct hlr_subscriber subscr; + const char *id_type = argv[0]; + const char *id = argv[1]; + const char *imei = argv[2]; + char imei_buf[GSM23003_IMEI_NUM_DIGITS_NO_CHK+1]; + + if (strcmp(imei, "none") == 0) + imei = NULL; + else { + /* Verify IMEI with checksum digit */ + if (osmo_imei_str_valid(imei, true)) { + /* Cut the checksum off */ + osmo_strlcpy(imei_buf, imei, sizeof(imei_buf)); + imei = imei_buf; + } else if (!osmo_imei_str_valid(imei, false)) { + vty_out(vty, "%% IMEI invalid: '%s'%s", imei, VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (get_subscr_by_argv(vty, id_type, id, &subscr)) + return CMD_WARNING; + + if (db_subscr_update_imei_by_imsi(g_hlr->dbc, subscr.imsi, imei)) { + vty_out(vty, "%% Error: cannot update IMEI for subscriber IMSI='%s'%s", + subscr.imsi, VTY_NEWLINE); + return CMD_WARNING; + } + + if (imei) + vty_out(vty, "%% Updated subscriber IMSI='%s' to IMEI='%s'%s", + subscr.imsi, imei, VTY_NEWLINE); + else + vty_out(vty, "%% Updated subscriber IMSI='%s': removed IMEI%s", + subscr.imsi, VTY_NEWLINE); + + return CMD_SUCCESS; +} + + void hlr_vty_subscriber_init(void) { install_element_ve(&subscriber_show_cmd); @@ -519,4 +589,5 @@ install_element(ENABLE_NODE, &subscriber_aud2g_cmd); install_element(ENABLE_NODE, &subscriber_no_aud3g_cmd); install_element(ENABLE_NODE, &subscriber_aud3g_cmd); + install_element(ENABLE_NODE, &subscriber_imei_cmd); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 6e72ed0..ee7885b 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -17,8 +17,8 @@ show talloc-context (application|all) (full|brief|DEPTH) tree ADDRESS show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP show gsup-connections - subscriber (imsi|msisdn|id) IDENT show - show subscriber (imsi|msisdn|id) IDENT + subscriber (imsi|msisdn|id|imei) IDENT show + show subscriber (imsi|msisdn|id|imei) IDENT OsmoHLR> enable OsmoHLR# list diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index d310eb3..265f8fa 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -2,15 +2,16 @@ OsmoHLR# list ... - subscriber (imsi|msisdn|id) IDENT show - show subscriber (imsi|msisdn|id) IDENT + subscriber (imsi|msisdn|id|imei) IDENT show + show subscriber (imsi|msisdn|id|imei) IDENT subscriber imsi IDENT create - subscriber (imsi|msisdn|id) IDENT delete - subscriber (imsi|msisdn|id) IDENT update msisdn (none|MSISDN) - subscriber (imsi|msisdn|id) IDENT update aud2g none - subscriber (imsi|msisdn|id) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI - subscriber (imsi|msisdn|id) IDENT update aud3g none - subscriber (imsi|msisdn|id) IDENT update aud3g milenage k K (op|opc) OP_C [ind-bitlen] [<0-28>] + subscriber (imsi|msisdn|id|imei) IDENT delete + subscriber (imsi|msisdn|id|imei) IDENT update msisdn (none|MSISDN) + subscriber (imsi|msisdn|id|imei) IDENT update aud2g none + subscriber (imsi|msisdn|id|imei) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI + subscriber (imsi|msisdn|id|imei) IDENT update aud3g none + subscriber (imsi|msisdn|id|imei) IDENT update aud3g milenage k K (op|opc) OP_C [ind-bitlen] [<0-28>] + subscriber (imsi|msisdn|id|imei) IDENT update imei (none|IMEI) OsmoHLR# subscriber? subscriber Subscriber management commands @@ -19,13 +20,16 @@ imsi Identify subscriber by IMSI msisdn Identify subscriber by MSISDN (phone number) id Identify subscriber by database ID + imei Identify subscriber by IMEI OsmoHLR# subscriber imsi ? - IDENT IMSI/MSISDN/ID of the subscriber + IDENT IMSI/MSISDN/ID/IMEI of the subscriber OsmoHLR# subscriber msisdn ? - IDENT IMSI/MSISDN/ID of the subscriber + IDENT IMSI/MSISDN/ID/IMEI of the subscriber OsmoHLR# subscriber id ? - IDENT IMSI/MSISDN/ID of the subscriber + IDENT IMSI/MSISDN/ID/IMEI of the subscriber +OsmoHLR# subscriber imei ? + IDENT IMSI/MSISDN/ID/IMEI of the subscriber OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' @@ -33,6 +37,9 @@ % No subscriber for id = '101' OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' +OsmoHLR# subscriber imei 357613004448485 show +% Checksum validated and stripped for search: imei = '35761300444848' +% No subscriber for imei = '35761300444848' OsmoHLR# show subscriber imsi 123456789023000 % No subscriber for imsi = '123456789023000' @@ -40,6 +47,9 @@ % No subscriber for id = '101' OsmoHLR# show subscriber msisdn 12345 % No subscriber for msisdn = '12345' +OsmoHLR# show subscriber imei 357613004448485 +% Checksum validated and stripped for search: imei = '35761300444848' +% No subscriber for imei = '35761300444848' OsmoHLR# subscriber imsi 1234567890230001 create % Not a valid IMSI: 1234567890230001 @@ -118,6 +128,7 @@ msisdn Set MSISDN (phone number) of the subscriber aud2g Set 2G authentication data aud3g Set UMTS authentication data (3G, and 2G with UMTS AKA) + imei Set IMEI of the subscriber (normally populated from MSC, no need to set this manually) OsmoHLR# subscriber imsi 123456789023000 update msisdn ? none Remove MSISDN (phone number) @@ -374,3 +385,55 @@ OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' + +OsmoHLR# subscriber imsi 123456789023000 create +% Created subscriber 123456789023000 + ID: 101 + IMSI: 123456789023000 + MSISDN: none + +OsmoHLR# subscriber imsi 123456789023000 update imei ? + none Forget IMEI + IMEI Set IMEI (use for debug only!) + +OsmoHLR# subscriber imsi 123456789023000 update imei 35761300444848 +% Updated subscriber IMSI='123456789023000' to IMEI='35761300444848' + +OsmoHLR# subscriber imsi 123456789023000 update imei 357613004448484 +% IMEI invalid: '357613004448484' + +OsmoHLR# subscriber imsi 123456789023000 update imei 357613004448485 +% Updated subscriber IMSI='123456789023000' to IMEI='35761300444848' + +OsmoHLR# show subscriber imei 35761300444848 + ID: 101 + IMSI: 123456789023000 + MSISDN: none + IMEI: 357613004448485 + +OsmoHLR# show subscriber imei 357613004448485 +% Checksum validated and stripped for search: imei = '35761300444848' + ID: 101 + IMSI: 123456789023000 + MSISDN: none + IMEI: 357613004448485 + +OsmoHLR# show subscriber imei 357613004448484 +% No subscriber for imei = '357613004448484' + +OsmoHLR# subscriber imsi 123456789023000 update imei none +% Updated subscriber IMSI='123456789023000': removed IMEI + +OsmoHLR# subscriber imsi 123456789023000 show + ID: 101 + IMSI: 123456789023000 + MSISDN: none + +OsmoHLR# subscriber imsi 123456789023000 delete +% Deleted subscriber for IMSI '123456789023000' + +OsmoHLR# show subscriber id 99 + ID: 99 + IMSI: 000000000000099 + MSISDN: none + IMEI: 12345 (INVALID LENGTH!) diff --git a/tests/test_subscriber.vty.sql b/tests/test_subscriber.vty.sql index ff167aa..e2c1af2 100644 --- a/tests/test_subscriber.vty.sql +++ b/tests/test_subscriber.vty.sql @@ -1,3 +1,6 @@ +-- Subscriber with invalid IMEI length +INSERT INTO subscriber (id, imsi, imei) VALUES(99, '000000000000099', '12345'); + -- Dummy entry with ID=100 gives all subscribers created in the VTY test an -- ID > 100, so we can pre-fill the database with IDs < 100. INSERT INTO subscriber (id, imsi) VALUES(100, '000000000000100'); -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 13 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:31:10 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 Jan 2019 15:31:10 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12679/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12679/1/src/osmo-bsc/bsc_vty.c at 1576 PS1, Line 1576: "show lchan all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", we talked in person and the result is that 'show lchan summary-all' is a good compromise, and otherwise this patch is completely fine. (the 'all' flag could be implemented differently, but it's a bikeshed from me) -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 24 Jan 2019 15:31:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:31:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 15:31:14 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... Patch Set 2: > why is the entire script not executed within "set -e" to exit on any errors of all commands? This script is sourced by the various jenkins.sh scripts. The jenkins.sh scripts can not simply have "set -e", because they need to clean up the Docker containers that run in the background (so if they exit half way during the scripts, these are not cleaned up). -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 15:31:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:38:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 15:38:27 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#3). Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/3 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 15:46:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 Jan 2019 15:46:33 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/codec_pref.h File include/osmocom/bsc/codec_pref.h: https://gerrit.osmocom.org/#/c/12625/2/include/osmocom/bsc/codec_pref.h at 24 PS2, Line 24: const struct gsm_bts *bts, enum rate_pref rate_pref); > in ch_mode_rate, we add a 'bool full_rate', and we also add a 'rate_pref'? [?] Also talked about this in person, and obviously ch_mode_rate is an out-argument, while the rate_pref is an input argument. I got confused about that because the function internals looked as if they were using ch_mode_rate->full rate as input, and overlooked that before using ch_mode_rate->full_rate, that value is already set, and it is in fact not an in-arg. https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h at 121 PS4, Line 121: struct channel_mode_and_rate ch_mode_rate_alt; > Are there really only two possible mode,rate combinations? [?] We talked in person, and there really are only two possible outcomes: one for an FR and one for an HR lchan. So keeping exactly two preferences is perfectly correct. Keeping the lchan_select() out of the codec iteration is also a good idea in terms of complexity of that loop, and in terms of separate testability. https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h at 300 PS4, Line 300: struct channel_mode_and_rate ch_mode_rate; put this in the user_plane scope? -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 15:46:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:23:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:23:17 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Patch Set 5: Note: test failure doesn't seem to be related to the code change - I've created https://osmocom.org/issues/3766 to track it. -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Tom Tsou Gerrit-CC: tnt Gerrit-Comment-Date: Thu, 24 Jan 2019 16:23:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:23:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:23:20 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... VTY: add extended (11-bit) RACH detection toggle Since I838c21db29c54f1924dd478c2b34b46b70aab2cd we have both TS1 and TS2 synch. sequences, in addition to "default" TS0. Let's finally introduce the VTY configuration parameter, that can be used to toggle optional detection of both TS1 and TS2. Note: we keep this optional because of potentially bad impact on performance. There's no point in paying the performance penalty unless upper levels (BTS, PCU) actually make use of it. Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Related: OS#3054 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 36 insertions(+), 10 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 45b58eb..3b1b979 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -304,6 +304,21 @@ return CMD_SUCCESS; } +DEFUN(cfg_ext_rach, cfg_ext_rach_cmd, + "ext-rach (disable|enable)", + "Enable extended (11-bit) RACH (default=disable)\n") +{ + struct trx_ctx *trx = trx_from_vty(vty); + + if (strcmp("disable", argv[0]) == 0) + trx->cfg.ext_rach = false; + + if (strcmp("enable", argv[0]) == 0) + trx->cfg.ext_rach = true; + + return CMD_SUCCESS; +} + DEFUN(cfg_rt_prio, cfg_rt_prio_cmd, "rt-prio <1-32>", "Set the SCHED_RR real-time priority\n" @@ -417,6 +432,7 @@ vty_out(vty, " rssi-offset %f%s", trx->cfg.rssi_offset, VTY_NEWLINE); vty_out(vty, " swap-channels %s%s", trx->cfg.swap_channels ? "enable" : "disable", VTY_NEWLINE); vty_out(vty, " egprs %s%s", trx->cfg.egprs ? "enable" : "disable", VTY_NEWLINE); + vty_out(vty, " ext-rach %s%s", trx->cfg.ext_rach ? "enable" : "disable", VTY_NEWLINE); if (trx->cfg.sched_rr != 0) vty_out(vty, " rt-prio %u%s", trx->cfg.sched_rr, VTY_NEWLINE); @@ -454,6 +470,7 @@ vty_out(vty, " RSSI to dBm offset: %f%s", trx->cfg.rssi_offset, VTY_NEWLINE); vty_out(vty, " Swap channels: %s%s", trx->cfg.swap_channels ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " EDGE support: %s%s", trx->cfg.egprs ? "Enabled" : "Disabled", VTY_NEWLINE); + vty_out(vty, " Extended RACH support: %s%s", trx->cfg.ext_rach ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " Real Time Priority: %u (%s)%s", trx->cfg.sched_rr, trx->cfg.sched_rr ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " Channels: %u%s", trx->cfg.num_chans, VTY_NEWLINE); @@ -564,6 +581,7 @@ install_element(TRX_NODE, &cfg_rssi_offset_cmd); install_element(TRX_NODE, &cfg_swap_channels_cmd); install_element(TRX_NODE, &cfg_egprs_cmd); + install_element(TRX_NODE, &cfg_ext_rach_cmd); install_element(TRX_NODE, &cfg_rt_prio_cmd); install_element(TRX_NODE, &cfg_filler_cmd); diff --git a/CommonLibs/trx_vty.h b/CommonLibs/trx_vty.h index c921722..8d251ee 100644 --- a/CommonLibs/trx_vty.h +++ b/CommonLibs/trx_vty.h @@ -57,6 +57,7 @@ double offset; double rssi_offset; bool swap_channels; + bool ext_rach; bool egprs; unsigned int sched_rr; unsigned int num_chans; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index df1c0bd..cfb36c3 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -159,7 +159,8 @@ * are still expected to report clock indications through control channel * activity. */ -bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge) +bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, + bool edge, bool ext_rach) { int d_srcport, d_dstport, c_srcport, c_dstport; @@ -173,6 +174,7 @@ return false; } + mExtRACH = ext_rach; mEdge = edge; mDataSockets.resize(mChans); @@ -497,16 +499,16 @@ break; case IV: case VI: - return RACH; + return mExtRACH ? EXT_RACH : RACH; break; case V: { int mod51 = burstFN % 51; if ((mod51 <= 36) && (mod51 >= 14)) - return RACH; + return mExtRACH ? EXT_RACH : RACH; else if ((mod51 == 4) || (mod51 == 5)) - return RACH; + return mExtRACH ? EXT_RACH : RACH; else if ((mod51 == 45) || (mod51 == 46)) - return RACH; + return mExtRACH ? EXT_RACH : RACH; else if (mHandover[burstTN][sdcch4_subslot[burstFN % 102]]) return RACH; else @@ -524,7 +526,7 @@ case XIII: { int mod52 = burstFN % 52; if ((mod52 == 12) || (mod52 == 38)) - return RACH; + return mExtRACH ? EXT_RACH : RACH; else if ((mod52 == 25) || (mod52 == 51)) return IDLE; else @@ -635,9 +637,11 @@ noise = 20.0 * log10(rxFullScale / state->mNoiseLev); } + unsigned max_toa = (type == RACH || type == EXT_RACH) ? + mMaxExpectedDelayAB : mMaxExpectedDelayNB; + /* Detect normal or RACH bursts */ - rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, - (type==RACH)?mMaxExpectedDelayAB:mMaxExpectedDelayNB); + rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, max_toa); if (rc > 0) { type = (CorrType) rc; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index e250adc..432e3b4 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -114,7 +114,8 @@ ~Transceiver(); /** Start the control loop */ - bool init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge); + bool init(FillerType filler, size_t rtsc, unsigned rach_delay, + bool edge, bool ext_rach); /** attach the radioInterface receive FIFO */ bool receiveFIFO(VectorFIFO *wFIFO, size_t chan) @@ -210,6 +211,7 @@ int mSPSRx; ///< number of samples per Rx symbol size_t mChans; + bool mExtRACH; bool mEdge; bool mOn; ///< flag to indicate that transceiver is powered on bool mForceClockInterface; ///< flag to indicate whether IND CLOCK shall be sent unconditionally after transceiver is started diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 0e63020..1f35cd8 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -144,7 +144,7 @@ trx->cfg.rx_sps, trx->cfg.num_chans, GSM::Time(3,0), radio, trx->cfg.rssi_offset); if (!transceiver->init(trx->cfg.filler, trx->cfg.rtsc, - trx->cfg.rach_delay, trx->cfg.egprs)) { + trx->cfg.rach_delay, trx->cfg.egprs, trx->cfg.ext_rach)) { LOG(ALERT) << "Failed to initialize transceiver"; return -1; } @@ -408,6 +408,7 @@ ost << " Tx Samples-per-Symbol... " << trx->cfg.tx_sps << std::endl; ost << " Rx Samples-per-Symbol... " << trx->cfg.rx_sps << std::endl; ost << " EDGE support............ " << trx->cfg.egprs << std::endl; + ost << " Extended RACH support... " << trx->cfg.ext_rach << std::endl; ost << " Reference............... " << trx->cfg.clock_ref << std::endl; ost << " C0 Filler Table......... " << trx->cfg.filler << std::endl; ost << " Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl; -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Tom Tsou Gerrit-CC: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:28:02 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:28:02 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 16:28:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:30:40 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 Jan 2019 16:30:40 +0000 Subject: Change in osmo-bsc[master]: fix lchan modifications: switch off re-using lchan during assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12401 ) Change subject: fix lchan modifications: switch off re-using lchan during assignment ...................................................................... Patch Set 3: - I have no time to write a test. - It is so obviously broken. - Why it is broken is explained in this patch and its comments. I also found another failure in this code path just now: the assignment FSM does not get terminated in the lchan re-use case, and hence the ASSIGNMENT_END event never gets dispatched. This is completely untested, unneccessary, broken. > why disable instead of removing if the failures around this get fixed, the disabled part still makes sense. It serves as a reminder where to implement channel re-use in the future. Note that https://gerrit.osmocom.org/c/osmo-bsc/+/12625 is a merge conflict with this patch. I will put this one after the other. -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 24 Jan 2019 16:30:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 24 16:31:23 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 16:31:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#835?= In-Reply-To: <1267881000.18.1548339515267.JavaMail.jenkins@jenkins.osmocom.org> References: <1267881000.18.1548339515267.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <711668503.20.1548347483868.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:47:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 16:47:28 +0000 Subject: Change in osmo-msc[master]: Log transaction allocation errors as such In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Log transaction allocation errors as such ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12615/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12615/1//COMMIT_MSG at 7 PS1, Line 7: Log transaction allocation errors as such How about: "Various logging fixes" as title and writing the "Log transaction allocation errors as such." line into the description below? -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 16:47:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:54:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:54:06 +0000 Subject: Change in libusrp[master]: Add config for git-review Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12691 Change subject: Add config for git-review ...................................................................... Add config for git-review Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/91/12691/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..7f120b8 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=libusrp -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:55:52 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 Jan 2019 16:55:52 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: Code-Review-1 (11 comments) my earlier higher level reservations are resolved, but now I did find low level problems: https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12625/4/include/osmocom/bsc/gsm_data.h at 300 PS4, Line 300: struct channel_mode_and_rate ch_mode_rate; > put this in the user_plane scope? this ^ should probably go inside the assignment{} scope instead, see other comments https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 304 PS4, Line 304: static int check_requires_voice_stream(struct gsm_subscriber_connection *conn) -1: code dup: please write one function that takes a chan_mode as input and returns a requires_voice_stream bool, and call this function twice; once for the primary chan_mode and once for the alternate chan_mode. -1: actually, the requires_voice_stream must be identical between first and alternate preference, right? -1: it doesn't make sense to fail the assignment if only one of the choices is not supported. https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 377 PS4, Line 377: if (lchan_type_compat_with_mode(conn->lchan->type, &req->ch_mode_rate_pref)) { -1: code dup: please implement this only once in a utility function, and call it twice: once for the primary choice, and if that failed then for the alt_pref. Below, I expect it to look something like this: if (check_for_existing_lchan(conn, &req->ch_mode_rate_pref) || check_for_existing_lchan(conn, &req->ch_mode_rate_alt)) { /* re-using existing lchan succeeded. Discard FSM instance, it is not needed. */ osmo_fsm_inst_term(conn->assignment.fi); return; } check_new_lchan(conn, &req->ch_mode_rate_pref); if (!conn->lchan) check_new_lchan(conn, &req->ch_mode_rate_alt); if (!conn->lchan) { assignment_fail(No lchan available...); return; } https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 443 PS4, Line 443: if (!conn->assignment.new_lchan && req->ch_mode_rate_alt_present) { -1: code dup (same) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 479 PS4, Line 479: fi = osmo_fsm_inst_alloc_child(&assignment_fsm, conn->fi, GSCON_EV_ASSIGNMENT_END); (FYI, I considered whether it is better to allocate the FSM instance only *after* we checked whether the current lchan is sufficient, but IMHO it makes more sense to allocate it and use it as logging context. Also this makes sure the ASSIGNMENT_END signal gets dispatched to the conn FSM, which we apparently also forget to do in the re-use case at the moment. Also FYI, the channel re-use code path is completely broken for many other reasons, see https://gerrit.osmocom.org/c/osmo-bsc/+/12401 ) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 495 PS4, Line 495: if (check_for_existing_lchan(conn)) > ...maybe we can deallocate the assignment. [?] ^ still valid, but don't worry about this one, see https://gerrit.osmocom.org/c/osmo-bsc/+/12401 https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 501 PS4, Line 501: conn->ch_mode_rate = req->ch_mode_rate_pref; -1: the ch_mode_rate use must not be ambiguous: does it apply to the current conn->lchan or to the new assignment.new_lchan? The point is that if the assignment fails for whatever reason, you must be able to just discard the assignment information and keep on using the previous lchan without having modified any other state of the conn. So, instead of modifying the conn->ch_mode_rate, you must stay inside the conn->assignment.* scope. Only when the new lchan gets accepted and moved from conn->assignment.new_lchan to conn->lchan is when the conn->ch_mode_rate is allowed to be modified. Maybe it makes more sense to place ch_mode_rate into the lchan struct instead? Or if it is only used during assignment negotiation, put it in the conn->assignment{} scope. https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 503 PS4, Line 503: /* In case the lchan allocation fails, we try with the alternat ("alternate". use line width.) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/osmo_bsc_bssap.c at 609 PS4, Line 609: static int select_codec(struct assignment_request *req, struct gsm0808_channel_type *ct, "select_codecs" ? https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/osmo_bsc_bssap.c at 632 PS4, Line 632: RATE_PREF_NONE); (if full rate didn't work, then this must end up being half rate? maybe pass RATE_PREF_HR explicitly, then?) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/osmo_bsc_bssap.c at 647 PS4, Line 647: RATE_PREF_NONE); (RATE_PREF_FR?) -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 16:55:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:57:04 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:57:04 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12625/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12625/4//COMMIT_MSG at 22 PS4, Line 22: Since the BSC currently only trys the first best codec/rate that is I think it's "tries". -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 16:57:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:58:42 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 Jan 2019 16:58:42 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/4/src/osmo-bsc/assignment_fsm.c at 377 PS4, Line 377: if (lchan_type_compat_with_mode(conn->lchan->type, &req->ch_mode_rate_pref)) { > -1: code dup: please implement this only once in a utility function, and call it twice: once for the [?] mistake in my comment: should be if (!conn->assignment.new_lchan) in both places -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 16:58:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 16:59:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 16:59:38 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12628 ) Change subject: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 24 Jan 2019 16:59:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:03:52 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 17:03:52 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > data->called is invalid I don't get it: if data->called is invalid than how can you set a number inside of it? Also, no code between goto and cont_setup seems to access data->called so I don't understand which of the checks below fails and why? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Thu, 24 Jan 2019 17:03:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:15:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 17:15:26 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... Patch Set 2: Code-Review+1 Change looks good to me. I find this useful, and I can't see how having a multiline string logged here would be an issue. As Max said, it is only logged in case of error anyway. The code does look cleaner to me in the new version. Old output: Mismatch! Expected: 14010809710000004026f0280102 New output: DLGLOBAL __wrap_osmo_gsup_client_send() L0 data mismatch: expected 14 01 08 09 71 00 00 00 40 26 f0 28 01 02 !! msgb 04 01 08 09 71 00 00 00 40 26 f0 28 01 02 -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:15:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:15:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 17:15:52 +0000 Subject: Change in osmo-asf4-dfu[master]: remove OCTSIM in USB ID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12609 ) Change subject: remove OCTSIM in USB ID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 Gerrit-Change-Number: 12609 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 17:15:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:19:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 17:19:07 +0000 Subject: Change in libusrp[master]: Add config for git-review In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:19:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:20:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 17:20:31 +0000 Subject: Change in libosmo-abis[master]: Log peer's port in accept callback In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12654 ) Change subject: Log peer's port in accept callback ...................................................................... Patch Set 1: It's great that you want to add useful information. However, removing other useful information (like to which local port) is not good. Thre are many interfaces that use IPA (Abis, SCCPlite, CTRL, GSUP, ...) and the local port number could help to determine which of those the message relates to. Maybe use the full tuple and use osmo_sock_get_name2() instead? -- To view, visit https://gerrit.osmocom.org/12654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I186974dae1819af8c92f9ea9eeb966ec7c9c9f55 Gerrit-Change-Number: 12654 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 24 Jan 2019 17:20:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:21:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 17:21:15 +0000 Subject: Change in libosmo-abis[master]: Set local IP in ipa_server_link properly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12653 ) Change subject: Set local IP in ipa_server_link properly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 Gerrit-Change-Number: 12653 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 17:21:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:22:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 17:22:03 +0000 Subject: Change in libusrp[master]: Add config for git-review In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review ...................................................................... Patch Set 1: I didn't know about git-review yet, nice! https://docs.openstack.org/infra/git-review/usage.html -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:22:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:22:52 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 17:22:52 +0000 Subject: Change in libosmo-abis[master]: Set local IP in ipa_server_link properly In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12653 ) Change subject: Set local IP in ipa_server_link properly ...................................................................... Set local IP in ipa_server_link properly When creating IPA link for server we might be called without explicit address (which is legit - it means bind to all available addresses). However in this case we won't have 'addr' field of ipa_server_link initialized properly. Fix this by following changes: * don't copy NULL value as address * use socket's local IP when no address set explicitly Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 --- M src/input/ipa.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/ipa.c b/src/input/ipa.c index 09e3426..9853ffa 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -248,6 +248,7 @@ static int ipa_server_fd_cb(struct osmo_fd *ofd, unsigned int what) { int fd, ret; + char ipbuf[INET6_ADDRSTRLEN + 1]; struct sockaddr_in sa; socklen_t sa_len = sizeof(sa); struct ipa_server_link *link = ofd->data; @@ -258,6 +259,13 @@ "peer, reason=`%s'\n", strerror(errno)); return fd; } + + if (!link->addr) { + ret = osmo_sock_get_local_ip(fd, ipbuf, INET6_ADDRSTRLEN + 1); + if (ret == 0) + link->addr = talloc_strdup(link, ipbuf); + } + LOGP(DLINP, LOGL_NOTICE, "accept()ed new link from %s to port %u\n", inet_ntoa(sa.sin_addr), link->port); @@ -290,7 +298,8 @@ ipa_link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; ipa_link->ofd.cb = ipa_server_fd_cb; ipa_link->ofd.data = ipa_link; - ipa_link->addr = talloc_strdup(ipa_link, addr); + if (addr) + ipa_link->addr = talloc_strdup(ipa_link, addr); ipa_link->port = port; ipa_link->accept_cb = accept_cb; ipa_link->line = line; -- To view, visit https://gerrit.osmocom.org/12653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 Gerrit-Change-Number: 12653 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:23:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 17:23:58 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12608 ) Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 Jan 2019 17:23:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:37:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 17:37:08 +0000 Subject: Change in osmo-msc[master]: Handle LCLS-NOTIFICATION message from BSS In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12608 ) Change subject: Handle LCLS-NOTIFICATION message from BSS ...................................................................... Handle LCLS-NOTIFICATION message from BSS Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Related: OS#2487 --- M src/libmsc/a_iface_bssap.c 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 41af93c..cb245b8 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -585,6 +585,29 @@ return 0; } +/* Handle incoming LCLS-NOTIFICATION BSSMAP message: 3GPP TS 48.008 ?3.2.1.93 */ +static int bssmap_rx_lcls_notif(const struct ran_conn *conn, const struct msgb *msg, const struct tlv_parsed *tp) +{ + + bool status_avail = TLVP_PRESENT(tp, GSM0808_IE_LCLS_BSS_STATUS), + break_avail = TLVP_PRESENT(tp, GSM0808_IE_LCLS_BREAK_REQ); + + /* Either ?3.2.2.119 LCLS-BSS-Status or ?3.2.2.120 LCLS-Break-Request shall be present */ + if (!(status_avail ^ break_avail)) { + LOGPCONN(conn, LOGL_ERROR, "Ignoring broken LCLS Notification message\n"); + return -EINVAL; + } + + if (status_avail) + LOGPCONN(conn, LOGL_NOTICE, "Received LCLS Status: %s\n", + gsm0808_lcls_status_name(tlvp_val8(tp, GSM0808_IE_LCLS_BSS_STATUS, GSM0808_LCLS_STS_NA))); + + if (break_avail) + LOGPCONN(conn, LOGL_NOTICE, "Received LCLS Break Request\n"); + + return 0; +} + /* Handle incoming connection oriented BSSMAP messages */ static int rx_bssmap(struct osmo_sccp_user *scu, const struct a_conn_info *a_conn_info, struct msgb *msg) { @@ -646,6 +669,8 @@ return bssmap_rx_sapi_n_rej(conn, msg, &tp); case BSS_MAP_MSG_ASSIGMENT_COMPLETE: return bssmap_rx_ass_compl(conn, msg, &tp); + case BSS_MAP_MSG_LCLS_NOTIFICATION: + return bssmap_rx_lcls_notif(conn, msg, &tp); default: LOGPCONN(conn, LOGL_ERROR, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg_type)); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/12608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf5f9cad1f70aee56d5bca8fe09a24ca417e7a63 Gerrit-Change-Number: 12608 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:40:37 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 17:40:37 +0000 Subject: Change in osmo-msc[master]: Various logging fixes In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12615 to look at the new patch set (#2). Change subject: Various logging fixes ...................................................................... Various logging fixes Log transaction allocation errors as such. While at it, use proper subsystem to log missing VLR subscriber. Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 --- M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12615/2 -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:49:26 2019 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Thu, 24 Jan 2019 17:49:26 +0000 Subject: Change in gr-gsm[master]: MacOS fixes Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/12692 Change subject: MacOS fixes ...................................................................... MacOS fixes - Include grgsm/endian.h in tch_h_decoder_impl.cc - Revert 0ed39fbf9340bdfb254bec5e3b94d9f00cf9d151 as linking with boost_thread is needed Fixes GH-444 Change-Id: I00884962295082cff3eb64fa21e9f73437be0001 --- M CMakeLists.txt M lib/decoding/tch_h_decoder_impl.cc 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/92/12692/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index d539b24..27a3df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" ) -find_package(Boost "1.35" COMPONENTS filesystem system)# thread) +find_package(Boost "1.35" COMPONENTS filesystem system thread) if(NOT Boost_FOUND) message(FATAL_ERROR "Boost required to compile gr-gsm") diff --git a/lib/decoding/tch_h_decoder_impl.cc b/lib/decoding/tch_h_decoder_impl.cc index d2f29c7..11da907 100644 --- a/lib/decoding/tch_h_decoder_impl.cc +++ b/lib/decoding/tch_h_decoder_impl.cc @@ -25,6 +25,7 @@ #endif #include +#include #include "tch_h_decoder_impl.h" extern "C" { -- To view, visit https://gerrit.osmocom.org/12692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I00884962295082cff3eb64fa21e9f73437be0001 Gerrit-Change-Number: 12692 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 17:58:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 24 Jan 2019 17:58:20 +0000 Subject: Change in osmo-msc[master]: Various logging fixes In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Various logging fixes ...................................................................... Patch Set 2: Code-Review+2 (giving +2 as Vadim already gave +1) -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:58:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:21:26 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:21:26 +0000 Subject: Change in openbsc[master]: Remove meas_* utils In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12655 ) Change subject: Remove meas_* utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0cedaad4b717c8c5198842e2acd610f8e03f957 Gerrit-Change-Number: 12655 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 18:21:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:21:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:21:42 +0000 Subject: Change in openbsc[master]: Remove openbsc-dev package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12656 ) Change subject: Remove openbsc-dev package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a96c217999416099aa7ce690845f56fc132274c Gerrit-Change-Number: 12656 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 18:21:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:21:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:21:45 +0000 Subject: Change in openbsc[master]: Remove osmocom-ipaccess-utils-dbg package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12657 ) Change subject: Remove osmocom-ipaccess-utils-dbg package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If56c288121bd26fead9a921c1f04f9958468e1b6 Gerrit-Change-Number: 12657 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 18:21:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:22:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:22:41 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 5 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 Jan 2019 18:22:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:23:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:23:12 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 18:23:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:23:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:23:13 +0000 Subject: Change in osmo-gsm-manuals[master]: common: extend glossary.adoc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc ...................................................................... common: extend glossary.adoc Add EIR, IMEISV, LU, SS, TS, USSD, and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 74973b3..e8fed3c 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -85,6 +85,9 @@ GPRS; introduces 8PSK EGPRS:: Enhanced GPRS; the part of EDGE relating to GPRS services +EIR:: + Equipment Identity Register; core network element that stores and manages + IMEI numbers ESME:: External SMS Entity; an external application interfacing with a SMSC over SMPP @@ -128,7 +131,11 @@ IE:: Information Element IMEI:: - International Mobile Equipment Identity; unique identifier for the mobile phone + International Mobile Equipment Identity; unique 14-digit decimal number to + globally identify a mobile device, optionally with a 15th checksum digit +IMEISV:: + IMEI software version; unique 14-digit decimal number to globally identify a + mobile device (same as IMEI) plus two software version digits (total digits: 16) IMSI:: International Mobile Subscriber Identity; 15-digit unique identifier for the subscriber/SIM; starts with MCC/MNC of issuing operator @@ -147,6 +154,9 @@ 44.064_ <<3gpp-ts-44-064>>) Location Area:: Location Area; a geographic area containing multiple BTS +LU:: + Location Updating; can be of type IMSI-Attach or Periodic. Procedure that + indicates a subscriber's physical presence in a given radio cell. M2PA:: MTP2 Peer-to-Peer Adaptation; a SIGTRAN Variant (_RFC 4165_ <>) M2UA:: @@ -284,6 +294,10 @@ Short Message Service Center; store-and-forward relay for short messages SS7:: Signaling System No. 7; Classic digital telephony signaling system +SS:: + Supplementary Services; query and set various service parameters between + subscriber and core network (e.g. USSD, 3rd-party calls, hold/retrieve, + advice-of-charge, call deflection) SSH:: Secure Shell; _IETF RFC 4250_ <> to 4254 SSN:: @@ -306,6 +320,8 @@ Trivial File Transfer Protocol; (_IETF RFC 1350_ <>) TRX:: Transceiver; element of a BTS serving a single carrier +TS:: + Technical Specification u-Boot:: Boot loader used in various embedded systems UBI:: @@ -324,10 +340,16 @@ USIM:: Universal Subscriber Identity Module; application running on a UICC to provide subscriber identity for UMTS and GSM networks +USSD:: + Unstructured Supplementary Service Data; textual dialog between subscriber + and core network, e.g. '*#100#' -> 'Your extension is 1234' VCTCXO:: Voltage Controlled, Temperature Compensated Crystal Oscillator; a precision oscillator, superior to a classic crystal oscillator, but inferior to an OCXO +VLR:: + Visitor Location Register; volatile storage of attached subscribers in + the MSC VPLMN:: Visited PLMN; the network in which the subscriber is currently registered; may differ from HPLMN when on roaming -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:24:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:24:25 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 24 Jan 2019 18:24:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:25:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:25:01 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 24 Jan 2019 18:25:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:26:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:26:13 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12671 ) Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... Patch Set 2: I am not a friend of those functions. In the end, we will have "second static buffer" versions of all of our functions, and megabytes of static buffers. I think if it's needed twice in one "printf" statement, the caller will simply use the _buf() variant and put the buffer on the local stack of the caller. -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 24 Jan 2019 18:26:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 18:26:39 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 Jan 2019 18:26:39 +0000 Subject: Change in libosmocore[master]: osmo_fsm_state_name: make robust against NULL fi In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12670 ) Change subject: osmo_fsm_state_name: make robust against NULL fi ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 Gerrit-Change-Number: 12670 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 24 Jan 2019 18:26:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 19:04:55 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 19:04:55 +0000 Subject: Change in openbsc[master]: Remove meas_* utils In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12655 ) Change subject: Remove meas_* utils ...................................................................... Remove meas_* utils The counterparts in OsmoBSC repo are actively maintained and (partially) packaged for .deb - let's drop old versions to minimize user confusion. Change-Id: Ia0cedaad4b717c8c5198842e2acd610f8e03f957 --- M openbsc/src/utils/Makefile.am D openbsc/src/utils/meas_db.c D openbsc/src/utils/meas_db.h D openbsc/src/utils/meas_json.c D openbsc/src/utils/meas_pcap2db.c D openbsc/src/utils/meas_udp2db.c D openbsc/src/utils/meas_vis.c 7 files changed, 0 insertions(+), 1,199 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 26494e1..76a73a3 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -18,30 +18,10 @@ $(COVERAGE_LDFLAGS) \ $(NULL) -noinst_HEADERS = \ - meas_db.h \ - $(NULL) - bin_PROGRAMS = \ bs11_config \ isdnsync \ - meas_json \ $(NULL) -if HAVE_SQLITE3 -bin_PROGRAMS += \ - osmo-meas-udp2db \ - $(NULL) -if HAVE_PCAP -bin_PROGRAMS += \ - osmo-meas-pcap2db \ - $(NULL) -endif -endif -if HAVE_LIBCDK -bin_PROGRAMS += \ - meas_vis \ - $(NULL) -endif if BUILD_SMPP noinst_PROGRAMS = \ @@ -77,71 +57,3 @@ $(LIBOSMOGSM_LIBS) \ $(LIBSMPP34_LIBS) \ $(NULL) - -meas_vis_SOURCES = \ - meas_vis.c \ - $(NULL) - -meas_vis_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - -lcdk \ - -lncurses \ - $(NULL) - -meas_vis_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(NULL) - -osmo_meas_pcap2db_SOURCES = \ - meas_pcap2db.c \ - meas_db.c \ - $(NULL) - -osmo_meas_pcap2db_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(SQLITE3_LIBS) \ - -lpcap \ - $(NULL) - -osmo_meas_pcap2db_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - -osmo_meas_udp2db_SOURCES = \ - meas_udp2db.c \ - meas_db.c \ - $(NULL) - -osmo_meas_udp2db_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(SQLITE3_LIBS) \ - $(NULL) - -osmo_meas_udp2db_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - -meas_json_SOURCES = \ - meas_json.c \ - $(NULL) - -meas_json_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -meas_json_CFLAGS = \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - diff --git a/openbsc/src/utils/meas_db.c b/openbsc/src/utils/meas_db.c deleted file mode 100644 index d81efca..0000000 --- a/openbsc/src/utils/meas_db.c +++ /dev/null @@ -1,330 +0,0 @@ -/* Routines for storing measurement reports in SQLite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 "meas_db.h" - -#define INS_MR "INSERT INTO meas_rep (time, imsi, name, scenario, nr, bs_power, ms_timing_offset, fpc, ms_l1_pwr, ms_l1_ta) VALUES (?,?,?,?,?,?,?,?,?,?)" -#define INS_UD "INSERT INTO meas_rep_unidir (meas_id, rx_lev_full, rx_lev_sub, rx_qual_full, rx_qual_sub, dtx, uplink) VALUES (?,?,?,?,?,?,?)" -#define UPD_MR "UPDATE meas_rep SET ul_unidir=?, dl_unidir=? WHERE id=?" - -struct meas_db_state { - sqlite3 *db; - sqlite3_stmt *stmt_ins_ud; - sqlite3_stmt *stmt_ins_mr; - sqlite3_stmt *stmt_upd_mr; -}; - -/* macros to check for SQLite3 result codes */ -#define _SCK_OK(db, call, exp) \ - do { \ - int rc = call; \ - if (rc != exp) { \ - fprintf(stderr,"SQL Error in line %u: %s\n", \ - __LINE__, sqlite3_errmsg(db)); \ - goto err_io; \ - } \ - } while (0) -#define SCK_OK(db, call) _SCK_OK(db, call, SQLITE_OK) -#define SCK_DONE(db, call) _SCK_OK(db, call, SQLITE_DONE) - -static int _insert_ud(struct meas_db_state *st, unsigned long meas_id, int dtx, - int uplink, const struct gsm_meas_rep_unidir *ud) -{ - unsigned long rowid; - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 1, meas_id)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 2, - rxlev2dbm(ud->full.rx_lev))); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 3, - rxlev2dbm(ud->sub.rx_lev))); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 4, ud->full.rx_qual)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 5, ud->sub.rx_qual)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 6, dtx)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 7, uplink)); - - SCK_DONE(st->db, sqlite3_step(st->stmt_ins_ud)); - - SCK_OK(st->db, sqlite3_reset(st->stmt_ins_ud)); - - return sqlite3_last_insert_rowid(st->db); -err_io: - exit(1); -} - -/* insert a measurement report into the database */ -int meas_db_insert(struct meas_db_state *st, const char *imsi, - const char *name, unsigned long timestamp, - const char *scenario, - const struct gsm_meas_rep *mr) -{ - int rc; - sqlite3_int64 rowid, ul_rowid, dl_rowid; - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 1, timestamp)); - - if (imsi) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 2, - imsi, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 2)); - - if (name) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 3, - name, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 3)); - - if (scenario) - SCK_OK(st->db, sqlite3_bind_text(st->stmt_ins_mr, 4, - scenario, -1, SQLITE_STATIC)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 4)); - - - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 5, mr->nr)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 6, mr->bs_power)); - - if (mr->flags & MEAS_REP_F_MS_TO) - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 7, mr->ms_timing_offset)); - else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_ins_mr, 7)); - - if (mr->flags & MEAS_REP_F_FPC) - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 8, 1)); - else - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 8, 0)); - - if (mr->flags & MEAS_REP_F_MS_L1) { - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 9, - mr->ms_l1.pwr)); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 10, - mr->ms_l1.ta)); - } - - SCK_DONE(st->db, sqlite3_step(st->stmt_ins_mr)); - SCK_OK(st->db, sqlite3_reset(st->stmt_ins_mr)); - - rowid = sqlite3_last_insert_rowid(st->db); - - /* insert uplink measurement */ - ul_rowid = _insert_ud(st, rowid, mr->flags & MEAS_REP_F_UL_DTX, - 1, &mr->ul); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 1, ul_rowid)); - - /* insert downlink measurement, if present */ - if (mr->flags & MEAS_REP_F_DL_VALID) { - dl_rowid = _insert_ud(st, rowid, mr->flags & MEAS_REP_F_DL_DTX, - 0, &mr->dl); - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 2, dl_rowid)); - } else - SCK_OK(st->db, sqlite3_bind_null(st->stmt_upd_mr, 2)); - - /* update meas_rep with the id's of the unidirectional - * measurements */ - SCK_OK(st->db, sqlite3_bind_int(st->stmt_upd_mr, 3, rowid)); - SCK_DONE(st->db, sqlite3_step(st->stmt_upd_mr)); - SCK_OK(st->db, sqlite3_reset(st->stmt_upd_mr)); - - return 0; - -err_io: - return -EIO; -} - -int meas_db_begin(struct meas_db_state *st) -{ - SCK_OK(st->db, sqlite3_exec(st->db, "BEGIN", NULL, NULL, NULL)); - - return 0; - -err_io: - return -EIO; -} - -int meas_db_commit(struct meas_db_state *st) -{ - SCK_OK(st->db, sqlite3_exec(st->db, "COMMIT", NULL, NULL, NULL)); - - return 0; - -err_io: - return -EIO; -} - -static const char *create_stmts[] = { - "CREATE TABLE IF NOT EXISTS meas_rep (" - "id INTEGER PRIMARY KEY AUTOINCREMENT," - "time TIMESTAMP," - "imsi TEXT," - "name TEXT," - "scenario TEXT," - "nr INTEGER," - "bs_power INTEGER NOT NULL," - "ms_timing_offset INTEGER," - "fpc INTEGER NOT NULL DEFAULT 0," - "ul_unidir INTEGER REFERENCES meas_rep_unidir(id)," - "dl_unidir INTEGER REFERENCES meas_rep_unidir(id)," - "ms_l1_pwr INTEGER," - "ms_l1_ta INTEGER" - ")", - "CREATE TABLE IF NOT EXISTS meas_rep_unidir (" - "id INTEGER PRIMARY KEY AUTOINCREMENT," - "meas_id INTEGER NOT NULL REFERENCES meas_rep(id)," - "rx_lev_full INTEGER NOT NULL," - "rx_lev_sub INTEGER NOT NULL," - "rx_qual_full INTEGER NOT NULL," - "rx_qual_sub INTEGER NOT NULL," - "dtx BOOLEAN NOT NULL DEFAULT 0," - "uplink BOOLEAN NOT NULL" - ")", - "CREATE VIEW IF NOT EXISTS path_loss AS " - "SELECT " - "meas_rep.id, " - "datetime(time,'unixepoch') AS timestamp, " - "imsi, " - "name, " - "scenario, " - "ms_timing_offset, " - "ms_l1_ta, " - "fpc, " - "ms_l1_pwr, " - "ud_ul.rx_lev_full AS ul_rx_lev_full, " - "ms_l1_pwr-ud_ul.rx_lev_full AS ul_path_loss_full, " - "ud_ul.rx_lev_sub ul_rx_lev_sub, " - "ms_l1_pwr-ud_ul.rx_lev_sub AS ul_path_loss_sub, " - "ud_ul.rx_qual_full AS ul_rx_qual_full, " - "ud_ul.rx_qual_sub AS ul_rx_qual_sub, " - "bs_power, " - "ud_dl.rx_lev_full AS dl_rx_lev_full, " - "bs_power-ud_dl.rx_lev_full AS dl_path_loss_full, " - "ud_dl.rx_lev_sub AS dl_rx_lev_sub, " - "bs_power-ud_dl.rx_lev_sub AS dl_path_loss_sub, " - "ud_dl.rx_qual_full AS dl_rx_qual_full, " - "ud_dl.rx_qual_sub AS dl_rx_qual_sub " - "FROM " - "meas_rep, " - "meas_rep_unidir AS ud_dl, " - "meas_rep_unidir AS ud_ul " - "WHERE " - "ud_ul.id = meas_rep.ul_unidir AND " - "ud_dl.id = meas_rep.dl_unidir", - "CREATE VIEW IF NOT EXISTS overview AS " - "SELECT " - "id," - "timestamp," - "imsi," - "name," - "scenario," - "ms_l1_pwr," - "ul_rx_lev_full," - "ul_path_loss_full," - "ul_rx_qual_full," - "bs_power," - "dl_rx_lev_full," - "dl_path_loss_full," - "dl_rx_qual_full " - "FROM path_loss", -}; - -static int check_create_tbl(struct meas_db_state *st) -{ - int i, rc; - - for (i = 0; i < ARRAY_SIZE(create_stmts); i++) { - SCK_OK(st->db, sqlite3_exec(st->db, create_stmts[i], - NULL, NULL, NULL)); - } - - return 0; -err_io: - return -EIO; -} - - -#define PREP_CHK(db, stmt, ptr) \ - do { \ - int rc; \ - rc = sqlite3_prepare_v2(db, stmt, strlen(stmt)+1, \ - ptr, NULL); \ - if (rc != SQLITE_OK) { \ - fprintf(stderr, "Error during prepare of '%s': %s\n", \ - stmt, sqlite3_errmsg(db)); \ - goto err_io; \ - } \ - } while (0) - -struct meas_db_state *meas_db_open(void *ctx, const char *fname) -{ - int rc; - struct meas_db_state *st = talloc_zero(ctx, struct meas_db_state); - - if (!st) - return NULL; - - rc = sqlite3_open_v2(fname, &st->db, - SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, - NULL); - if (rc != SQLITE_OK) { - fprintf(stderr, "Unable to open DB: %s\n", - sqlite3_errmsg(st->db)); - goto err_io; - } - - rc = check_create_tbl(st); - - PREP_CHK(st->db, INS_MR, &st->stmt_ins_mr); - PREP_CHK(st->db, INS_UD, &st->stmt_ins_ud); - PREP_CHK(st->db, UPD_MR, &st->stmt_upd_mr); - - return st; -err_io: - talloc_free(st); - return NULL; -} - -void meas_db_close(struct meas_db_state *st) -{ - if (sqlite3_finalize(st->stmt_ins_mr) != SQLITE_OK) - fprintf(stderr, "DB insert measurement report finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_finalize(st->stmt_ins_ud) != SQLITE_OK) - fprintf(stderr, "DB insert unidir finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_finalize(st->stmt_upd_mr) != SQLITE_OK) - fprintf(stderr, "DB update measurement report finalize error: %s\n", - sqlite3_errmsg(st->db)); - if (sqlite3_close(st->db) != SQLITE_OK) - fprintf(stderr, "Unable to close DB, abandoning.\n"); - - talloc_free(st); - -} diff --git a/openbsc/src/utils/meas_db.h b/openbsc/src/utils/meas_db.h deleted file mode 100644 index 889e902..0000000 --- a/openbsc/src/utils/meas_db.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENBSC_MEAS_DB_H -#define OPENBSC_MEAS_DB_H - -struct meas_db_state; - -struct meas_db_state *meas_db_open(void *ctx, const char *fname); -void meas_db_close(struct meas_db_state *st); - -int meas_db_begin(struct meas_db_state *st); -int meas_db_commit(struct meas_db_state *st); - -int meas_db_insert(struct meas_db_state *st, const char *imsi, - const char *name, unsigned long timestamp, - const char *scenario, - const struct gsm_meas_rep *mr); - -#endif diff --git a/openbsc/src/utils/meas_json.c b/openbsc/src/utils/meas_json.c deleted file mode 100644 index 51eb6c7..0000000 --- a/openbsc/src/utils/meas_json.c +++ /dev/null @@ -1,190 +0,0 @@ -/* Convert measurement report feed into JSON feed printed to stdout. - * Each measurement report is printed as a separae JSON root entry. - * All measurement reports are separated by a new line. - */ - -/* (C) 2015 by Alexander Chemeris - * With parts of code adopted from different places in OpenBSC. - * - * 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 -#include -#include - -static void print_meas_rep_uni_json(struct gsm_meas_rep_unidir *mru) -{ - printf("\"RXL-FULL\":%d, \"RXL-SUB\":%d, ", - rxlev2dbm(mru->full.rx_lev), - rxlev2dbm(mru->sub.rx_lev)); - printf("\"RXQ-FULL\":%d, \"RXQ-SUB\":%d", - mru->full.rx_qual, mru->sub.rx_qual); -} - -static void print_meas_rep_json(struct gsm_meas_rep *mr) -{ - int i; - - printf("\"NR\":%d", mr->nr); - - if (mr->flags & MEAS_REP_F_DL_DTX) - printf(", \"DTXd\":true"); - - printf(", \"UL_MEAS\":{"); - print_meas_rep_uni_json(&mr->ul); - printf("}"); - printf(", \"BS_POWER\":%d", mr->bs_power); - if (mr->flags & MEAS_REP_F_MS_TO) - printf(", \"MS_TO\":%d", mr->ms_timing_offset); - - if (mr->flags & MEAS_REP_F_MS_L1) { - printf(", \"L1_MS_PWR\":%d", mr->ms_l1.pwr); - printf(", \"L1_FPC\":%s", - mr->flags & MEAS_REP_F_FPC ? "true" : "false"); - printf(", \"L1_TA\":%u", mr->ms_l1.ta); - } - - if (mr->flags & MEAS_REP_F_UL_DTX) - printf(", \"DTXu\":true"); - if (mr->flags & MEAS_REP_F_BA1) - printf(", \"BA1\":true"); - if (mr->flags & MEAS_REP_F_DL_VALID) { - printf(", \"DL_MEAS\":{"); - print_meas_rep_uni_json(&mr->dl); - printf("}"); - } - - if (mr->num_cell == 7) - return; - printf(", \"NUM_NEIGH\":%u, \"NEIGH\":[", mr->num_cell); - for (i = 0; i < mr->num_cell; i++) { - struct gsm_meas_rep_cell *mrc = &mr->cell[i]; - if (i!=0) printf(", "); - printf("{\"IDX\":%u, \"ARFCN\":%u, \"BSIC\":%u, \"POWER\":%d}", - mrc->neigh_idx, mrc->arfcn, mrc->bsic, rxlev2dbm(mrc->rxlev)); - } - printf("]"); -} - -static void print_chan_info_json(struct meas_feed_meas *mfm) -{ - printf("\"lchan_type\":\"%s\", \"pchan_type\":\"%s\", " - "\"bts_nr\":%d, \"trx_nr\":%d, \"ts_nr\":%d, \"ss_nr\":%d", - gsm_lchant_name(mfm->lchan_type), gsm_pchan_name(mfm->pchan_type), - mfm->bts_nr, mfm->trx_nr, mfm->ts_nr, mfm->ss_nr); -} - -static void print_meas_feed_json(struct meas_feed_meas *mfm) -{ - time_t now = time(NULL); - - printf("{"); - printf("\"time\":%ld, \"imsi\":\"%s\", \"name\":\"%s\", \"scenario\":\"%s\", ", - now, mfm->imsi, mfm->name, mfm->scenario); - - switch (mfm->hdr.version) { - case 1: - printf("\"chan_info\":{"); - print_chan_info_json(mfm); - printf("}, "); - /* no break, fall to version 0 */ - case 0: - printf("\"meas_rep\":{"); - print_meas_rep_json(&mfm->mr); - printf("}"); - break; - } - - printf("}\n"); - -} - -static int handle_meas(struct msgb *msg) -{ - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - - print_meas_feed_json(mfm); - - return 0; -} - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - switch (mfh->msg_type) { - case MEAS_FEED_MEAS: - handle_meas(msg); - break; - default: - break; - } - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - -int main(int argc, char **argv) -{ - int rc; - struct osmo_fd udp_ofd; - - udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) - exit(1); - - while (1) { - osmo_select_main(0); - }; - - exit(0); -} diff --git a/openbsc/src/utils/meas_pcap2db.c b/openbsc/src/utils/meas_pcap2db.c deleted file mode 100644 index b874ac4..0000000 --- a/openbsc/src/utils/meas_pcap2db.c +++ /dev/null @@ -1,138 +0,0 @@ -/* read PCAP file with meas_feed data and write it to sqlite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 - -#include - -#include - -#include - -#include "meas_db.h" - -static struct meas_db_state *db; - -static void handle_mfm(const struct pcap_pkthdr *h, - const struct meas_feed_meas *mfm) -{ - const char *scenario; - - if (strlen(mfm->scenario)) - scenario = mfm->scenario; - else - scenario = NULL; - - meas_db_insert(db, mfm->imsi, mfm->name, h->ts.tv_sec, - scenario, &mfm->mr); -} - -static void pcap_cb(u_char *user, const struct pcap_pkthdr *h, - const u_char *bytes) -{ - const char *cur = bytes; - const struct iphdr *ip; - const struct udphdr *udp; - const struct meas_feed_meas *mfm; - uint16_t udplen; - - if (h->caplen < 14+20+8) - return; - - /* Check if there is IPv4 in the Ethernet */ - if (cur[12] != 0x08 || cur[13] != 0x00) - return; - - cur += 14; /* ethernet header */ - ip = (struct iphdr *) cur; - - if (ip->version != 4) - return; - cur += ip->ihl * 4; - - if (ip->protocol != IPPROTO_UDP) - return; - - udp = (struct udphdr *) cur; - - if (udp->dest != htons(8888)) - return; - - udplen = ntohs(udp->len); - if (udplen != sizeof(*udp) + sizeof(*mfm)) - return; - cur += sizeof(*udp); - - mfm = (const struct meas_feed_meas *) cur; - - handle_mfm(h, mfm); -} - -int main(int argc, char **argv) -{ - char errbuf[PCAP_ERRBUF_SIZE+1]; - char *pcap_fname, *db_fname; - pcap_t *pc; - int rc; - - if (argc < 3) { - fprintf(stderr, "You need to specify PCAP and database file\n"); - exit(2); - } - - pcap_fname = argv[1]; - db_fname = argv[2]; - - pc = pcap_open_offline(pcap_fname, errbuf); - if (!pc) { - fprintf(stderr, "Cannot open %s: %s\n", pcap_fname, errbuf); - exit(1); - } - - db = meas_db_open(NULL, db_fname); - if (!db) - exit(0); - - rc = meas_db_begin(db); - if (rc < 0) { - fprintf(stderr, "Error during BEGIN\n"); - exit(1); - } - - pcap_loop(pc, 0 , pcap_cb, NULL); - - meas_db_commit(db); - - exit(0); -} diff --git a/openbsc/src/utils/meas_udp2db.c b/openbsc/src/utils/meas_udp2db.c deleted file mode 100644 index 5032d0c..0000000 --- a/openbsc/src/utils/meas_udp2db.c +++ /dev/null @@ -1,126 +0,0 @@ -/* liesten to meas_feed on UDP and write it to sqlite3 database */ - -/* (C) 2012 by Harald Welte - * - * 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 - -#include - -#include - -#include "meas_db.h" - -static struct osmo_fd udp_ofd; -static struct meas_db_state *db; - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - const char *scenario; - time_t now = time(NULL); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - if (mfh->msg_type != MEAS_FEED_MEAS) - return -EINVAL; - - if (strlen(mfm->scenario)) - scenario = mfm->scenario; - else - scenario = NULL; - - meas_db_insert(db, mfm->imsi, mfm->name, now, - scenario, &mfm->mr); - - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - -int main(int argc, char **argv) -{ - char *db_fname; - int rc; - - msgb_talloc_ctx_init(NULL, 0); - - if (argc < 2) { - fprintf(stderr, "You have to specify the database file name\n"); - exit(2); - } - - db_fname = argv[1]; - - udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, - IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) { - fprintf(stderr, "Unable to create UDP listen socket\n"); - exit(1); - } - - db = meas_db_open(NULL, db_fname); - if (!db) { - fprintf(stderr, "Unable to open database\n"); - exit(1); - } - - /* FIXME: timer-based BEGIN/COMMIT */ - - while (1) { - osmo_select_main(0); - }; - - meas_db_close(db); - - exit(0); -} - diff --git a/openbsc/src/utils/meas_vis.c b/openbsc/src/utils/meas_vis.c deleted file mode 100644 index 77194de..0000000 --- a/openbsc/src/utils/meas_vis.c +++ /dev/null @@ -1,310 +0,0 @@ -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include -#include - -#include - -#include - -struct ms_state_uni { - CDKSLIDER *cdk; - CDKLABEL *cdk_label; - - time_t last_update; - char label[32]; - char *_lbl[1]; -}; - - -struct ms_state { - struct llist_head list; - - char name[31+1]; - char imsi[15+1]; - struct gsm_meas_rep mr; - - struct ms_state_uni ul; - struct ms_state_uni dl; -}; - -struct state { - struct osmo_fd udp_ofd; - struct llist_head ms_list; - - CDKSCREEN *cdkscreen; - WINDOW *curses_win; - - CDKLABEL *cdk_title; - char *title; - - CDKLABEL *cdk_header; - char header[256]; -}; - -static struct state g_st; - -struct ms_state *find_ms(const char *imsi) -{ - struct ms_state *ms; - - llist_for_each_entry(ms, &g_st.ms_list, list) { - if (!strcmp(ms->imsi, imsi)) - return ms; - } - return NULL; -} - -static struct ms_state *find_alloc_ms(const char *imsi) -{ - struct ms_state *ms; - - ms = find_ms(imsi); - if (!ms) { - ms = talloc_zero(NULL, struct ms_state); - osmo_strlcpy(ms->imsi, imsi, sizeof(ms->imsi)); - ms->ul._lbl[0] = ms->ul.label; - ms->dl._lbl[0] = ms->dl.label; - llist_add_tail(&ms->list, &g_st.ms_list); - } - - return ms; -} - -static int handle_meas(struct msgb *msg) -{ - struct meas_feed_meas *mfm = (struct meas_feed_meas *) msgb_data(msg); - struct ms_state *ms = find_alloc_ms(mfm->imsi); - time_t now = time(NULL); - - osmo_strlcpy(ms->name, mfm->name, sizeof(ms->name)); - memcpy(&ms->mr, &mfm->mr, sizeof(ms->mr)); - ms->ul.last_update = now; - if (ms->mr.flags & MEAS_REP_F_DL_VALID) - ms->dl.last_update = now; - - /* move to head of list */ - llist_del(&ms->list); - llist_add(&ms->list, &g_st.ms_list); - - return 0; -} - -static int handle_msg(struct msgb *msg) -{ - struct meas_feed_hdr *mfh = (struct meas_feed_hdr *) msgb_data(msg); - - if (mfh->version != MEAS_FEED_VERSION) - return -EINVAL; - - switch (mfh->msg_type) { - case MEAS_FEED_MEAS: - handle_meas(msg); - break; - default: - break; - } - - return 0; -} - -static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) -{ - int rc; - - if (what & BSC_FD_READ) { - struct msgb *msg = msgb_alloc(1024, "UDP Rx"); - - rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); - if (rc < 0) - return rc; - msgb_put(msg, rc); - handle_msg(msg); - msgb_free(msg); - } - - return 0; -} - - -static void destroy_dir(struct ms_state_uni *uni) -{ - if (uni->cdk) { - destroyCDKSlider(uni->cdk); - uni->cdk = NULL; - } - if (uni->cdk_label) { - destroyCDKLabel(uni->cdk_label); - uni->cdk_label = NULL; - } -} - -#define DIR_UL 0 -#define DIR_DL 1 -static const char *dir_str[2] = { - [DIR_UL] = "UL", - [DIR_DL] = "DL", -}; - -static int colpair_by_qual(uint8_t rx_qual) -{ - if (rx_qual == 0) - return 24; - else if (rx_qual <= 4) - return 32; - else - return 16; -} - -static int colpair_by_lev(int rx_lev) -{ - if (rx_lev < -95) - return 16; - else if (rx_lev < -80) - return 32; - else - return 24; -} - - -void write_uni(struct ms_state *ms, struct ms_state_uni *msu, - struct gsm_rx_lev_qual *lq, int dir, int row) -{ - - char label[128]; - time_t now = time(NULL); - int qual_col = colpair_by_qual(lq->rx_qual); - int lev_col = colpair_by_lev(rxlev2dbm(lq->rx_lev)); - int color, pwr; - - if (dir == DIR_UL) { - pwr = ms->mr.ms_l1.pwr; - } else { - pwr = ms->mr.bs_power; - } - - color = A_REVERSE | COLOR_PAIR(lev_col) | ' '; - snprintf(label, sizeof(label), "%s %s ", ms->imsi, dir_str[dir]); - msu->cdk = newCDKSlider(g_st.cdkscreen, 0, row, NULL, label, color, - COLS-40, rxlev2dbm(lq->rx_lev), -110, -47, - 1, 2, FALSE, FALSE); - //IsVisibleObj(ms->ul.cdk) = FALSE; - snprintf(msu->label, sizeof(msu->label), "%1d %3d %2u %2d %4u", - qual_col, lq->rx_qual, qual_col, pwr, - ms->mr.ms_l1.ta, ms->mr.ms_timing_offset, - now - msu->last_update); - msu->cdk_label = newCDKLabel(g_st.cdkscreen, RIGHT, row, - msu->_lbl, 1, FALSE, FALSE); -} - -static void update_sliders(void) -{ - int num_vis_sliders = 0; - struct ms_state *ms; -#define HEADER_LINES 2 - - /* remove all sliders */ - llist_for_each_entry(ms, &g_st.ms_list, list) { - destroy_dir(&ms->ul); - destroy_dir(&ms->dl); - - } - - llist_for_each_entry(ms, &g_st.ms_list, list) { - struct gsm_rx_lev_qual *lq; - unsigned int row = HEADER_LINES + num_vis_sliders*3; - - if (ms->mr.flags & MEAS_REP_F_UL_DTX) - lq = &ms->mr.ul.sub; - else - lq = &ms->mr.ul.full; - write_uni(ms, &ms->ul, lq, DIR_UL, row); - - if (ms->mr.flags & MEAS_REP_F_DL_DTX) - lq = &ms->mr.dl.sub; - else - lq = &ms->mr.dl.full; - write_uni(ms, &ms->dl, lq, DIR_DL, row+1); - - num_vis_sliders++; - if (num_vis_sliders >= LINES/3) - break; - } - - refreshCDKScreen(g_st.cdkscreen); - -} - -const struct value_string col_strs[] = { - { COLOR_WHITE, "white" }, - { COLOR_RED, "red" }, - { COLOR_GREEN, "green" }, - { COLOR_YELLOW, "yellow" }, - { COLOR_BLUE, "blue" }, - { COLOR_MAGENTA,"magenta" }, - { COLOR_CYAN, "cyan" }, - { COLOR_BLACK, "black" }, - { 0, NULL } -}; - -int main(int argc, char **argv) -{ - int rc; - char *header[1]; - char *title[1]; - - msgb_talloc_ctx_init(NULL, 0); - - printf("sizeof(gsm_meas_rep)=%u\n", sizeof(struct gsm_meas_rep)); - printf("sizeof(meas_feed_meas)=%u\n", sizeof(struct meas_feed_meas)); - - INIT_LLIST_HEAD(&g_st.ms_list); - g_st.curses_win = initscr(); - g_st.cdkscreen = initCDKScreen(g_st.curses_win); - initCDKColor(); - - g_st.title = "OpenBSC link quality monitor"; - title[0] = g_st.title; - g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1, FALSE, FALSE); - - snprintf(g_st.header, sizeof(g_st.header), "Q Pwr TA TO Time"); - header[0] = g_st.header; - g_st.cdk_header = newCDKLabel(g_st.cdkscreen, RIGHT, 1, header, 1, FALSE, FALSE); - -#if 0 - int i; - for (i = 0; i < 64; i++) { - short f, b; - pair_content(i, &f, &b); - attron(COLOR_PAIR(i)); - printw("%u: %u (%s) ", i, f, get_value_string(col_strs, f)); - printw("%u (%s)\n\r", b, get_value_string(col_strs, b)); - } - refresh(); - getch(); - exit(0); -#endif - - g_st.udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&g_st.udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); - if (rc < 0) - exit(1); - - while (1) { - osmo_select_main(0); - update_sliders(); - }; - - exit(0); -} -- To view, visit https://gerrit.osmocom.org/12655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia0cedaad4b717c8c5198842e2acd610f8e03f957 Gerrit-Change-Number: 12655 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 19:04:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 19:04:56 +0000 Subject: Change in openbsc[master]: Remove openbsc-dev package In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12656 ) Change subject: Remove openbsc-dev package ...................................................................... Remove openbsc-dev package There're no external utilities which rely on it anymore so we can simplify our packaging by removing it. Change-Id: I9a96c217999416099aa7ce690845f56fc132274c --- M debian/control D debian/openbsc-dev.install M openbsc/Makefile.am M openbsc/configure.ac D openbsc/openbsc.pc.in 5 files changed, 0 insertions(+), 28 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index a841acf..a78ff3e 100644 --- a/debian/control +++ b/debian/control @@ -69,17 +69,6 @@ ${misc:Depends} Description: OsmoBSC-MGCP: Osmocom's Legacy Media Gateway. -Package: openbsc-dev -Architecture: all -Depends: ${misc:Depends} -Description: Header file needed by tools tightly integrated - Some other programs depend on gsm_data_shared.h and gsm_data_shared.c - from OpenBSC. This package installs these files to your file system so - that the other packages can build-depend on this package. - . - The directory structure is copied after the structure in the repository - and the header and .c file are installed into /usr/src/osmocom/openbsc/. - Package: osmocom-bsc-sccplite-dbg Architecture: any Section: debug diff --git a/debian/openbsc-dev.install b/debian/openbsc-dev.install deleted file mode 100644 index b669b0f..0000000 --- a/debian/openbsc-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ -openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/ -usr/lib/*/pkgconfig/openbsc.pc diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index 19999b1..f42e6d0 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -16,9 +16,6 @@ contrib \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = openbsc.pc - BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 64285e0..109bad8 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -243,7 +243,6 @@ AM_CONFIG_HEADER(bscconfig.h) AC_OUTPUT( - openbsc.pc include/openbsc/Makefile include/Makefile src/Makefile diff --git a/openbsc/openbsc.pc.in b/openbsc/openbsc.pc.in deleted file mode 100644 index 17e265d..0000000 --- a/openbsc/openbsc.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/ - -Name: OpenBSC -Description: OpenBSC base station controller -Requires: -Version: @VERSION@ -Cflags: -I${includedir} -- To view, visit https://gerrit.osmocom.org/12656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9a96c217999416099aa7ce690845f56fc132274c Gerrit-Change-Number: 12656 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 19:04:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 19:04:56 +0000 Subject: Change in openbsc[master]: Remove osmocom-ipaccess-utils-dbg package In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12657 ) Change subject: Remove osmocom-ipaccess-utils-dbg package ...................................................................... Remove osmocom-ipaccess-utils-dbg package The rest was dropped in I9c04f9b469e60802461a2a6e421d3ba27e6dafa1. Change-Id: If56c288121bd26fead9a921c1f04f9958468e1b6 --- M debian/control 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index a78ff3e..557467e 100644 --- a/debian/control +++ b/debian/control @@ -85,14 +85,6 @@ Description: Debug symbols for the OpenBSC NITB Make debugging possible -Package: osmocom-ipaccess-utils-dbg -Architecture: any -Section: debug -Priority: extra -Depends: osmocom-ipaccess-utils (= ${binary:Version}), ${misc:Depends} -Description: Debug symbols for the OpenBSC ip.access utils - Make debugging possible - Package: osmocom-bs11-utils-dbg Architecture: any Section: debug -- To view, visit https://gerrit.osmocom.org/12657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If56c288121bd26fead9a921c1f04f9958468e1b6 Gerrit-Change-Number: 12657 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 19:08:07 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 24 Jan 2019 19:08:07 +0000 Subject: Change in osmo-msc[master]: Various logging fixes In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12615 ) Change subject: Various logging fixes ...................................................................... Various logging fixes Log transaction allocation errors as such. While at it, use proper subsystem to log missing VLR subscriber. Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 --- M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 7172184..0119e7b 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1931,7 +1931,7 @@ /* Create transaction */ trans = trans_alloc(net, vsub, GSM48_PDISC_CC, 0xff, data->callref); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); vlr_subscr_put(vsub); /* Ressource unavailable */ mncc_release_ind(net, NULL, data->callref, @@ -2129,7 +2129,7 @@ GSM48_PDISC_CC, transaction_id, new_callref++); if (!trans) { - DEBUGP(DCC, "No memory for trans.\n"); + LOGP(DCC, LOGL_ERROR, "No memory for trans.\n"); rc = gsm48_tx_simple(conn, GSM48_PDISC_CC | (transaction_id << 4), GSM48_MT_CC_RELEASE_COMPL); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 12bec9d..608d4ff 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -101,7 +101,7 @@ trans = trans_alloc(conn->network, conn->vsub, GSM48_PDISC_NC_SS, tid, new_callref++); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); gsm48_tx_simple(conn, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); @@ -298,7 +298,7 @@ trans = trans_alloc(net, vsub, GSM48_PDISC_NC_SS, 0xff, gsup_msg->session_id); if (!trans) { - DEBUGP(DMM, " -> No memory for trans\n"); + LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n"); return NULL; } diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index df770ed..17f8e96 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -109,7 +109,7 @@ /* a valid subscriber is indispensable */ if (vsub == NULL) { - LOGP(DCC, LOGL_NOTICE, + LOGP(DVLR, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/12615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 20:02:46 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Thu, 24 Jan 2019 20:02:46 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: tnt has submitted this change and it was merged. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Fully internal generation of reference data that doesn't depend on glibc or even on any floating point math - Golden results are included in a .h Due to varying precision of different implementation or architecture, any kind of textual compare is impossible, so we include golden values and compare results of both the 'base' implementation the potentially 'optimized' one again this set of values with a small error tolerance Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/Makefile.am M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok A tests/Transceiver52M/convolve_test_golden.h 4 files changed, 926 insertions(+), 168 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index 1f8aa7a..edb812f 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M -I$(top_srcdir)/Transceiver52M/arch/common $(STD_DEFINES_AND_INCLUDES) -g -EXTRA_DIST = convolve_test.ok +EXTRA_DIST = convolve_test.ok convolve_test_golden.h noinst_PROGRAMS = \ convolve_test diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 8ca4b72..cda5385 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -1,142 +1,323 @@ +#include #include -#include #include +#include +#include + #include "convolve.h" -#define TESTVEC_LEN 1000 -#define DO_INIT 1 -float x_vect[TESTVEC_LEN]; -float y_vect[TESTVEC_LEN]; -float h_vect[TESTVEC_LEN]; - -float *x; -float *h; -float *y; +// --------------------------------------------------------------------------- +// Misc utils +// --------------------------------------------------------------------------- /* Generate some random values for testing */ -void gen_floats(float *vect, int len) +static unsigned long rand_state = 0; + +static void +rand_reset(void) { - int i; - for (i = 0; i < len; i++) { - vect[i] = (float)rand()/(float)(RAND_MAX); - } + rand_state = 0; } -/* Reset testvectors */ -static void reset_testvec(int seed) +static unsigned long +rand_int(void) { - srand(seed); - memset(x_vect,0,sizeof(x_vect)); - memset(y_vect,0,sizeof(y_vect)); - memset(h_vect,0,sizeof(h_vect)); + rand_state = (1103515245UL * rand_state + 12345UL) & 0x7fffffffUL; + return rand_state; +} - x=x_vect + TESTVEC_LEN/2; - y=y_vect + TESTVEC_LEN/2; - h=h_vect + TESTVEC_LEN/2; +static float +rand_float(void) +{ + union { + uint32_t u; + float f; + } r; + uint32_t u = rand_int(); + int e = 112 + ((u ^ (u>>8)) & 15); - gen_floats(x_vect,TESTVEC_LEN); - gen_floats(h_vect,TESTVEC_LEN); + r.u = u & 0x007fffffUL; // Mantissa + r.u |= (u & 0x00800000UL) << 8; // Sign + r.u |= (e & 0xffUL) << 23; // Exponent + + return r.f; +} + +static void +gen_floats(float *vect, int len) +{ + int i; + for (i = 0; i < len; i++) + vect[i] = rand_float(); } /* Show float vector data cut and paste friendly */ -static void dump_floats(float *vect, int len, char *name) +static void +dump_floats(float *vect, int len, char *name) { int i; - printf("float %s[] = {", name); + printf("static const float %s[] = {\n\t", name); for(i = 0; i < len; i++) { - - printf("%f",vect[i]); - - if(ix, 0, tv->x_len * sizeof(float)); + memset(tv->h, 0, tv->h_len * sizeof(float)); + memset(tv->y, 0, tv->y_len * sizeof(float)); + + gen_floats(tv->x, tv->x_len); + gen_floats(tv->h, tv->h_len); +} + +/* Allocate test vectors */ +static struct test_vec * +test_vec_alloc(int x_len, int h_len) +{ + struct test_vec *tv; + + tv = calloc(1, sizeof(struct test_vec)); + if (!tv) + return NULL; + + tv->x_len = x_len; + tv->h_len = h_len; + tv->y_len = x_len; /* Results can never be longer than x */ + + tv->x = convolve_h_alloc(x_len); + tv->h = convolve_h_alloc(h_len); + tv->y = convolve_h_alloc(tv->y_len); + + test_vec_reset(tv, 0); + + return tv; +} + +/* Release test vectors */ +static void +test_vec_release(struct test_vec *tv) +{ + if (!tv) + return; + + free(tv->x); + free(tv->h); + free(tv->y); + + free(tv); +} + +/* Run convolution */ +static int +run_convolve(struct test_vec *tv, int h_len, enum test_type type) { int x_len; - int y_len; - int start; - int len; + int start, len; - x_len=34; - y_len=26; - start=8; - len=26; - reset_testvec(0); - dump_floats(x,x_len,"x"); - printf("\n"); - dump_floats(h,h_len,"h"); - printf("\n"); - convolve_complex(x, x_len, h, h_len, y, y_len, start, len); - dump_floats(y,y_len,"y"); - printf("\n"); + test_vec_reset(tv, 0); + + /* Compute params that fit within our test vectors */ + x_len = tv->x_len / 2; /* float vs complex */ + start = h_len - 1; + len = x_len - start; + + /* Run implementation */ + switch (type) { + case CONV_REAL_BASE: + base_convolve_real( + tv->x, x_len, + tv->h, h_len, + tv->y, tv->y_len, + start, len + ); + break; + + case CONV_REAL_OPT: + convolve_real( + tv->x, x_len, + tv->h, h_len, + tv->y, tv->y_len, + start, len + ); + break; + + case CONV_COMPLEX_BASE: + base_convolve_complex( + tv->x, x_len, + tv->h, h_len, + tv->y, tv->y_len, + start, len + ); + break; + + case CONV_COMPLEX_OPT: + convolve_complex( + tv->x, x_len, + tv->h, h_len, + tv->y, tv->y_len, + start, len + ); + break; + } + + return len * 2; } -/* Test real convolution */ -static void test_convolve_real(int h_len) -{ - int x_len; - int y_len; - int start; - int len; - x_len=34; - y_len=26; - start=8; - len=26; - reset_testvec(0); - dump_floats(x-30,2*x_len+30,"x"); - printf("\n"); - dump_floats(h,2*h_len,"h"); - printf("\n"); - convolve_real(x, x_len, h, h_len, y, y_len, start, len); - dump_floats(y,y_len,"y"); - printf("\n"); -} - -int main(void) +int main(int argc, char *argv[]) { -#if DO_INIT == 1 + struct test_vec *tv; + int gen_ref_mode = 0; + char name[80]; + int i, j, len; + convolve_init(); -#endif - printf("==== TEST COMPLEX BASE IMPLEMENTATION ====\n"); - test_convolve_complex(17); + /* Mode */ + gen_ref_mode = (argc == 2) && !strcmp("genref", argv[1]); - printf("==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%%4=0) ====\n"); - test_convolve_complex(20); + /* Alloc test vectors */ + /* All *2 is to account for the facts all vectors are actually + * complex and need two floats */ + tv = test_vec_alloc(100*2, 25*2); - printf("==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%%8=0) ====\n"); - test_convolve_complex(16); + /* Dump all input data to make sure we work off the same input data */ + if (!gen_ref_mode) { + printf("==== TEST INPUT DATA ====\n"); + dump_floats(tv->x, tv->x_len, "x"); + dump_floats(tv->h, tv->h_len, "h"); + printf("\n"); + printf("\n"); + } - printf("\n"); - printf("\n"); + /* Run through all the tests */ + if (!gen_ref_mode) + printf("==== TEST ====\n"); - printf("==== TEST REAL BASE IMPLEMENTATION ====\n"); - test_convolve_real(17); + for (i=0; tests[i].h_len; i++) + { + for (j=0; j<(gen_ref_mode ? 1 : 2); j++) + { + len = run_convolve(tv, tests[i].h_len, tests[i].type + j); - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=4) ====\n"); - test_convolve_real(4); + snprintf(name, sizeof(name)-1, "y_ref_%s_%d", type_name[tests[i].type + j], tests[i].h_len); - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=8) ====\n"); - test_convolve_real(8); + if (gen_ref_mode) + { + /* If in generate mode, output data */ + dump_floats(tv->y, len, name); + } else { + /* If in test mode, compare with data */ + printf("%s: %s\n", + name, + compare_floats(tests[i].y_ref, tv->y, len, 1e-5f, 1e-5f) ? "FAIL" : "PASS" + ); + } + } + } - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=12) ====\n"); - test_convolve_real(12); + if (!gen_ref_mode) { + printf("\n"); + printf("\n"); + } - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=16) ====\n"); - test_convolve_real(16); - - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=20) ====\n"); - test_convolve_real(20); - - printf("==== TEST REAL SSE3 IMPLEMENTATION (h_len%%4=0) ====\n"); - test_convolve_real(24); + /* All done ! */ + test_vec_release(tv); return 0; } diff --git a/tests/Transceiver52M/convolve_test.ok b/tests/Transceiver52M/convolve_test.ok index 5766252..9bfe4e7 100644 --- a/tests/Transceiver52M/convolve_test.ok +++ b/tests/Transceiver52M/convolve_test.ok @@ -1,72 +1,97 @@ -==== TEST COMPLEX BASE IMPLEMENTATION ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645} - -float y[] = {0.389293,10.824917,-0.676577,10.619646,0.283489,11.279525,0.384482,11.586230,0.711259,11.540458,-0.391531,11.281723,0.019900,12.278080,-0.070459,11.104558,0.087938,11.825965,-1.003252,11.698885,0.358887,11.911197,-0.678904,11.933812,0.245140,11.886644} - -==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%4=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628} - -float y[] = {-0.641594,12.367426,-0.970113,12.963129,-0.466783,13.747334,0.637486,13.341836,-0.168561,14.091346,0.306652,15.018833,0.233741,14.726789,-0.011241,15.034849,0.000155,13.639509,0.558827,15.495646,-0.406179,14.103148,-0.000244,15.591370,-0.492319,14.785577} - -==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%8=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995} - -float y[] = {-0.278295,10.097409,0.919633,11.502825,0.340383,10.979163,0.891132,11.679869,0.425363,11.186544,1.099703,12.121126,0.188196,11.180099,0.228905,12.436676,0.149904,11.522589,0.543155,11.703615,0.033465,12.425473,0.561782,12.373415,-0.218184,12.154579} +==== TEST INPUT DATA ==== +static const float x[] = { + 1.5647994e-02f, -1.3433097e-02f, 8.0661466e-03f, 5.4624092e-05f, + -3.2537399e-04f, 2.4278485e-03f, -2.1165362e-02f, 4.8159473e-03f, + 2.1355225e-01f, -1.0417278e-04f, -8.7433815e-04f, -4.1191248e-05f, + 1.4847396e-04f, 3.7836733e-05f, 1.7029777e-03f, 1.7994493e-02f, + 5.7363566e-05f, 1.9005293e-03f, 2.8903393e-02f, -9.6858083e-04f, + 1.3747586e-04f, -3.9022104e-03f, 7.4708782e-02f, -2.6730467e-03f, + 1.7153287e-03f, 6.0036813e-04f, 4.0513012e-03f, -1.6489235e-04f, + -3.4497763e-04f, 3.8475581e-02f, 6.2291299e-05f, 6.6989708e-01f, + 3.0250011e-03f, 1.8972119e-03f, 9.4924539e-01f, 1.8176478e-01f, + -3.7033458e-03f, -4.3682796e-01f, 1.0680194e-04f, -8.3315128e-05f, + -2.2426756e-02f, 5.3260362e-01f, 8.4926933e-01f, -1.0011558e-04f, + -1.8198654e-03f, 1.1309208e-02f, 1.7689859e-02f, -1.5878773e+00f, + 2.4429576e-02f, -2.2855136e-03f, -5.5495123e-03f, -1.2498077e-02f, + -1.6752372e-02f, 1.2960315e-03f, 7.0954882e-02f, -1.5590824e-02f, + 2.0499083e-03f, -3.5616606e-01f, 2.7610136e-02f, 8.5417420e-02f, + -4.2664251e-04f, 1.4402850e-03f, -4.8643693e-01f, 1.7741680e-01f, + -9.6604187e-04f, 1.5893934e+00f, -5.6570204e-04f, 1.0304671e-02f, + -1.5468808e-03f, 1.6770978e-02f, 3.0763021e-02f, 9.5863044e-02f, + -1.7137524e-04f, 1.2735781e-01f, 1.3553522e-02f, -7.1923278e-05f, + 2.1808405e-01f, -3.4154678e-04f, -4.5713958e-01f, 1.8140655e-03f, + -6.7418534e-01f, -1.0383211e-01f, 1.3225841e-03f, -2.5257194e-01f, + 9.0886868e-04f, 1.4233345e-02f, -8.5481010e-02f, -1.0956389e-01f, + -1.1269117e-01f, -1.2924065e-04f, 9.9633269e-02f, -2.9879587e-04f, + 1.2630173e-04f, -1.7635620e-03f, -2.5746411e-02f, 8.9132547e-02f, + 1.6874328e-03f, 1.0522513e-02f, 5.4692741e-02f, -1.5352159e-03f, + -1.4327426e-02f, -9.3195832e-04f, 1.1896082e-04f, -3.7630927e-03f, + -1.0516988e+00f, -3.1380814e-01f, -2.2425303e-04f, -7.0284848e-05f, + 5.0671459e-03f, -1.1134531e-01f, 1.0806708e-04f, 1.4354062e-01f, + -6.5305573e-03f, 2.7675861e-01f, -3.8776125e-04f, -8.5617387e-05f, + 4.7151759e-04f, 1.4620343e-01f, 1.1438092e-01f, 4.5707250e-01f, + 1.8181421e-01f, 1.4213121e-02f, -3.6397097e-01f, -5.4192659e-04f, + -4.2798415e-01f, 9.3350851e-04f, 1.0392073e-03f, 2.4182081e-02f, + -1.5072421e-04f, -1.8581150e-03f, -4.9158345e-05f, -8.5498526e-05f, + 1.0833269e+00f, -5.9226564e-05f, -2.5437584e-02f, -5.2832620e-05f, + 2.8377982e-02f, -4.5681797e-02f, -2.4284111e-01f, 2.1328876e-04f, + -9.7929651e-01f, 1.5658283e-04f, -3.7025183e-03f, -2.0111608e-04f, + -2.4641861e-01f, 5.9742248e-01f, -6.4697691e-05f, -1.9186097e-03f, + 1.7195708e+00f, -2.5827979e-04f, -9.1248356e-02f, -1.4089289e+00f, + 8.7977161e-05f, 8.5069842e-05f, -1.2898034e+00f, -1.5152150e-01f, + 1.5210576e-01f, 7.2273717e-04f, 1.3823020e-04f, 7.7009052e-03f, + -4.7274379e-04f, 1.9443777e+00f, -3.2773761e-03f, 9.9636912e-01f, + -2.1603455e-04f, 1.8570988e+00f, -1.1860273e-04f, 3.5464257e-02f, + -1.3853541e-04f, 1.0360291e-02f, 3.8853416e-03f, -1.4075130e-04f, + -7.1190392e-05f, -1.5528130e-03f, 3.5669159e-02f, -2.4105579e-02f, + 1.6449700e-03f, -4.9201823e-05f, 1.7070369e+00f, -5.8859095e-02f, + -5.1986475e-02f, 4.5868279e-03f, 7.4677072e-02f, -2.0537584e-04f, + 1.4663955e-04f, -2.8706132e-03f, 6.3073174e-05f, 8.3900732e-04f, + 1.9868923e+00f, -4.6812827e-03f, 8.9498538e-01f, -3.6815554e-03f, + -3.8766742e-05f, -9.0576988e-03f, 2.3615693e-01f, -4.7979757e-02f, + 8.1219165e-05f, -4.2038716e-02f, 2.8626552e-02f, -1.2940569e-03f +}; +static const float h[] = { + 1.4452726e+00f, -2.3994248e-02f, 5.8419155e-05f, -3.7997228e-04f, + -2.1219695e-02f, 3.4777170e-01f, 7.2262114e-01f, 1.0214672e+00f, + 7.8038998e-02f, 1.0222027e-03f, 3.6671492e-01f, 6.7337966e-01f, + -7.3292562e-05f, 3.7689663e-02f, -1.2326082e-01f, -8.9664059e-04f, + 4.5764600e-03f, -2.1683607e-01f, -3.9652010e-04f, 4.5392764e-01f, + -7.2978765e-01f, -3.4258855e-03f, 6.1700474e-02f, -7.2056986e-04f, + -1.0217791e-04f, 1.5078529e-04f, -2.8858331e-04f, 2.3752926e-03f, + -5.8771792e-04f, 2.1340945e-03f, -7.5210082e-05f, -1.4894934e+00f, + -9.2567364e-03f, 3.4723855e-03f, -1.0344880e-01f, -2.7948164e-04f, + -6.0153940e-05f, -6.7053002e-04f, -2.1297326e-04f, -1.2413803e-03f, + -3.3611232e-05f, -2.3160460e-03f, 1.5962194e-01f, 1.8822768e-04f, + 2.2110565e-01f, -2.8764654e-02f, -1.0809334e-01f, 2.0665471e-03f, + 1.3983012e-02f, 1.8321171e-03f +}; +==== TEST ==== +y_ref_real_base_4: PASS +y_ref_real_opt_4: PASS +y_ref_real_base_8: PASS +y_ref_real_opt_8: PASS +y_ref_real_base_12: PASS +y_ref_real_opt_12: PASS +y_ref_real_base_16: PASS +y_ref_real_opt_16: PASS +y_ref_real_base_20: PASS +y_ref_real_opt_20: PASS +y_ref_real_base_24: PASS +y_ref_real_opt_24: PASS +y_ref_complex_base_4: PASS +y_ref_complex_opt_4: PASS +y_ref_complex_base_8: PASS +y_ref_complex_opt_8: PASS +y_ref_complex_base_12: PASS +y_ref_complex_opt_12: PASS +y_ref_complex_base_16: PASS +y_ref_complex_opt_16: PASS +y_ref_complex_base_20: PASS +y_ref_complex_opt_20: PASS +y_ref_complex_base_24: PASS +y_ref_complex_opt_24: PASS -==== TEST REAL BASE IMPLEMENTATION ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645} - -float y[] = {5.354852,5.387001,4.829278,5.046340,5.849788,5.775999,5.653334,5.372714,5.999860,5.593828,5.628739,5.178002,6.010774,6.186034,6.337766,5.538046,5.616131,6.289612,5.486091,5.835261,6.277413,5.894117,5.563587,6.082063,5.828556,6.160175} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=4) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604} - -float y[] = {1.154625,1.856899,1.754012,1.866038,1.759821,1.614741,1.946849,1.905307,2.034228,1.369325,1.929276,1.644739,1.911431,1.455565,1.751712,1.711433,1.206255,1.551974,1.351406,1.252433,1.410497,1.527218,1.666560,1.330974,1.544475,1.701906} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=8) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771} - -float y[] = {2.966950,2.964003,3.035802,3.567513,2.983864,3.487861,3.089418,3.836586,2.979637,3.173361,3.524760,3.308944,3.511707,2.951268,3.500564,3.466951,3.174077,2.778949,3.124344,2.816606,3.196814,2.774090,3.272130,2.980138,2.646414,3.090803} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=12) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811} - -float y[] = {3.906606,3.831477,4.613783,4.371631,4.441847,4.311853,4.446086,5.089131,4.708794,4.314635,4.866886,4.812932,4.678810,4.796319,4.687846,5.426141,4.119072,4.687284,4.516533,4.303559,4.733458,4.146965,5.133350,4.832816,4.598291,4.252030} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=16) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995} - -float y[] = {4.845784,5.086479,6.160082,6.147918,5.549072,5.538811,6.264142,6.083664,5.942431,5.214122,6.458036,6.120992,6.385656,5.751343,6.099504,6.738166,5.942206,5.756058,6.343914,6.239408,6.090616,6.325348,6.214744,6.674619,5.691174,6.413076} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=20) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628} - -float y[] = {6.148925,6.262301,5.792440,6.652380,6.759685,6.515733,6.943458,6.334218,6.539823,6.542612,7.766725,7.472028,7.258010,6.947061,7.347066,7.503224,7.134092,6.244353,7.690946,7.584768,7.779833,6.845586,7.351567,8.099596,7.393943,7.176465} - -==== TEST REAL SSE3 IMPLEMENTATION (h_len%4=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628,0.906507,0.279178,0.015699,0.609179} - -float y[] = {7.032490,7.904466,6.745667,7.146502,6.958916,7.972230,7.314566,6.972099,7.773273,7.740826,7.380684,7.907260,8.446323,7.862378,8.022881,7.726059,7.748359,7.602177,8.926439,8.905205,8.569546,7.948394,8.588051,8.850824,8.592319,7.636216} diff --git a/tests/Transceiver52M/convolve_test_golden.h b/tests/Transceiver52M/convolve_test_golden.h new file mode 100644 index 0000000..32ceb9d --- /dev/null +++ b/tests/Transceiver52M/convolve_test_golden.h @@ -0,0 +1,552 @@ +static const float y_ref_real_base_4[] = { + 7.3284553e-03f, -1.5985897e-02f, 1.6642426e-01f, -9.8381861e-05f, + -5.6348192e-03f, 3.4816288e-03f, -3.0451396e-02f, 6.9885664e-03f, + 3.0986860e-01f, 1.2851838e-02f, -1.2583327e-03f, 9.3199458e-04f, + 2.1099672e-02f, -6.8450999e-04f, 1.9472920e-03f, 2.3207793e-02f, + 5.4067824e-02f, 8.9792977e-04f, 4.1427527e-02f, -9.0953126e-04f, + 3.0942117e-03f, -5.7718079e-03f, 1.0763939e-01f, 2.3943521e-02f, + 2.5316875e-03f, 4.8413306e-01f, 8.0398219e-03f, -1.3080114e-02f, + 6.8538201e-01f, 1.8695365e-01f, -2.2728609e-02f, 6.4866585e-01f, + 4.5831669e-03f, 1.1961757e-02f, 1.3557098e+00f, 6.4754653e-01f, + 6.0882354e-01f, -6.4270949e-01f, -1.9183261e-02f, 8.0850981e-03f, + -1.9541480e-02f, -3.7791622e-01f, 1.2447035e+00f, 3.1898677e-02f, + -7.1577514e-03f, 7.2692493e-03f, 1.3580237e-02f, -2.2937140e+00f, + 8.6936049e-02f, -1.4597681e-02f, -8.0458717e-03f, -2.7510536e-01f, + -4.2994302e-03f, 7.1154371e-02f, 1.0165509e-01f, -2.3325549e-02f, + -3.4853625e-01f, -3.8657749e-01f, 4.9528107e-02f, 1.2682161e+00f, + -1.0333210e-03f, -2.4188099e-02f, -7.0413989e-01f, 2.6840889e-01f, + 2.0866606e-02f, 2.3660243e+00f, -1.5943053e-03f, 1.0489130e-01f, + 7.5638304e-03f, 2.1489767e-02f, 2.0176548e-01f, 1.3831037e-01f, + -3.3521327e-01f, 1.8538487e-01f, -4.5787895e-01f, -7.5173743e-02f, + 3.3042595e-01f, -1.8080406e-01f, -6.6010201e-01f, 1.8260568e-02f, + -1.0361712e+00f, -2.2955567e-01f, -7.7707589e-02f, -3.6280295e-01f, + 7.5696945e-02f, 2.0351490e-02f, -1.2557286e-01f, -1.5961775e-01f, + -1.8147121e-01f, 6.4259678e-02f, 1.4576295e-01f, 5.2804803e-03f, + 3.9667360e-02f, -3.8762847e-03f, -4.8724346e-02f, 1.2818055e-01f, + 2.8319827e-03f, 1.2508295e-02f, -6.8093723e-01f, -2.2890340e-01f, + 1.4476498e-03f, 5.2609704e-03f, 3.7768767e-03f, -8.5916013e-02f, + -1.5200208e+00f, -3.4745008e-01f, -5.0452226e-03f, 1.9683765e-01f, + 7.1817860e-03f, -1.6685052e-01f, 5.0476164e-04f, 3.1312299e-01f, + 7.3205605e-02f, 7.2717953e-01f, 1.2839527e-01f, 4.5656413e-04f, + -2.6618302e-01f, 2.1063730e-01f, -1.3622481e-01f, 6.6128123e-01f, + 2.7258250e-01f, 3.7996478e-02f, -5.2619320e-01f, -2.6390266e-03f, + -6.1858600e-01f, 1.3282325e-03f, 7.8433794e-01f, 3.4908604e-02f, + -4.1587442e-02f, -2.7224086e-03f, 2.1038547e-02f, -3.3133082e-02f, + 1.3896170e+00f, 1.0378791e-03f, -7.3926997e-01f, 2.9597912e-05f, + 5.9104588e-02f, -6.6171288e-02f, -5.2901757e-01f, 4.3202266e-01f, + -1.4101684e+00f, -1.3837258e-02f, 1.2372340e+00f, -4.0169276e-04f, + -4.5856881e-01f, -1.5467817e-01f, 2.0067864e-03f, 2.7185585e-02f, + 1.5532019e+00f, -1.0995004e-01f, 5.4053217e-03f, -2.0325487e+00f, + -3.0759480e-03f, 5.6635980e-03f, -1.8644532e+00f, 1.1858951e+00f, + 2.1747603e-01f, 6.7978328e-01f, 1.1318650e-04f, 1.3320798e+00f, + -7.6455571e-04f, 2.7964339e+00f, -4.8343060e-03f, 1.4468675e+00f, + 2.4983340e-03f, 2.6836946e+00f, -3.0531082e-04f, 5.0137013e-02f, + 2.5576806e-02f, -2.4128137e-03f, 6.0471753e-03f, 2.7244404e-04f, + 1.2334052e+00f, -4.4777431e-02f, -2.2237569e-02f, -3.0275624e-02f, + 5.7543524e-02f, -3.2028853e-04f, 2.4656518e+00f, -8.7137178e-02f, + -7.5087801e-02f, 7.2964025e-03f, 1.5436978e+00f, -3.6975890e-03f, + 6.0478604e-01f, -6.7098038e-03f, -1.8812101e-02f, -5.2548423e-03f, + 3.0423059e+00f, -4.1244932e-02f, 1.2885453e+00f, -3.4681331e-02f, + 2.0642195e-02f, -1.3136711e-02f +}; +static const float y_ref_real_base_8[] = { + 2.3463303e-02f, -1.8227151e-02f, 1.6640328e-01f, -3.2330074e-04f, + -8.5613858e-03f, 1.0202680e-02f, -3.0316524e-02f, 9.5708519e-03f, + 3.1126371e-01f, 1.2974728e-02f, 8.3076512e-04f, -6.4839720e-04f, + 4.8007734e-02f, -1.9489999e-03f, 8.4487526e-03f, 1.8476836e-02f, + 5.5679705e-02f, -8.1690572e-02f, 4.1244309e-02f, 1.2904219e-02f, + -1.1391485e-01f, 2.2048743e-01f, 1.0914046e-01f, 1.3074780e-01f, + 3.5085729e-01f, 5.5097926e-01f, 8.3524242e-02f, -2.2473586e-01f, + 5.8045220e-01f, 1.5280679e-01f, -3.0782428e-02f, 8.4257907e-01f, + 3.1209242e-01f, 2.4921113e-01f, 1.4183060e+00f, 6.5208405e-01f, + 6.1585087e-01f, -1.2225845e+00f, -6.7787543e-03f, -1.1682822e-01f, + -2.8414838e-02f, -3.8075617e-01f, 1.2378691e+00f, 7.5301081e-02f, + 1.4151726e-02f, -8.8495146e-03f, 1.9919781e-02f, -2.4257259e+00f, + 1.5717971e-01f, -3.2937329e-02f, -5.8929329e-03f, -4.6383423e-01f, + -1.8264660e-01f, 1.3494150e-01f, 6.3530490e-02f, 5.7130617e-01f, + -3.5261086e-01f, -2.7058131e-01f, 4.8935562e-02f, 1.2594652e+00f, + 8.4566139e-03f, 1.2274630e-02f, -7.2868425e-01f, 3.2263610e-01f, + 8.2154930e-02f, 2.3757131e+00f, 1.6257222e-01f, 1.1755873e-01f, + -1.4317062e-01f, 5.3268194e-02f, -8.1255190e-02f, 9.8639250e-02f, + -3.7680462e-01f, 9.8163910e-02f, -4.4354576e-01f, -8.9640662e-02f, + 2.8687710e-01f, -2.1983516e-01f, -7.0812124e-01f, 9.8803192e-03f, + -1.0052550e+00f, -2.4066174e-01f, -7.0092104e-02f, -3.6477652e-01f, + 5.9523612e-02f, 5.3088561e-02f, -1.2520128e-01f, -1.4868818e-01f, + -1.6129650e-01f, 6.4981766e-02f, 2.7441028e-01f, 4.3499433e-02f, + 3.8697608e-02f, -5.2973330e-03f, -4.3501323e-01f, 2.6533267e-02f, + -7.9337470e-02f, -2.9691525e-02f, -6.7829162e-01f, -3.0386490e-01f, + 1.9309891e-03f, 4.9200453e-02f, 1.3323659e-03f, 8.7561179e-03f, + -1.5347713e+00f, -3.8223338e-01f, -2.7321521e-02f, 2.4866055e-01f, + 9.4013810e-02f, 1.2240109e-02f, 1.2888527e-01f, 3.5388958e-01f, + -4.6176109e-02f, 7.2510922e-01f, -5.6938332e-02f, 9.8386465e-04f, + -2.9919535e-01f, 2.1958876e-01f, -2.6973075e-01f, 6.6249424e-01f, + 2.7560875e-01f, 3.7826635e-02f, -1.3242088e-01f, 2.9633616e-03f, + -5.1344192e-01f, 1.2812938e-03f, 9.1348612e-01f, 1.8132968e-02f, + -1.2789816e-01f, -6.1843758e-03f, -3.2666114e-01f, -1.0669778e-01f, + 1.3118620e+00f, 1.1690492e-03f, -1.0418800e+00f, 2.1912961e-01f, + 5.0971918e-02f, 1.5341313e-01f, 1.0156550e-01f, 4.3187100e-01f, + -1.1504548e+00f, -5.1185602e-01f, 1.2114912e+00f, -1.1039987e-01f, + -9.3158031e-01f, -2.1118599e-01f, -4.2810470e-02f, -2.2404011e-01f, + 1.5655267e+00f, -2.3002538e-01f, 5.2696159e-03f, -1.5478959e+00f, + -4.3000681e-03f, 5.1827681e-01f, -1.8647711e+00f, 1.9433970e+00f, + 2.1693678e-01f, 8.3773124e-01f, 6.1618077e-05f, 1.3388381e+00f, + -3.7471589e-03f, 2.8001621e+00f, -4.7625788e-03f, 1.4462949e+00f, + -1.9483769e-01f, 2.6819887e+00f, 9.3642920e-03f, 4.7676735e-02f, + 6.4250010e-01f, -2.3976183e-02f, 1.2017485e-01f, -2.2849534e-03f, + 1.2567258e+00f, -4.4598002e-02f, -2.6126206e-01f, -3.0767394e-02f, + -5.2884154e-02f, 2.1750279e-04f, 3.1942191e+00f, -8.7671667e-02f, + 3.7906289e-01f, 1.1495687e-02f, 1.6135001e+00f, -2.1212441e-03f, + 6.8785673e-01f, -2.4848964e-02f +}; +static const float y_ref_real_base_12[] = { + 2.7961344e-02f, -1.5535211e-02f, 1.1211979e-01f, 1.6616134e-03f, + -9.5922388e-03f, 9.7375661e-03f, -3.2953177e-02f, 1.2052679e-02f, + 3.1152555e-01f, 2.6231505e-02f, 9.9062710e-04f, -4.8942995e-01f, + 1.0436741e-01f, 7.7918661e-03f, -6.8452823e-01f, -1.3806035e-01f, + 5.8026399e-02f, 2.3703255e-01f, 4.4128276e-02f, 4.6831969e-02f, + -4.5164756e-02f, -1.7020540e-01f, -5.1074868e-01f, 1.3130705e-01f, + 3.5283747e-01f, 4.4719061e-01f, 7.6009087e-02f, 9.3393141e-01f, + 5.6226599e-01f, 1.5438497e-01f, -2.7694821e-02f, 8.4451401e-01f, + 3.2881007e-01f, 2.4729785e-01f, 1.3666317e+00f, 6.4142865e-01f, + 6.1595362e-01f, -9.5737642e-01f, -2.6630705e-02f, -1.7900605e-01f, + -5.8118436e-02f, -3.7252441e-01f, 1.5929317e+00f, 4.4281147e-02f, + 1.5012758e-02f, -1.1681970e+00f, 1.8011404e-02f, -2.4320295e+00f, + 1.6020250e-01f, -3.1992078e-02f, -2.8355956e-02f, -5.2589536e-01f, + -1.8170457e-01f, 4.2031650e-02f, 6.7236036e-02f, 5.7172579e-01f, + -5.3997779e-01f, -2.6963723e-01f, 3.4092841e-01f, 1.2517345e+00f, + 5.0172967e-01f, 7.2463937e-02f, -7.3141807e-01f, 5.0788766e-01f, + 7.3131524e-02f, 2.3581905e+00f, 2.1800779e-01f, 1.9634761e-01f, + -5.4744519e-02f, 5.3452656e-02f, -1.5430506e-01f, 9.8247126e-02f, + -3.7904060e-01f, 1.0494999e-01f, -4.2419630e-01f, -1.5403992e-01f, + 2.8903100e-01f, -2.2765251e-01f, -7.4903780e-01f, 1.1346938e-02f, + -9.9480563e-01f, -2.4016502e-01f, -1.3481325e-01f, -3.8139907e-01f, + 8.2696098e-01f, 2.8209475e-01f, -1.2430741e-01f, -1.5539975e-01f, + -1.6980076e-01f, 1.5366061e-01f, 2.7392548e-01f, -4.4134770e-02f, + 4.3462750e-02f, -2.0784412e-01f, -4.3469808e-01f, 3.6163740e-02f, + -7.2653949e-02f, -1.0692079e-01f, -7.5054938e-01f, -6.3661212e-01f, + -1.5325515e-01f, 3.9282311e-02f, 2.4099842e-01f, 1.1295346e-02f, + -1.2213932e+00f, -3.8135731e-01f, -2.9585216e-02f, 2.3089527e-01f, + 9.2161715e-02f, 1.3585546e-02f, 1.9576776e-01f, 3.5405973e-01f, + -8.3834493e-01f, 7.2514069e-01f, -3.7053145e-02f, -1.7965351e-03f, + -3.2992080e-01f, 2.5293970e-01f, -1.5305904e-01f, 6.6236615e-01f, + 9.9028492e-01f, 3.7490807e-02f, -1.4564602e-01f, 3.9972298e-02f, + -3.3809289e-01f, -4.3482783e-01f, 1.0197124e+00f, 1.9279400e-02f, + -1.3895774e+00f, -9.0192623e-02f, -2.6074594e-01f, 9.2151767e-01f, + 1.2401221e+00f, -7.6844953e-03f, -9.1630034e-02f, 3.2330477e-01f, + -5.9512623e-02f, 1.5342131e-01f, 9.5472410e-02f, 5.4552627e-01f, + -1.1496159e+00f, -1.8693621e+00f, 1.2138705e+00f, -7.2368956e-01f, + -9.3143082e-01f, -1.5557823e+00f, -4.2747378e-02f, -2.4545878e-01f, + 1.5658666e+00f, -2.2911002e-01f, 2.4292611e-03f, -1.5477308e+00f, + -2.0494850e-03f, 5.1797014e-01f, -1.8906828e+00f, 1.9609860e+00f, + 3.2104683e-01f, 8.3413792e-01f, -1.2487577e+00f, 1.3819655e+00f, + 3.8130190e-02f, 2.7968252e+00f, -5.1419135e-02f, 1.4459964e+00f, + -1.9520834e-01f, 2.6841564e+00f, 1.3225216e-01f, 4.6775803e-02f, + -7.5228769e-01f, -2.0800464e-02f, -5.3376436e-01f, -1.5136832e-04f, + 1.2800630e+00f, -4.0968142e-02f, -4.2950559e-01f, 1.6405759e-03f, + -5.1270977e-02f, 3.0794566e-02f +}; +static const float y_ref_real_base_16[] = { + 2.7960196e-02f, -1.5608220e-02f, 1.1211920e-01f, 1.2566736e-03f, + -9.6653914e-03f, 9.5255282e-03f, -3.3511665e-02f, 1.1909710e-02f, + 3.1125349e-01f, 2.6435595e-02f, 8.9632795e-04f, -4.8936245e-01f, + 1.0431707e-01f, 7.5235111e-03f, -6.8502074e-01f, -1.3821483e-01f, + 5.7783347e-02f, 2.3709093e-01f, 4.4029791e-02f, 4.7762111e-02f, + -4.5183614e-02f, -1.6974604e-01f, -5.1075298e-01f, 1.3147719e-01f, + 3.5284108e-01f, 4.4719484e-01f, 7.5972632e-02f, 9.3396825e-01f, + 5.6224394e-01f, 1.5459225e-01f, -2.7718859e-02f, 8.4456807e-01f, + 3.2883874e-01f, 2.4729541e-01f, 1.3669150e+00f, 6.4119571e-01f, + 6.1609471e-01f, -9.5836264e-01f, -2.6580276e-02f, -1.7949018e-01f, + -5.8119580e-02f, -3.7270686e-01f, 1.5929141e+00f, 4.4209335e-02f, + 1.5003120e-02f, -1.1683012e+00f, 1.7983941e-02f, -2.4320760e+00f, + 1.6010483e-01f, -3.2005005e-02f, -2.8100900e-02f, -5.2588850e-01f, + -1.8119879e-01f, 4.2111177e-02f, 6.7476459e-02f, 5.7190293e-01f, + -5.3990334e-01f, -2.6955387e-01f, 3.4098670e-01f, 1.2518206e+00f, + 5.0181293e-01f, 7.2494201e-02f, -7.3143530e-01f, 5.0789922e-01f, + 7.3116146e-02f, 2.3581848e+00f, 2.1801257e-01f, 1.9629498e-01f, + -5.4742206e-02f, 5.3421043e-02f, -1.5433398e-01f, 9.8235950e-02f, + -3.7904814e-01f, 1.0495019e-01f, -4.2411873e-01f, -1.5401368e-01f, + 2.8965056e-01f, -2.2746690e-01f, -7.4873453e-01f, 1.1446298e-02f, + -9.9470109e-01f, -2.4007829e-01f, -1.3481425e-01f, -3.8147211e-01f, + 8.2696420e-01f, 2.8190205e-01f, -1.2430534e-01f, -1.5550524e-01f, + -1.6980885e-01f, 1.5351206e-01f, 2.7384445e-01f, -4.4446655e-02f, + 4.3350209e-02f, -2.0799929e-01f, -4.3451613e-01f, 3.6113180e-02f, + -7.2316028e-02f, -1.0692445e-01f, -7.5038928e-01f, -6.3662642e-01f, + -1.5321162e-01f, 3.9276335e-02f, 2.4091691e-01f, 1.1293466e-02f, + -1.2220280e+00f, -3.8135707e-01f, -2.9885026e-02f, 2.3089877e-01f, + 9.2059940e-02f, 1.3612399e-02f, 1.9597854e-01f, 3.5407278e-01f, + -8.3770192e-01f, 7.2514516e-01f, -3.6725014e-02f, -1.8414161e-03f, + -3.2967481e-01f, 2.5258878e-01f, -1.5311684e-01f, 6.6219491e-01f, + 9.8930633e-01f, 3.7536439e-02f, -1.4608863e-01f, 4.0800616e-02f, + -3.3814532e-01f, -4.3440989e-01f, 1.0204684e+00f, 1.9512335e-02f, + -1.3892946e+00f, -9.0149909e-02f, -2.6065812e-01f, 9.2138225e-01f, + 1.2401071e+00f, -8.9044739e-03f, -9.1627970e-02f, 3.2201761e-01f, + -5.9511494e-02f, 1.5184098e-01f, 9.5472880e-02f, 5.4486692e-01f, + -1.1496160e+00f, -1.8695682e+00f, 1.2138683e+00f, -7.2369599e-01f, + -9.3143457e-01f, -1.5557806e+00f, -4.2768840e-02f, -2.4544415e-01f, + 1.5657270e+00f, -2.2909844e-01f, 1.4257956e-03f, -1.5476941e+00f, + -2.5173386e-03f, 5.1798445e-01f, -1.8908861e+00f, 1.9609910e+00f, + 3.2103050e-01f, 8.3413911e-01f, -1.2489148e+00f, 1.3819662e+00f, + 3.6895111e-02f, 2.7968283e+00f, -5.2518524e-02f, 1.4460005e+00f, + -1.9568737e-01f, 2.6841667e+00f, 1.3202193e-01f, 4.6810154e-02f, + -7.5235802e-01f, -2.0760888e-02f +}; +static const float y_ref_real_base_20[] = { + -7.0265897e-02f, -3.4402836e-02f, 1.0372016e-01f, 4.4650026e-02f, + -9.8216804e-03f, 1.3545731e-02f, -3.1243330e-02f, -4.3189127e-02f, + 2.2360153e-01f, 2.1853276e-02f, -6.7831380e-03f, -4.9043545e-01f, + 1.0250363e-01f, 1.7168562e-01f, -6.8770778e-01f, -1.2327935e-01f, + 5.8117200e-02f, 2.3840825e-01f, 4.5809470e-02f, 4.7820523e-02f, + -5.2374739e-02f, -1.6814195e-01f, -5.1162338e-01f, 1.6846101e-01f, + 3.5006949e-01f, 4.4161758e-01f, 7.5790659e-02f, 9.3267936e-01f, + 6.1256939e-01f, 1.3612756e-01f, -2.3115741e-02f, 6.7850077e-01f, + 3.2889974e-01f, 2.3149538e-01f, 1.3670783e+00f, 6.3933253e-01f, + 6.1292374e-01f, -9.6844250e-01f, -2.6894575e-02f, -1.9355249e-01f, + -5.9435852e-02f, -3.7387869e-01f, 1.5703993e+00f, 4.4267341e-02f, + 6.0315184e-02f, -1.1684257e+00f, 9.1958947e-02f, -2.4213393e+00f, + 1.6622691e-01f, -4.8931153e-03f, -2.8178021e-02f, -5.2501631e-01f, + -1.7237873e-01f, 5.3313743e-02f, 7.9919480e-02f, 5.7293087e-01f, + -5.4916167e-01f, -2.6954064e-01f, 3.4005255e-01f, 1.2519981e+00f, + 5.0446343e-01f, 6.3289568e-02f, -7.3137182e-01f, 5.0598592e-01f, + 6.7443475e-02f, 2.3582468e+00f, 2.1921243e-01f, 1.9647266e-01f, + -5.4558575e-02f, 5.3837851e-02f, -4.5539171e-02f, 1.3075757e-01f, + -3.6928999e-01f, 1.0783843e-01f, -4.2463943e-01f, -1.4256206e-01f, + 2.8959295e-01f, -2.4130194e-01f, -7.4806011e-01f, -1.8543899e-02f, + -9.9462491e-01f, -2.4273746e-01f, -1.3490504e-01f, -3.9662641e-01f, + 8.1519389e-01f, 2.3326436e-01f, -1.4405954e-01f, -1.6120674e-01f, + -1.3381398e-01f, 1.5343134e-01f, 3.2148805e-01f, -4.4539265e-02f, + 4.7204461e-02f, -2.1050940e-01f, -4.3474090e-01f, 3.6081567e-02f, + -7.2369292e-02f, -1.0689839e-01f, -8.6246216e-01f, -6.3660979e-01f, + -1.6055819e-01f, 3.9285053e-02f, 2.3843987e-01f, 1.6019637e-02f, + -1.1971095e+00f, -3.8095623e-01f, 7.3722646e-02f, 2.3075338e-01f, + 1.0152289e-01f, 1.3596226e-02f, 2.2113830e-01f, 2.9227215e-01f, + -8.3549821e-01f, 7.2011352e-01f, -2.1460648e-01f, -1.7122028e-03f, + -3.3587819e-01f, 3.9837542e-01f, -1.5223609e-01f, 6.7523712e-01f, + 1.1227249e+00f, 5.3208686e-02f, -1.4988433e-01f, 4.1713882e-02f, + -3.3956692e-01f, -4.3554237e-01f, 1.0205162e+00f, -1.8215792e-01f, + -1.3889512e+00f, -2.1134096e-01f, -2.6060539e-01f, 7.2004014e-01f, + 1.2401205e+00f, -2.9764477e-02f, -9.1612756e-02f, 3.2061791e-01f, + -5.9919737e-02f, 1.5176487e-01f, 9.5441781e-02f, 5.4503030e-01f, + -1.1536689e+00f, -1.8670475e+00f, 1.2132764e+00f, -7.2346520e-01f, + -1.1080534e+00f, -1.5496916e+00f, -5.3197015e-02f, -2.4537317e-01f, + 1.5584830e+00f, -2.2911964e-01f, 2.9620124e-04f, -1.5473943e+00f, + -2.8353482e-03f, 5.1792532e-01f, -2.0964823e+00f, 1.9614697e+00f, + 2.1000290e-01f, 8.3457404e-01f, -1.2572097e+00f, 1.3829491e+00f, + 1.2459218e-02f, 2.8018785e+00f +}; +static const float y_ref_real_base_24[] = { + 6.2982336e-02f, 1.3970278e-01f, 1.0467178e-01f, -3.0438635e-01f, + -9.9654635e-04f, -2.3906909e-01f, -2.6760638e-02f, -4.6404060e-02f, + 2.1134110e-01f, 2.1830209e-02f, 6.0099461e-03f, -4.5517617e-01f, + 1.1129893e-01f, 8.1213549e-02f, -6.8123204e-01f, -1.6140017e-01f, + 1.1501058e-01f, 2.3319562e-01f, -6.1709087e-02f, -8.4527433e-02f, + -1.3017318e-01f, 2.1048762e-01f, -5.1171911e-01f, 4.2262268e-01f, + 3.4631193e-01f, 4.3655500e-01f, 8.2364164e-02f, 9.4278538e-01f, + 6.1597699e-01f, 1.7959614e-01f, -4.3720804e-02f, 6.9884765e-01f, + 4.2869654e-01f, 2.3120803e-01f, 1.3736876e+00f, 6.5090263e-01f, + 3.9073777e-01f, -9.6380943e-01f, -1.3429978e-01f, -2.6751003e-01f, + -4.9761195e-02f, -3.9920104e-01f, 1.5638252e+00f, 2.2336561e-02f, + 1.0984164e-02f, -1.1859113e+00f, 9.5989674e-02f, -2.4212317e+00f, + 1.8494529e-01f, -1.4965374e-02f, -3.4036286e-02f, -5.0672752e-01f, + -1.8202725e-01f, 7.0033848e-02f, 9.3831271e-02f, 5.7436877e-01f, + -5.4361230e-01f, -2.6958534e-01f, 4.5147169e-01f, 1.2849377e+00f, + 2.7197060e-01f, -6.6882321e-03f, -8.9984334e-01f, 4.6791553e-01f, + 6.8551719e-02f, 2.3181112e+00f, 2.2075109e-01f, 1.8052138e-01f, + -5.5943530e-02f, 1.3795598e-01f, -4.6718303e-02f, 1.5910694e-01f, + -3.8161126e-01f, 9.0735361e-02f, -4.1892681e-01f, -1.9699816e-02f, + 3.8739362e-01f, -1.6514689e-01f, -7.5325614e-01f, -1.6511265e-02f, + -1.1474708e+00f, -2.4523194e-01f, -2.0296241e-01f, -3.9092973e-01f, + 8.1534612e-01f, 2.3672272e-01f, -2.6119494e-01f, -1.6151665e-01f, + 1.0845751e-01f, 1.5341036e-01f, 4.8571897e-01f, -3.9622501e-02f, + 7.5631693e-02f, -2.2064139e-01f, -3.7804839e-01f, 2.8819984e-02f, + -3.2726079e-01f, -1.0680644e-01f, -9.9295360e-01f, -7.0120668e-01f, + -2.1559384e-01f, 1.7155384e-01f, 1.3217717e-02f, 1.1098508e-01f, + -8.0704147e-01f, -2.2904384e-01f, 3.2801881e-01f, -8.0819115e-02f, + 2.2633848e-01f, -1.9490245e-01f, -8.0469020e-02f, 2.5875273e-01f, + -1.0077626e+00f, 6.9525474e-01f, -1.9020206e-01f, -2.1006331e-01f, + -3.3561152e-01f, 7.2181660e-01f, -1.5301284e-01f, 1.0051651e+00f, + 1.1221669e+00f, 6.1896724e-01f, -1.4992996e-01f, 3.4483558e-01f, + -3.4003645e-01f, -4.2763796e-01f, 1.0213609e+00f, -1.8036865e-01f, + -1.3922024e+00f, -2.0910147e-01f, -2.5290802e-01f, 7.1446770e-01f, + 1.0616585e+00f, -2.7260805e-02f, 2.9170352e-01f, 3.0710098e-01f, + 1.9299413e-01f, 1.4340605e-01f, 1.0358190e-01f, 5.4602933e-01f, + -1.1417214e+00f, -1.8678058e+00f, 9.9854136e-01f, -7.2323191e-01f, + -7.6547229e-01f, -1.5501947e+00f, 4.6184510e-01f, -2.4595536e-01f, + 1.6757400e+00f, -2.2652355e-01f, 5.2466784e-02f, -1.5549043e+00f, + 3.1784095e-02f, 5.0111192e-01f +}; +static const float y_ref_complex_base_4[] = { + 1.2424886e-03f, -3.8097303e-02f, 1.6485806e-01f, 2.1048410e-01f, + -5.4964307e-03f, 7.6871805e-02f, -3.0360205e-02f, 7.2628609e-03f, + 2.9147220e-01f, 9.5193144e-03f, -9.4586108e-03f, 1.6037597e-03f, + 2.1435840e-02f, 2.8855098e-02f, 6.7026038e-03f, 3.3359118e-02f, + 5.8200564e-02f, 7.7245951e-02f, 4.1719154e-02f, 2.6130656e-02f, + 2.9592067e-03f, -1.0686801e-03f, 6.8331286e-02f, 2.3206834e-02f, + -6.9511259e-01f, 4.8403400e-01f, -2.2685872e-01f, -1.0065587e-02f, + 5.0023317e-01f, 1.1576370e+00f, 3.7633857e-01f, 9.7500110e-01f, + 1.5669926e-01f, 1.0349664e-02f, 8.1589693e-01f, 6.0190046e-01f, + 4.1321993e-01f, 2.1708071e-01f, -3.0500054e-02f, 3.0158398e-01f, + 1.6112695e+00f, -3.6026406e-01f, 1.7992588e+00f, 4.2627834e-02f, + 6.0714683e-03f, 1.0133464e-02f, -2.1497929e-02f, -2.3131895e+00f, + 1.0235125e-01f, 5.1470339e-02f, 3.6088875e-01f, -2.4819581e-01f, + 3.2339133e-02f, 1.0044512e-01f, 6.9968693e-02f, -1.5862614e-02f, + -5.3877610e-01f, -8.8366485e-01f, -1.6336356e+00f, 1.0973979e+00f, + -5.6420326e-01f, -2.4906840e-02f, -7.1999365e-01f, 2.7830413e-01f, + -4.4746608e-02f, 2.3969328e+00f, -1.6477096e-01f, 1.1542892e-01f, + -3.6215313e-02f, 3.5300072e-02f, 2.0448793e-01f, 3.6505157e-01f, + -3.3389169e-01f, -2.0572579e-01f, -3.5245058e-01f, -9.2322028e-01f, + 6.2452227e-01f, -4.1897476e-01f, -5.8679944e-01f, 3.0873798e-02f, + -9.3179256e-01f, -3.0037957e-01f, -4.5527220e-02f, -5.0767326e-01f, + 7.6346993e-02f, 8.2943477e-02f, -1.2629648e-01f, -1.2274522e-01f, + -2.7190709e-01f, 4.0670574e-02f, 1.0400894e-01f, -4.3404093e-03f, + 3.7567653e-02f, 5.2584149e-02f, -4.5095809e-02f, 1.3318327e-01f, + 7.2518634e-03f, 7.5858650e-03f, -3.5912099e-01f, -1.3044448e+00f, + 1.1062925e-01f, -3.6037543e-01f, 1.1732737e-01f, -8.0421314e-02f, + -1.6354498e+00f, -3.2034269e-01f, -3.3770841e-01f, 1.9020794e-01f, + -9.1596678e-02f, -1.6963938e-01f, -1.4525817e-01f, 3.1346968e-01f, + -4.3788379e-01f, 8.4433669e-01f, -4.5026354e-02f, 2.2596139e-01f, + -2.6689067e-01f, -9.7972065e-02f, -1.2601739e-01f, 9.4717085e-02f, + 2.4789748e-01f, -1.1400697e-01f, -5.3271776e-01f, 6.4642527e-03f, + -6.1782092e-01f, 1.1494364e-02f, 7.8500766e-01f, 1.1414497e+00f, + -4.1557498e-02f, 3.4804803e-01f, 6.7717306e-02f, -1.3402831e-02f, + 1.4052844e+00f, -2.6313126e-01f, -7.3952270e-01f, -1.0841434e+00f, + 5.8159553e-02f, -4.1111353e-01f, -1.1391900e+00f, 1.8522538e-01f, + -1.6159713e+00f, -7.6101877e-02f, 1.2383872e+00f, 1.7562433e+00f, + 9.9502963e-01f, 3.5604525e-01f, 4.9185932e-01f, -5.1099802e-03f, + 1.7074050e+00f, -1.4686365e+00f, 2.3555815e-02f, -2.3235455e+00f, + -1.1249050e-02f, 5.9190854e-02f, -3.8568850e+00f, 1.2163503e+00f, + -1.4764616e+00f, 6.7262143e-01f, -2.2424378e+00f, 1.3307161e+00f, + -6.3580406e-01f, 2.7962503e+00f, -3.1376937e-03f, 1.4467635e+00f, + 4.3612257e-02f, 2.6876206e+00f, 2.1846611e-03f, 5.1418409e-02f, + 5.0988425e-02f, 3.3999152e-02f, 1.4476703e-02f, 1.4264252e-02f, + 1.2934985e+00f, 1.6994649e+00f, -7.0317499e-03f, 5.0942451e-01f, + 5.6134596e-02f, 5.7192378e-02f, 2.4672449e+00f, -1.0195614e-01f, + -7.4836522e-02f, 8.6308271e-03f, 1.5481818e+00f, 2.0240779e+00f, + 6.1010611e-01f, 1.5984699e+00f, -8.2612643e-03f, 3.0519968e-01f, + 3.0943522e+00f, 1.5195408e-01f, 1.3480808e+00f, 2.6055843e-02f, + 3.6348343e-02f, 1.6043816e-02f +}; +static const float y_ref_complex_base_8[] = { + 1.7419890e-02f, -4.0704954e-02f, 1.6413514e-01f, 2.1042241e-01f, + -2.0612659e-02f, 8.4716007e-02f, -3.1490497e-02f, 1.0974750e-02f, + 2.9366228e-01f, 2.9043412e-02f, -4.6395697e-03f, 2.9596973e-03f, + 5.0125089e-02f, 7.7959135e-02f, 1.2843234e-02f, 3.0012598e-02f, + 5.9073396e-02f, -2.6257858e-03f, -9.6190618e-03f, 3.9715882e-02f, + -5.6509280e-01f, 2.2449504e-01f, 6.0627718e-02f, 1.6782820e-01f, + -4.5272177e-01f, 1.1899462e+00f, 1.4307167e-01f, -2.2322062e-01f, + 3.7573221e-01f, 1.1219516e+00f, 9.6543171e-03f, 1.1858230e+00f, + 4.6188149e-01f, 8.1937236e-01f, 9.3072242e-01f, 6.0672551e-01f, + 1.4895550e+00f, -3.4995845e-01f, -1.4461189e-02f, 1.9294497e-01f, + 1.6107516e+00f, -3.6751097e-01f, 1.7918328e+00f, 7.7416286e-02f, + 5.1378537e-02f, 4.1829653e-02f, 2.2147447e-01f, -2.4427075e+00f, + 1.1554543e-01f, 5.2144978e-02f, 3.5672283e-01f, -4.5551652e-01f, + -3.2537282e-01f, -1.6336080e-01f, -1.0389758e+00f, 5.7760143e-01f, + -5.5196047e-01f, -7.6813650e-01f, -1.6490308e+00f, 1.0887643e+00f, + -6.2408286e-01f, 3.2250889e-02f, -8.3039373e-01f, 3.3276263e-01f, + 1.6474463e-02f, 2.4243774e+00f, -5.3585321e-04f, 2.5833863e-01f, + -1.8448403e-01f, -2.6593807e-01f, 9.1597089e-04f, -1.2902047e-01f, + -2.0593479e-01f, -2.9263443e-01f, -3.4331435e-01f, -9.4019455e-01f, + 6.5474159e-01f, -5.1990277e-01f, -6.3461000e-01f, -4.9722735e-02f, + -9.0052861e-01f, -2.4448201e-01f, -4.0073816e-02f, -5.1043189e-01f, + -2.4254480e-04f, 9.8358124e-02f, -1.3304462e-01f, -1.0863149e-01f, + -2.5067759e-01f, 7.7683263e-02f, 2.3314585e-01f, 2.5234135e-02f, + 5.0960105e-02f, 1.1590591e-02f, -2.2016604e-01f, -6.7666954e-01f, + -7.0224196e-02f, -3.5649132e-02f, -2.8665945e-01f, -1.3759845e+00f, + 4.1380534e-03f, -3.1660381e-01f, -7.1493179e-02f, 9.8383427e-03f, + -1.6555260e+00f, -3.5547855e-01f, -4.7564918e-01f, 2.4649589e-01f, + -3.1323361e-01f, 9.3652405e-02f, -2.6894443e-02f, 4.6344903e-01f, + -5.5692858e-01f, 5.8123004e-01f, -2.3190109e-01f, -6.2039871e-02f, + -3.1611770e-01f, -8.8763960e-02f, -2.5829366e-01f, 9.4856501e-02f, + 2.5098538e-01f, -7.3357031e-02f, -1.3894446e-01f, 7.4057275e-01f, + -5.1091927e-01f, -3.2870495e-03f, 9.4490921e-01f, 1.1354827e+00f, + -1.2797122e-01f, 1.4418475e-01f, -2.7954480e-01f, -7.4657279e-01f, + 1.3051461e+00f, -2.7578172e-01f, -1.4443525e+00f, -1.0325247e+00f, + 4.9454577e-02f, -1.2693270e-01f, -4.5532885e-01f, 1.3395584e+00f, + -4.0765232e-01f, -6.3264781e-01f, 1.2197388e+00f, 1.5974625e+00f, + 6.2402928e-01f, -5.6325710e-01f, 4.4816345e-01f, -1.5522356e-01f, + 1.6421539e+00f, -1.5884782e+00f, -1.3217797e+00f, -1.8393344e+00f, + -7.5535703e-01f, 5.6958872e-01f, -5.1100817e+00f, 1.9736991e+00f, + -1.5031706e+00f, 8.3048064e-01f, -2.2494981e+00f, 1.3375274e+00f, + -6.3866556e-01f, 2.8025601e+00f, -1.1117033e-03f, 1.4474899e+00f, + -1.3754091e-01f, 2.7084646e+00f, 1.4134528e-02f, 1.1448654e-01f, + 7.0737326e-01f, 1.1598951e+00f, 1.2558103e-01f, -1.8740421e-02f, + 1.3170614e+00f, 1.7498827e+00f, -2.4415883e-01f, 5.0732869e-01f, + -5.4681979e-02f, 1.3185561e-01f, 3.1990941e+00f, 1.2691741e+00f, + 3.8209638e-01f, 6.1731285e-01f, 1.6258577e+00f, 2.0354435e+00f, + 7.2707796e-01f, 1.7393314e+00f +}; +static const float y_ref_complex_base_12[] = { + 2.2754405e-02f, -2.4959709e-02f, 1.1140423e-01f, 2.0594525e-01f, + -2.1274345e-02f, 1.1812467e-01f, -3.4952130e-02f, -1.9779785e-03f, + 2.9474372e-01f, 4.3768380e-02f, -1.9684235e-02f, -4.8685929e-01f, + -1.8911968e-01f, 8.7108716e-02f, -5.3542912e-01f, -1.2841429e-01f, + -2.2173166e-02f, 7.4634272e-01f, 2.3134986e-01f, -1.3385224e-01f, + -5.8920038e-01f, -1.6588140e-01f, -8.0103523e-01f, 1.5527600e-01f, + -3.3631387e-01f, 1.4765208e+00f, 1.2495972e-01f, 7.5039023e-01f, + 1.0807629e+00f, 1.1318747e+00f, -3.3057159e-01f, 1.1950424e+00f, + 4.8376998e-01f, 8.0964905e-01f, 8.7543970e-01f, 5.8942461e-01f, + 1.4958572e+00f, -4.8936479e-02f, 1.2427349e-01f, 1.1621778e-01f, + 1.4651778e+00f, -3.4683874e-01f, 2.1665163e+00f, 4.1882977e-02f, + -2.2530014e-02f, -1.3382288e+00f, -4.6338576e-01f, -2.3439698e+00f, + 4.5865497e-01f, 5.3026043e-02f, 3.2930160e-01f, -5.1826239e-01f, + -3.6387286e-01f, -2.4198024e-01f, -1.0722954e+00f, 5.7106918e-01f, + -7.1167880e-01f, -7.6142073e-01f, -1.3569672e+00f, 1.1791412e+00f, + -1.3224502e-01f, -1.6004786e-01f, -7.8645700e-01f, 3.1110200e-01f, + 9.9555716e-02f, 2.5537014e+00f, -6.7033367e-03f, 3.3762732e-01f, + -4.3238215e-02f, -3.0443862e-01f, -9.5834918e-02f, -1.6237228e-01f, + -2.0800497e-01f, -2.1616842e-01f, -3.2291621e-01f, -1.0260535e+00f, + 6.1608827e-01f, -5.3947967e-01f, -6.6098177e-01f, -4.2084441e-02f, + -8.8710660e-01f, -2.1947564e-01f, -1.0494383e-01f, -5.4465991e-01f, + 7.6762575e-01f, 3.3412820e-01f, 9.3989922e-03f, -5.9276694e-01f, + -3.2747287e-01f, 3.9428911e-01f, 2.8387964e-01f, -6.0046993e-02f, + -3.2627407e-02f, -1.9198324e-01f, -3.1424943e-01f, -6.7002589e-01f, + -2.6603388e-03f, -1.1172239e-01f, -4.2372537e-01f, -1.7089566e+00f, + -3.2677546e-01f, -2.7506417e-01f, 2.6082978e-01f, 7.1661465e-02f, + -1.3387995e+00f, -5.5777740e-01f, -4.7837263e-01f, 1.1337535e-01f, + -3.2586664e-01f, 1.8827249e-01f, 4.6074696e-02f, 4.6254495e-01f, + -1.3494617e+00f, 5.7757890e-01f, -2.1204066e-01f, 4.2700914e-01f, + -3.4698835e-01f, -3.0178642e-01f, -1.2089632e-01f, 1.1466332e-01f, + 9.5565969e-01f, -1.8672089e-01f, -1.5176465e-01f, 3.8589886e-01f, + -3.3339968e-01f, -2.2788580e-01f, 7.7989864e-01f, 1.0243368e+00f, + -1.2602530e+00f, 1.0775426e-01f, -2.1875513e-01f, 1.0625298e+00f, + 1.8727930e+00f, -6.9799137e-01f, -8.0016631e-01f, -9.0421456e-01f, + 7.7763014e-03f, -7.1294224e-01f, -4.9317792e-01f, 1.8019344e+00f, + -4.0277326e-01f, -2.0230691e+00f, 3.4593281e-01f, 9.8393953e-01f, + 5.9989828e-01f, -1.9092379e+00f, -1.7858426e-01f, -1.7602913e-01f, + 2.0291169e+00f, -1.5875722e+00f, -1.3216347e+00f, -1.8392197e+00f, + -7.5081879e-01f, 5.7105029e-01f, -5.1354017e+00f, 1.9902898e+00f, + -1.3884977e+00f, 8.4185839e-01f, -3.5037208e+00f, 1.3678564e+00f, + -5.7006556e-01f, 3.5738621e+00f, -6.2615894e-02f, 1.0531902e+00f, + -1.3683297e-01f, 2.7558026e+00f, 1.3828042e-01f, 9.6027575e-02f, + -6.8843663e-01f, 1.1556158e+00f, -5.2607048e-01f, 8.8221872e-01f, + 1.3409892e+00f, 1.7287711e+00f, -4.0928376e-01f, 3.4484482e-01f, + -3.3398446e-02f, 2.6961833e-01f +}; +static const float y_ref_complex_base_16[] = { + 1.0204787e+00f, -2.5116354e-02f, 1.1270854e-01f, 2.0103452e-01f, + 2.4778888e-01f, -1.2959757e+00f, -6.8665636e-01f, 5.4281354e-03f, + 2.9484776e-01f, 4.6060674e-02f, 7.7454138e-01f, -4.5325273e-01f, + -1.9038971e-01f, -1.1781888e+00f, -5.2034152e-01f, -1.2409893e-01f, + -2.3876531e+00f, 7.2206217e-01f, 2.3120897e-01f, -1.6914831e-01f, + -6.0406011e-01f, -1.5706220e-01f, -7.9883760e-01f, 1.8044755e-01f, + -3.5950541e-01f, 1.3707930e+00f, -4.0555164e-01f, 7.4748451e-01f, + 1.2087665e+00f, 1.0911274e+00f, -3.2778427e-01f, 1.1958064e+00f, + 7.4790752e-01f, 1.5342562e+00f, 3.2427189e+00f, 5.8959556e-01f, + 1.5075334e+00f, -5.0237663e-02f, 1.4548016e-01f, 1.1796089e-01f, + 1.6076640e+00f, -3.9284730e-01f, 2.3559515e+00f, 4.2128317e-02f, + -2.3148807e-02f, -1.3584484e+00f, -4.6423876e-01f, -2.6688182e+00f, + 4.6124101e-01f, 7.3441708e-01f, 1.7489634e-01f, 4.8548359e-01f, + -7.3935395e-01f, -2.4636242e-01f, -1.0500691e+00f, 5.6822509e-01f, + -8.7421393e-01f, -6.3411057e-01f, -1.3568634e+00f, 1.3469000e+00f, + -1.3234839e-01f, -3.0886406e-01f, -7.8908366e-01f, 3.1085747e-01f, + 2.3230717e-01f, 2.5922649e+00f, 8.7886807e-03f, 3.3502164e-01f, + -4.5756504e-02f, -3.8599223e-01f, -9.7287148e-02f, -1.4092600e-01f, + -2.1361355e-01f, -2.1624582e-01f, -7.9024333e-01f, 5.4044557e-01f, + 6.1728191e-01f, -5.4120636e-01f, -8.2578057e-01f, -5.2031111e-02f, + -6.7291415e-01f, -2.1969818e-01f, 3.0724341e-01f, -5.3499347e-01f, + 7.6658672e-01f, 3.3450016e-01f, 2.2649126e-01f, -5.9359103e-01f, + 3.5297197e-01f, 2.2377004e-01f, 3.0364630e-01f, -3.3092478e-01f, + -3.4685202e-02f, 3.5065371e-01f, -3.1277853e-01f, -3.2924473e-02f, + 3.3693776e-02f, -1.1502443e-01f, -4.2638665e-01f, -1.7098157e+00f, + -3.2691288e-01f, -2.7505931e-01f, 2.6066101e-01f, -1.5419489e+00f, + -1.3395123e+00f, -5.1757628e-01f, -5.4671490e-01f, 7.3628947e-02f, + -3.2555306e-01f, 5.5017304e-01f, 4.6626769e-02f, 1.9207590e+00f, + -1.3491123e+00f, 5.8043593e-01f, 6.7814434e-01f, 7.9163253e-01f, + -3.5087463e-01f, -3.0272332e-01f, -1.2275376e-01f, -2.4473832e+00f, + -1.1439939e+00f, -4.7129035e-02f, -1.4907286e-01f, 3.9048588e-01f, + -5.5579591e-01f, 1.6937284e+00f, 7.8226668e-01f, 7.9524314e-01f, + -1.2481414e+00f, 1.0485204e-01f, 2.6774750e+00f, 1.0632656e+00f, + 3.3526952e+00f, -6.9430745e-01f, 1.9592261e+00f, -9.0518808e-01f, + 5.3978130e-02f, -7.1435422e-01f, -4.8238295e-01f, 1.8014801e+00f, + -4.0336940e-01f, -2.0290630e+00f, 3.4358802e-01f, 9.8404706e-01f, + 5.6399149e-01f, -1.9623561e+00f, -1.7862386e-01f, -1.7838813e-01f, + 1.9413645e+00f, -4.1300926e+00f, -1.3156767e+00f, -1.7580972e+00f, + -7.5146252e-01f, 4.6377757e-01f, -5.1398821e+00f, 1.9903698e+00f, + -1.3872584e+00f, 8.4193558e-01f, -3.5108459e+00f, -1.5915941e+00f, + -5.7677591e-01f, 2.2450306e+00f, -7.7187814e-02f, 1.0598814e+00f, + -2.0874876e-01f, 2.4064844e+00f, 7.5558253e-02f, 9.6579783e-02f, + -6.9022942e-01f, 1.1135775e+00f +}; +static const float y_ref_complex_base_20[] = { + 9.2200387e-01f, -4.4163413e-02f, 1.0421737e-01f, 2.4775283e-01f, + 2.4950641e-01f, -1.2930077e+00f, -6.8422490e-01f, -5.0231263e-02f, + 2.0338279e-01f, 4.1142385e-02f, 7.6579785e-01f, -4.5141840e-01f, + -1.9270325e-01f, -1.0140474e+00f, -5.1752222e-01f, -1.0908435e-01f, + -2.3873334e+00f, 7.2338897e-01f, 2.3257981e-01f, -1.6915460e-01f, + -6.1139292e-01f, -1.5557176e-01f, -7.9969436e-01f, 2.1765921e-01f, + -3.6079517e-01f, 1.3658193e+00f, -4.0393782e-01f, 7.4661899e-01f, + 1.2602150e+00f, 1.0727985e+00f, -3.2332528e-01f, 1.0280524e+00f, + 7.4258268e-01f, 1.5184158e+00f, 3.2430737e+00f, 5.8771044e-01f, + 1.5044163e+00f, -6.0348149e-02f, 1.4486811e-01f, 1.0372563e-01f, + 1.6059076e+00f, -3.9360225e-01f, 2.3333092e+00f, 4.3315876e-02f, + 2.1781791e-02f, -1.3572373e+00f, -3.9045078e-01f, -2.6594822e+00f, + 4.6752658e-01f, 7.5929302e-01f, 1.7562661e-01f, 4.8655730e-01f, + -7.3061436e-01f, -2.3518093e-01f, -1.0372481e+00f, 5.6892079e-01f, + -8.8336241e-01f, -6.3448465e-01f, -1.3577242e+00f, 1.3474387e+00f, + -1.2966169e-01f, -3.1813008e-01f, -7.8932881e-01f, 3.0883539e-01f, + 2.2659223e-01f, 2.5923274e+00f, 9.6015278e-03f, 3.3669871e-01f, + -4.5781195e-02f, -3.8491973e-01f, 1.1294759e-02f, -1.0811617e-01f, + -2.0266221e-01f, -2.1701297e-01f, -7.9035515e-01f, 5.5190301e-01f, + 6.1783653e-01f, -5.5501902e-01f, -8.2534575e-01f, -8.2019433e-02f, + -6.7313355e-01f, -2.2252220e-01f, 3.0751789e-01f, -5.5045158e-01f, + 7.5444525e-01f, 2.8616205e-01f, 2.0515469e-01f, -5.9817088e-01f, + 3.8894799e-01f, 2.2470807e-01f, 3.5130596e-01f, -3.3216211e-01f, + -3.0828785e-02f, 3.4665734e-01f, -3.1308788e-01f, -3.4297220e-02f, + 3.3646829e-02f, -1.1569370e-01f, -5.3851604e-01f, -1.7101202e+00f, + -3.3428961e-01f, -2.7099931e-01f, 2.5817174e-01f, -1.5359404e+00f, + -1.3144351e+00f, -5.1634777e-01f, -4.4236645e-01f, 7.3222399e-02f, + -3.1569248e-01f, 5.4692268e-01f, 7.1952589e-02f, 1.8568798e+00f, + -1.3507327e+00f, 5.7350892e-01f, 4.9932483e-01f, 7.9134196e-01f, + -3.5765892e-01f, -1.4933908e-01f, -1.1708134e-01f, -2.4339819e+00f, + -1.0106078e+00f, -3.1198170e-02f, -1.4992334e-01f, 3.8687843e-01f, + -5.5467719e-01f, 1.6931285e+00f, 7.8580469e-01f, 5.9357595e-01f, + -1.2529818e+00f, -1.6339438e-02f, 2.6746237e+00f, 8.6191237e-01f, + 3.3462768e+00f, -7.1517289e-01f, 1.9591191e+00f, -9.0659070e-01f, + 5.3502906e-02f, -7.1447617e-01f, -4.8243019e-01f, 1.8016311e+00f, + -4.0749678e-01f, -2.0286729e+00f, 3.4304601e-01f, 9.8332119e-01f, + 3.8735908e-01f, -1.9567962e+00f, -1.8885008e-01f, -1.7242540e-01f, + 1.9341036e+00f, -4.1303158e+00f, -1.3168116e+00f, -1.7600046e+00f, + -7.5177813e-01f, 4.6127564e-01f, -5.3454962e+00f, 1.9896934e+00f, + -1.4983364e+00f, 8.4872651e-01f, -3.5192151e+00f, -1.5876620e+00f, + -6.0122353e-01f, 2.2499788e+00f +}; +static const float y_ref_complex_base_24[] = { + 1.0600923e+00f, 1.3024290e-01f, 5.9496611e-02f, -1.0370921e-01f, + 2.5861672e-01f, -1.5463293e+00f, -6.8378156e-01f, -5.3357560e-02f, + 1.9118892e-01f, 4.1690204e-02f, 7.7884930e-01f, -4.1818622e-01f, + -1.9432354e-01f, -1.1044692e+00f, -5.0856161e-01f, -1.4816418e-01f, + -2.3316061e+00f, 7.1718377e-01f, 1.2707759e-01f, -2.8757638e-01f, + -6.4352435e-01f, 2.2299384e-01f, -7.9941660e-01f, 4.7296038e-01f, + -3.6058924e-01f, 1.3608670e+00f, -3.9484936e-01f, 7.5584078e-01f, + 1.2673070e+00f, 1.1163094e+00f, -3.4373367e-01f, 1.0483888e+00f, + 8.4266090e-01f, 1.5109135e+00f, 3.2499497e+00f, 6.1104643e-01f, + 1.2797645e+00f, -3.6910795e-02f, 3.0192073e-02f, 3.0663766e-02f, + 1.6160251e+00f, -4.1756570e-01f, 2.3229961e+00f, 2.3608156e-02f, + -2.7498744e-02f, -1.3712938e+00f, -3.8667876e-01f, -2.6620634e+00f, + 4.8600981e-01f, 7.4944365e-01f, 1.7231010e-01f, 5.0535941e-01f, + -7.3997790e-01f, -2.1840149e-01f, -1.0231740e+00f, 5.6881583e-01f, + -8.7780738e-01f, -6.3411063e-01f, -1.2457681e+00f, 1.3780724e+00f, + -3.7118244e-01f, -3.5782340e-01f, -9.5752192e-01f, 2.7058369e-01f, + 2.2347425e-01f, 2.5544822e+00f, 1.4717924e-02f, 3.2073233e-01f, + -3.9489999e-02f, -3.0062625e-01f, 1.0091385e-02f, -7.9756148e-02f, + -2.1108152e-01f, -2.3387817e-01f, -7.7155209e-01f, 6.7185181e-01f, + 7.1629977e-01f, -4.8482552e-01f, -8.2950342e-01f, -7.0632443e-02f, + -8.2596958e-01f, -2.1319334e-01f, 2.4015851e-01f, -5.4402274e-01f, + 7.5454187e-01f, 2.9061607e-01f, 8.8073313e-02f, -5.9624308e-01f, + 6.3121361e-01f, 1.9347335e-01f, 5.1562953e-01f, -3.2625097e-01f, + -3.7161447e-03f, 3.3269337e-01f, -2.5638106e-01f, -3.6533069e-02f, + -2.2134559e-01f, -8.7551713e-02f, -6.7024750e-01f, -1.7747418e+00f, + -3.7213624e-01f, -1.2937516e-01f, 3.2782033e-02f, -1.4374573e+00f, + -9.2007887e-01f, -4.1351610e-01f, -2.2860219e-01f, -2.3540136e-01f, + -1.9029672e-01f, 3.3175626e-01f, -2.3727785e-01f, 1.8609867e+00f, + -1.5229635e+00f, 5.4403216e-01f, 5.1958156e-01f, 5.8600175e-01f, + -3.0352169e-01f, 1.7375669e-01f, -9.3383819e-02f, -2.1039605e+00f, + -9.5350474e-01f, 5.3456688e-01f, -1.4701219e-01f, 6.9001079e-01f, + -5.5055398e-01f, 1.7010454e+00f, 7.8672868e-01f, 5.9525365e-01f, + -1.2562038e+00f, -1.4023125e-02f, 2.6816280e+00f, 8.5530829e-01f, + 3.1679361e+00f, -7.0918190e-01f, 2.3406773e+00f, -9.6939969e-01f, + 3.0656013e-01f, -7.2086781e-01f, -4.7442725e-01f, 1.7965190e+00f, + -3.9562300e-01f, -2.0293012e+00f, 1.2834491e-01f, 9.8748577e-01f, + 7.2980648e-01f, -2.0126021e+00f, 3.2610771e-01f, -1.9837779e-01f, + 2.0511889e+00f, -4.1316638e+00f, -1.2659411e+00f, -1.7763804e+00f, + -7.1837723e-01f, 4.4456357e-01f +}; -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 6 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 24 20:02:54 2019 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Thu, 24 Jan 2019 20:02:54 +0000 Subject: Change in osmo-trx[master]: tests: Re-enable the convolve_test by default In-Reply-To: References: Message-ID: tnt has submitted this change and it was merged. ( https://gerrit.osmocom.org/12418 ) Change subject: tests: Re-enable the convolve_test by default ...................................................................... tests: Re-enable the convolve_test by default Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Signed-off-by: Sylvain Munaut --- M tests/testsuite.at 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/testsuite.at b/tests/testsuite.at index 22de782..f83ac65 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -52,8 +52,6 @@ AT_SETUP([convolve_test]) AT_KEYWORDS([convolve_test]) -# Different results for i686, x86_64 and ARM. see OS#2826, OS#2828, and https://lists.osmocom.org/pipermail/openbsc/2018-January/011655.html -AT_SKIP_IF(true) cat $abs_srcdir/Transceiver52M/convolve_test.ok > expout AT_CHECK([$abs_top_builddir/tests/Transceiver52M/convolve_test], [], [expout], []) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/12418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Gerrit-Change-Number: 12418 Gerrit-PatchSet: 6 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 24 20:07:05 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 20:07:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#836?= Message-ID: <1592947690.22.1548360425227.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [tnt] tests: Rework the convolve_test [tnt] tests: Re-enable the convolve_test by default ------------------------------------------ [...truncated 107.07 KB...] Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization chmod +x burn-usrp2-eeprom sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user tnt at 246tNt.com From jenkins at lists.osmocom.org Thu Jan 24 23:57:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 Jan 2019 23:57:59 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-libosmocore_=C2=BB_a2=3Dde?= =?UTF-8?Q?fault,a3=3Ddefault,a4=3Ddefault,am?= =?UTF-8?Q?d64,osmocom-master-debian9_#723?= Message-ID: <1472722793.24.1548374279496.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Jan 25 06:51:18 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 Jan 2019 06:51:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-simtrace2_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#263?= Message-ID: <1131546046.34.1548399078172.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 21.08 KB...] /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC signal.lo CC bits.lo CC bitvec.lo CC msgb.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC loggingrb.lo CC strrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.12.0.1 libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so.12 || { rm -f libosmocore.so.12 && ln -s libosmocore.so.12.0.1 libosmocore.so.12; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.12.0.1 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vector.lo CC vty.lo CC logging_vty.lo CC utils.lo CC stats_vty.lo CC telnet_interface.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 6:0:2 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.2.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.2.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.2.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC ecu_fr.lo CC gsm690.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC gsm_utils.lo CC comp128.lo CC comp128v23.lo CC gsm48.lo CC rsl.lo /bin/bash: line 2: 15904 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm_utils.lo -MD -MP -MF $depbase.Tpo -c -o gsm_utils.lo gsm_utils.c Makefile:600: recipe for target 'gsm_utils.lo' failed make[3]: *** [gsm_utils.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:705: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 25 09:30:49 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 09:30:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12693 Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... ttcn3-bts-test-latest: use osmocom-bb-host-master Do not try to run a osmocom-bb-host-latest docker image, which does not exist as we are not tagging release versions for osmocom-bb (yet). This was done right in the docker_images_require call at the top already (which is why it did not try to build such a "-latest" image), but then the script tried to use the "-latest" images anyway (instead of hardcoding "-master"). Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc --- M ttcn3-bts-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/12693/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3632ae6..96616d9 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -50,7 +50,7 @@ --network $NET_NAME --ip 172.18.9.21 \ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ + $REPO_USER/osmocom-bb-host-master \ /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \ --log-file-name /data/fake_trx.log \ --log-file-level DEBUG \ @@ -62,7 +62,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ + $REPO_USER/osmocom-bb-host-master \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 09:34:41 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 09:34:41 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: Hello Stefan Sperling, daniel, Max, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12693 to look at the new patch set (#2). Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... ttcn3-bts-test-latest: use osmocom-bb-host-master Do not try to run a osmocom-bb-host-latest docker image, which does not exist as we are not tagging release versions for osmocom-bb (yet). This was done right in the docker_images_require call at the top already (which is why it did not try to build such a "-latest" image), but then the script tried to use the "-latest" images anyway (instead of hardcoding "-master"). Related: OS#3767 Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc --- M ttcn3-bts-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/12693/2 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 09:35:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 09:35:17 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#4). Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Related: OS#3767 Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/4 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 25 09:46:03 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 Jan 2019 09:46:03 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#837?= In-Reply-To: <1592947690.22.1548360425227.JavaMail.jenkins@jenkins.osmocom.org> References: <1592947690.22.1548360425227.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <34084892.37.1548409563994.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Jan 25 10:46:33 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 10:46:33 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 10:46:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 10:48:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 10:48:02 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... Patch Set 2: Code-Review+1 we could simply tag the "-master" container also as "-latest". The question is one of semantics. Does the suffix state what is the content? Or does it state for what kind of tests it is used? -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 25 Jan 2019 10:48:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 10:49:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 10:49:11 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 10:49:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 10:49:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 10:49:13 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build ...................................................................... jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Related: OS#3767 Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index f3d6c61..0dbe8b0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -7,10 +7,10 @@ # Trigger image build (cache will be used when up-to-date) if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" - make -C "../$i" + make -C "../$i" || exit 1 fi - # Detect missing images (build skipped/failure) + # Detect missing images (build skipped) if ! docker_image_exists "$i"; then echo "ERROR: missing image: $i" exit 1 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 10:50:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 10:50:28 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... Patch Set 2: > we could simply tag the "-master" container also as "-latest". The question is one of semantics. Does the suffix state what is the content? Or does it state for what kind of tests it is used? I would say it states the content and I don't see any benefit in tagging the same container for -latest. It might even be confusing. -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 10:50:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:02:26 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 11:02:26 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory.h: fix enum def within function signature In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12591 ) Change subject: ranap_msg_factory.h: fix enum def within function signature ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 Gerrit-Change-Number: 12591 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 25 Jan 2019 11:02:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:02:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 11:02:28 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory.h: fix enum def within function signature In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12591 ) Change subject: ranap_msg_factory.h: fix enum def within function signature ...................................................................... ranap_msg_factory.h: fix enum def within function signature Include RANAP_KeyStatus.h so that we use the global enum RANAP_KeyStatus instead of defining another only within the ranap_new_msg_sec_mod_cmd() function declaration. Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 --- M include/osmocom/ranap/ranap_msg_factory.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Max: Looks good to me, but someone else must approve diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index 120c6e6..f1f3fcc 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -7,6 +7,7 @@ #include #include #include +#include /*! \brief generate RANAP DIRECT TRANSFER message */ struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); -- To view, visit https://gerrit.osmocom.org/12591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifefaab32afa962dacdaa738a5419cce0a65a4b22 Gerrit-Change-Number: 12591 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:03:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 11:03:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12620 ) Change subject: BSC_Tests: Add tests to check channel allocator ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 25 Jan 2019 11:03:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:05:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 11:05:12 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12677 ) Change subject: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3684cf071751f9528183d761c588102936e498c Gerrit-Change-Number: 12677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 25 Jan 2019 11:05:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:05:14 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 11:05:14 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12677 ) Change subject: abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request ...................................................................... abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request On rsl_rx_chan_rqd(), so far osmo-bsc tried to preferably assign the lchan type that was asked for in the RACH. Firstly, this contained a bug, and secondly, it does not make sense to heed that preference, since we do late assignment. Ignore the preference for the MS' TCH kind. We do late assignment to avoid codec mismatches. In the "old days", we would heed the MS' TCH channel kind, even if the MSC or BSC didn't actually allow or prefer that channel kind. Hence, in the presence of both TCH/F and TCH/H, the MS could ask for TCH/F (which we would grant on the MO side) and the BSC or MSC could prefer TCH/H (which we would apply on the MT side), and hence fabricate a codec mismatch. Instead, since quite some time now, we *always* assign an SDCCH first, and only later on do another Assignment to hand out a proper voice lchan that heeds the MS capability bits as well as MSC's and BSC's preferences. By completely ignoring the channel kind the MS asked for in the RACH, we also eliminate this bug in rsl_rx_chan_rqd(): - If the first "lchan_select_by_type(GSM_LCHAN_SDDCH)" fails (all SDDCH in use), we should try to fall back to any TCH instead, to serve as SDCCH. - the first "if (!lchan && lctype != GSM_LCHAN_SDCCH)" was an attempt to prefer a fallback to the lchan type the MS requested. - the remaining two "if (!lchan && lctype == GSM_LCHAN_SDCCH)" were obviously only applied if the MS asked for an SDCCH, and skipped if the type was TCH/*. - hence, missing was: if the MS asked for a TCH, to also try the *other* TCH kind that the MS did not ask for. (Example: all SDCCH in use, MS asks for TCH/F, but BSC has only TCH/H lchans; we should assign TCH/H as SDCCH, instead we said "no resources") Change-Id: Ie3684cf071751f9528183d761c588102936e498c Related: OS#3503 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index d67573f..fd6dbdb 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1375,22 +1375,12 @@ /* check availability / allocate channel * * - First try to allocate SDCCH. - * - If SDCCH is not available, try whatever MS requested, if not SDCCH. - * - If there is still no channel available, reject channel request. + * - If SDCCH is not available, try a TCH/H (less bandwith). + * - If there is still no channel available, try a TCH/F. * - * Note: If the MS requests not TCH/H, we don't know if the phone - * supports TCH/H, so we must assign TCH/F or SDCCH. */ lchan = lchan_select_by_type(bts, GSM_LCHAN_SDCCH); - if (!lchan && lctype != GSM_LCHAN_SDCCH) { - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " - "0x%x, retrying with %s\n", - msg->lchan->ts->trx->bts->nr, - gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, - gsm_lchant_name(lctype)); - lchan = lchan_select_by_type(bts, lctype); - } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, @@ -1398,7 +1388,7 @@ gsm_lchant_name(GSM_LCHAN_TCH_H)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_H); } - if (!lchan && lctype == GSM_LCHAN_SDCCH) { + if (!lchan) { LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, -- To view, visit https://gerrit.osmocom.org/12677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie3684cf071751f9528183d761c588102936e498c Gerrit-Change-Number: 12677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:41:29 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 11:41:29 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... Patch Set 6: (4 comments) https://gerrit.osmocom.org/#/c/12658/6/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12658/6/src/utils.c at 230 PS6, Line 230: or "" (empty string) if out_buf == NULL Any use cases for this tolerance? Shouldn't we just ASSERT here? https://gerrit.osmocom.org/#/c/12658/6/src/utils.c at 230 PS6, Line 230: out_buf_size < 1 similar question for "out_buf_size < 1". https://gerrit.osmocom.org/#/c/12658/6/src/utils.c at 238 PS6, Line 238: const char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, : bool delim_after_last) Some notes: - Why do we still use int for the input buffer length? Why not size_t as for the output buffer? - Are there any use cases when delim is more than one char? Cosmetic notes: - What about prefixing both buffers with 'dst' and 'src'? - I would rather format it like this: const char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, bool delim_after_last) in order to improve readability. https://gerrit.osmocom.org/#/c/12658/6/src/utils.c at 252 PS6, Line 252: const char *delimp = delim; Do we really need this pointer? Why not to use delim itself? -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 11:41:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:45:26 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 11:45:26 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/12658/6/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12658/6/src/utils.c at 265 PS6, Line 265: *cur++ = *delimp++; > Why not to use delim itself? Ah, ok, nevermind. -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 11:45:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:50:50 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 11:50:50 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12671 ) Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... Patch Set 2: Code-Review-1 Agree with Harald. Having more than one osmo_hexdump() calls in a single log statement is quite rare case. Moreover, this API wouldn't help if one actually needs more than one calls, e.g. 3. -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 11:50:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:52:34 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 11:52:34 +0000 Subject: Change in libosmocore[master]: osmo_fsm_state_name: make robust against NULL fi In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12670 ) Change subject: osmo_fsm_state_name: make robust against NULL fi ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 Gerrit-Change-Number: 12670 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 11:52:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 11:59:16 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 11:59:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12620 ) Change subject: BSC_Tests: Add tests to check channel allocator ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 11:59:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 12:33:43 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 12:33:43 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12694 Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Adjust Dockerfiles where the default run command was different from the hardcoded run command in jenkins.sh (e.g. missing config file parameters). Related: OS#367 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M osmo-bsc-master/Dockerfile M osmo-sip-latest/Dockerfile M osmo-sip-master/Dockerfile M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 9 files changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/1 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5c76688..7afab23 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -42,6 +42,6 @@ COPY osmo-bsc.cfg /data/osmo-bsc.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-bsc"] +CMD ["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] #EXPOSE diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index a468c9f..bce5566 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -27,6 +27,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/bin/osmo-sip-connector"] +CMD ["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index e69cbc7..6adab56 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -46,6 +46,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-sip-connector"] +CMD ["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 0287097..df45b0a 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -23,7 +23,7 @@ --network $NET_NAME --ip 172.18.11.20 \ -v $VOL_BASE_DIR/bscnat:/data \ --name ${BUILD_TAG}-bscnat -d \ - $REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg + $REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c /data/osmo-bsc-nat.cfg echo Starting container with BSCNAT testsuite docker run --rm \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 96616d9..4cca7cb 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -33,8 +33,7 @@ --network $NET_NAME --ip 172.18.9.11 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX echo Starting container with BTS docker run --rm \ @@ -43,7 +42,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-bts -d \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 + /usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 echo Starting container with fake_trx docker run --rm \ @@ -63,7 +62,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ $REPO_USER/osmocom-bb-host-master \ - /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 + trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 echo Starting container with BTS testsuite diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 89669eb..512dd2c 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -21,8 +21,7 @@ --network $NET_NAME --ip 172.18.10.20 \ -v $VOL_BASE_DIR/hlr:/data \ --name ${BUILD_TAG}-hlr -d \ - $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-hlr + $REPO_USER/osmo-hlr-$IMAGE_SUFFIX echo Starting container with HLR testsuite docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 82ec483..975b068 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -37,8 +37,7 @@ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ - $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-msc + $REPO_USER/osmo-msc-$IMAGE_SUFFIX echo Starting container with MSC testsuite docker run --rm \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9243e2b..96f148a 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -23,8 +23,7 @@ --network $NET_NAME --ip 172.18.8.10 \ -v $VOL_BASE_DIR/sgsn:/data \ --name ${BUILD_TAG}-sgsn -d \ - $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-sgsn + $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX echo Starting container with SGSN testsuite docker run --rm \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 2dfd281..317482d 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -26,8 +26,7 @@ -v $VOL_BASE_DIR/sip:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ - $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-sip-connector -M /data/unix/mncc + $REPO_USER/osmo-sip-$IMAGE_SUFFIX echo Starting container with SIP testsuite docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 12:53:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 12:53:17 +0000 Subject: Change in osmo-msc[master]: transaction: change arguments of trans_find_by_sm_rp_mr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12686 ) Change subject: transaction: change arguments of trans_find_by_sm_rp_mr() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I093f36d63e671e50e54fc6236e97a777cc6da77b Gerrit-Change-Number: 12686 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 25 Jan 2019 12:53:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 12:53:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 12:53:29 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12687 ) Change subject: libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d07354175444f9764fb0dd6ea188a64494d79fe Gerrit-Change-Number: 12687 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 25 Jan 2019 12:53:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 12:53:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 12:53:59 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12628 ) Change subject: libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife6d954c46b7d8348a4221ab677d0355eb3ee7ac Gerrit-Change-Number: 12628 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 25 Jan 2019 12:53:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:01:39 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 13:01:39 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG at 9 PS1, Line 9: Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. : This caused the *-latest tests to fail, as they have the Osmocom : binaries in /usr/bin instead of /usr/local/bin. : : Adjust Dockerfiles where the default run command was different from the : hardcoded run command in jenkins.sh (e.g. missing config file : parameters). how are those two seemingly unrelated topics connected to each other? Shouldn't this be two commits? https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG at 17 PS1, Line 17: Related: OS#367 probably missing a digit, it's long ago since we had three-digit issue numbers... -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 13:01:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:02:11 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 13:02:11 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 13:02:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:03:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 13:03:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12689 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17cbbaa64d9bce770f985588e93cd3eecd732120 Gerrit-Change-Number: 12689 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 25 Jan 2019 13:03:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:03:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 13:03:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12627 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_rp_mr ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a52d44f4abde9b6b471b9108c1cee905884c9bc Gerrit-Change-Number: 12627 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 25 Jan 2019 13:03:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:04:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 13:04:53 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 13:04:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:05:01 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 13:05:01 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master ...................................................................... ttcn3-bts-test-latest: use osmocom-bb-host-master Do not try to run a osmocom-bb-host-latest docker image, which does not exist as we are not tagging release versions for osmocom-bb (yet). This was done right in the docker_images_require call at the top already (which is why it did not try to build such a "-latest" image), but then the script tried to use the "-latest" images anyway (instead of hardcoding "-master"). Related: OS#3767 Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc --- M ttcn3-bts-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3632ae6..96616d9 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -50,7 +50,7 @@ --network $NET_NAME --ip 172.18.9.21 \ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ + $REPO_USER/osmocom-bb-host-master \ /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \ --log-file-name /data/fake_trx.log \ --log-file-level DEBUG \ @@ -62,7 +62,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ + $REPO_USER/osmocom-bb-host-master \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:15:21 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 25 Jan 2019 13:15:21 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > > data->called is invalid [?] OK wrong word "invalid" typed perhaps. so the next condition: ((data->fields & MNCC_F_CALLED) == 0) is going to be true in the case of an emergency call. I can't remember right now exactly the state of all the structs here in check_setup() but you could break and take a look. What I was actually stuck on was how to write a value to data->fields at this point, (and then let the argument screening continue) I tried and got a "it's read only" error. So, as Harald said, we could have the MSC populate it all, at the same time, to make it work with legacy nitb, I'd like to deal with it here. If you can help me write data->fields, I'd upload a patch without goto and with an if block. thnx. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Fri, 25 Jan 2019 13:15:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:21:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 13:21:44 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Related: OS#3767 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 6 files changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/2 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:21:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 13:21:45 +0000 Subject: Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12695 Change subject: osmo-*/Dockerfile: fix default run command ...................................................................... osmo-*/Dockerfile: fix default run command Adjust Dockerfiles where the default run command was different from the hardcoded run command in jenkins.sh (e.g. missing config file parameters). A follow-up commit will remove the hardcoded jenkins.sh command, so it works with both *-master and *-latest images (they have different paths to the binaries). Related: OS#3767 Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb --- M osmo-bsc-master/Dockerfile M osmo-sip-latest/Dockerfile M osmo-sip-master/Dockerfile 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/12695/1 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5c76688..7afab23 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -42,6 +42,6 @@ COPY osmo-bsc.cfg /data/osmo-bsc.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-bsc"] +CMD ["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] #EXPOSE diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index a468c9f..bce5566 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -27,6 +27,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/bin/osmo-sip-connector"] +CMD ["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index e69cbc7..6adab56 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -46,6 +46,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-sip-connector"] +CMD ["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:23:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 13:23:00 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG at 9 PS1, Line 9: Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. : This caused the *-latest tests to fail, as they have the Osmocom : binaries in /usr/bin instead of /usr/local/bin. : : Adjust Dockerfiles where the default run command was different from the : hardcoded run command in jenkins.sh (e.g. missing config file : parameters). > how are those two seemingly unrelated topics connected to each other? Shouldn't this be two commits? They are connected, because after removing the hardcoded command from jenkins.sh, it will fall back to the default command in Dockerfile. But you are right, these are two logical changes, made a second commit. https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG at 17 PS1, Line 17: Related: OS#367 > probably missing a digit, it's long ago since we had three-digit issue numbers... Oh right, fixed! -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 13:23:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 13:46:22 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 25 Jan 2019 13:46:22 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 13:46:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 14:04:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 14:04:27 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c at a117 PS2, Line 117: Why is this log message gone and not replaced with a DEBUGTRANS()? -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 14:04:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 25 14:18:32 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 Jan 2019 14:18:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#838?= Message-ID: <1418240738.45.1548425912186.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.66 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html cp -r html /usr/bin/install -c -m 644 ../README ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel timer.c:45: warning 158: overflow in implicit constant conversion usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` ../common/fpga_load.c:181: warning 126: unreachable code sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp4-eeprom chmod +x burn-usrp2-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 25 14:32:28 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 25 Jan 2019 14:32:28 +0000 Subject: Change in libosmo-abis[master]: Log peer's port in accept callback In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12654 ) Change subject: Log peer's port in accept callback ...................................................................... Patch Set 2: I've double-checked and it doesn't seem like we're loosing any information, as Vadim pointed out. Here's how it looks like after this change is applied: input/ipa.c:270 10.9.1.140:4222 accept()ed new link from 10.9.1.140:60480 -- To view, visit https://gerrit.osmocom.org/12654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I186974dae1819af8c92f9ea9eeb966ec7c9c9f55 Gerrit-Change-Number: 12654 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 14:32:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 14:34:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 25 Jan 2019 14:34:45 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c at a117 PS2, Line 117: > Why is this log message gone and not replaced with a DEBUGTRANS()? For the reason described in commit log. Not sure how else to explain this. -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 14:34:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 14:35:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 25 Jan 2019 14:35:56 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12579 to look at the new patch set (#3). Change subject: Use transaction-specific debug macro ...................................................................... Use transaction-specific debug macro Move logging outside of trans_alloc() so the caller can use appropriate log subsystem. Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 13 files changed, 55 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/12579/3 -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Jan 25 15:10:07 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 Jan 2019 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#381?= Message-ID: <356828629.47.1548429007083.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.10 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Jan 25 15:31:25 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 25 Jan 2019 15:31:25 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c at a117 PS2, Line 117: > For the reason described in commit log. Not sure how else to explain this. I see. I was missing where this is calling the other allocation code, that prints the message, but it is clear from the testsuite output that this happens. -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 15:31:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 15:52:43 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 15:52:43 +0000 Subject: Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12695 ) Change subject: osmo-*/Dockerfile: fix default run command ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12695/1/osmo-bsc-master/Dockerfile File osmo-bsc-master/Dockerfile: https://gerrit.osmocom.org/#/c/12695/1/osmo-bsc-master/Dockerfile at 45 PS1, Line 45: "-c", "/data/osmo-bsc.cfg" By default, if -c is not specified, osmo-bsc should look for osmo-bsc.cfg in the current directory. https://gerrit.osmocom.org/#/c/12695/1/osmo-sip-latest/Dockerfile File osmo-sip-latest/Dockerfile: https://gerrit.osmocom.org/#/c/12695/1/osmo-sip-latest/Dockerfile at 30 PS1, Line 30: "-M", "/data/unix/mncc" AFAIK, there is no such argument. https://gerrit.osmocom.org/#/c/12695/1/osmo-sip-master/Dockerfile File osmo-sip-master/Dockerfile: https://gerrit.osmocom.org/#/c/12695/1/osmo-sip-master/Dockerfile at 49 PS1, Line 49: "-M", "/data/unix/mncc" same -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 15:52:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 16:14:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 25 Jan 2019 16:14:51 +0000 Subject: Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12695 ) Change subject: osmo-*/Dockerfile: fix default run command ...................................................................... Patch Set 1: We can get rid of both '/usr/bin/' and '/usr/local/bin/' prefixes in all Dockerfile's, and then, in the next patch, relay on default RUN command where possible. What do you think? -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 25 Jan 2019 16:14:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 25 18:37:37 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 Jan 2019 18:37:37 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh at a37 PS2, Line 37: whay are we removing the config file argument, if this commit is fixing the /usr/local/bin path?!? https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh at 45 PS2, Line 45: /usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 same here, why are we removing the config file in this commit? I thought this was about fixing the command path? -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 18:37:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 03:58:39 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 03:58:39 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce initial LMS driver support In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12676 ) Change subject: apps/grgsm_trx: introduce initial LMS driver support ...................................................................... apps/grgsm_trx: introduce initial LMS driver support Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 --- M apps/grgsm_trx M python/trx/CMakeLists.txt A python/trx/radio_if_lms.py 3 files changed, 73 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/76/12676/2 -- To view, visit https://gerrit.osmocom.org/12676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 Gerrit-Change-Number: 12676 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 04:37:02 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 04:37:02 +0000 Subject: Change in osmo-msc[master]: transaction.c: cosmetic: use 'default' branch in trans_free() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12696 Change subject: transaction.c: cosmetic: use 'default' branch in trans_free() ...................................................................... transaction.c: cosmetic: use 'default' branch in trans_free() Change-Id: Ia28ba52b0ea4771843a2a1faa346f7357604b8aa --- M src/libmsc/transaction.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/12696/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 17f8e96..70a39e8 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -138,7 +138,7 @@ */ void trans_free(struct gsm_trans *trans) { - enum ran_conn_use conn_usage_token = RAN_CONN_USE_UNTRACKED; + enum ran_conn_use conn_usage_token; struct ran_conn *conn; switch (trans->protocol) { @@ -154,6 +154,9 @@ _gsm911_nc_ss_trans_free(trans); conn_usage_token = RAN_CONN_USE_TRANS_NC_SS; break; + default: + conn_usage_token = RAN_CONN_USE_UNTRACKED; + break; } if (trans->paging_request) { -- To view, visit https://gerrit.osmocom.org/12696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia28ba52b0ea4771843a2a1faa346f7357604b8aa Gerrit-Change-Number: 12696 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 04:37:04 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 04:37:04 +0000 Subject: Change in osmo-msc[master]: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12697 Change subject: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces ...................................................................... libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces Change-Id: I09515aea9da8e2b5836c5c6409f094fae05633d4 --- M src/libmsc/ran_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/97/12697/1 diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index dca8ce0..4eefa6d 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -442,7 +442,7 @@ /* allow everything to release for any odd behavior */ .in_event_mask = S(RAN_CONN_E_COMPLETE_LAYER_3) | S(RAN_CONN_E_COMMUNICATING) | - S(RAN_CONN_E_RELEASE_WHEN_UNUSED) | + S(RAN_CONN_E_RELEASE_WHEN_UNUSED) | S(RAN_CONN_E_ACCEPTED) | S(RAN_CONN_E_MO_CLOSE) | S(RAN_CONN_E_CN_CLOSE) | -- To view, visit https://gerrit.osmocom.org/12697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09515aea9da8e2b5836c5c6409f094fae05633d4 Gerrit-Change-Number: 12697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 04:37:05 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 04:37:05 +0000 Subject: Change in osmo-msc[master]: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12698 Change subject: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' ...................................................................... libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' Change-Id: I593675d9bf56eaef12afdaf596ee1337b9a44259 --- M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c 2 files changed, 111 insertions(+), 111 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/12698/1 diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 1a1ba3c..9828da1 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -219,117 +219,6 @@ return 1; } -static const char *used_ref_counts_str(struct ran_conn *conn) -{ - static char buf[256]; - int bit_nr; - char *pos = buf; - *pos = '\0'; - - if (conn->use_tokens < 0) - return "invalid"; - -#define APPEND_STR(fmt, args...) do { \ - int remain = sizeof(buf) - (pos - buf) - 1; \ - int l = -1; \ - if (remain > 0) \ - l = snprintf(pos, remain, "%s" fmt, (pos == buf? "" : ","), ##args); \ - if (l < 0 || l > remain) { \ - buf[sizeof(buf) - 1] = '\0'; \ - return buf; \ - } \ - pos += l; \ - } while(0) - - for (bit_nr = 0; (1 << bit_nr) <= conn->use_tokens; bit_nr++) { - if (conn->use_tokens & (1 << bit_nr)) { - APPEND_STR("%s", get_value_string(ran_conn_use_names, bit_nr)); - } - } - return buf; -#undef APPEND_STR -} - -/* increment the ref-count. Needs to be called by every user */ -struct ran_conn *_ran_conn_get(struct ran_conn *conn, enum ran_conn_use balance_token, - const char *file, int line) -{ - OSMO_ASSERT(conn); - - if (balance_token != RAN_CONN_USE_UNTRACKED) { - uint32_t flag = 1 << balance_token; - OSMO_ASSERT(balance_token < 32); - if (conn->use_tokens & flag) - LOGPSRC(DREF, LOGL_ERROR, file, line, - "%s: MSC conn use error: using an already used token: %s\n", - vlr_subscr_name(conn->vsub), - ran_conn_use_name(balance_token)); - conn->use_tokens |= flag; - } - - conn->use_count++; - LOGPSRC(DREF, LOGL_DEBUG, file, line, - "%s: MSC conn use + %s == %u (0x%x: %s)\n", - vlr_subscr_name(conn->vsub), ran_conn_use_name(balance_token), - conn->use_count, conn->use_tokens, used_ref_counts_str(conn)); - - return conn; -} - -/* decrement the ref-count. Once it reaches zero, we release */ -void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, - const char *file, int line) -{ - OSMO_ASSERT(conn); - - if (balance_token != RAN_CONN_USE_UNTRACKED) { - uint32_t flag = 1 << balance_token; - OSMO_ASSERT(balance_token < 32); - if (!(conn->use_tokens & flag)) - LOGPSRC(DREF, LOGL_ERROR, file, line, - "%s: MSC conn use error: freeing an unused token: %s\n", - vlr_subscr_name(conn->vsub), - ran_conn_use_name(balance_token)); - conn->use_tokens &= ~flag; - } - - if (conn->use_count == 0) { - LOGPSRC(DREF, LOGL_ERROR, file, line, - "%s: MSC conn use - %s failed: is already 0\n", - vlr_subscr_name(conn->vsub), - ran_conn_use_name(balance_token)); - return; - } - - conn->use_count--; - LOGPSRC(DREF, LOGL_DEBUG, file, line, - "%s: MSC conn use - %s == %u (0x%x: %s)\n", - vlr_subscr_name(conn->vsub), ran_conn_use_name(balance_token), - conn->use_count, conn->use_tokens, used_ref_counts_str(conn)); - - if (conn->use_count == 0) - osmo_fsm_inst_dispatch(conn->fi, RAN_CONN_E_UNUSED, NULL); -} - -bool ran_conn_used_by(struct ran_conn *conn, enum ran_conn_use token) -{ - return conn && (conn->use_tokens & (1 << token)); -} - -const struct value_string ran_conn_use_names[] = { - {RAN_CONN_USE_UNTRACKED, "UNTRACKED"}, - {RAN_CONN_USE_COMPL_L3, "compl_l3"}, - {RAN_CONN_USE_DTAP, "dtap"}, - {RAN_CONN_USE_AUTH_CIPH, "auth+ciph"}, - {RAN_CONN_USE_CM_SERVICE, "cm_service"}, - {RAN_CONN_USE_TRANS_CC, "trans_cc"}, - {RAN_CONN_USE_TRANS_SMS, "trans_sms"}, - {RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, - {RAN_CONN_USE_SILENT_CALL, "silent_call"}, - {RAN_CONN_USE_RELEASE, "release"}, - {0, NULL}, -}; - void msc_stop_paging(struct vlr_subscr *vsub) { DEBUGP(DPAG, "Paging can stop for %s\n", vlr_subscr_name(vsub)); diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 4eefa6d..eea9936 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -772,3 +772,114 @@ { rx_close_complete(conn, "Iu Release Complete", &conn->iu.waiting_for_release_complete); } + +const struct value_string ran_conn_use_names[] = { + { RAN_CONN_USE_UNTRACKED, "UNTRACKED" }, + { RAN_CONN_USE_COMPL_L3, "compl_l3" }, + { RAN_CONN_USE_DTAP, "dtap" }, + { RAN_CONN_USE_AUTH_CIPH, "auth+ciph" }, + { RAN_CONN_USE_CM_SERVICE, "cm_service" }, + { RAN_CONN_USE_TRANS_CC, "trans_cc" }, + { RAN_CONN_USE_TRANS_SMS, "trans_sms" }, + { RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss" }, + { RAN_CONN_USE_SILENT_CALL, "silent_call" }, + { RAN_CONN_USE_RELEASE, "release" }, + { 0, NULL } +}; + +static const char *used_ref_counts_str(struct ran_conn *conn) +{ + static char buf[256]; + int bit_nr; + char *pos = buf; + *pos = '\0'; + + if (conn->use_tokens < 0) + return "invalid"; + +#define APPEND_STR(fmt, args...) do { \ + int remain = sizeof(buf) - (pos - buf) - 1; \ + int l = -1; \ + if (remain > 0) \ + l = snprintf(pos, remain, "%s" fmt, (pos == buf? "" : ","), ##args); \ + if (l < 0 || l > remain) { \ + buf[sizeof(buf) - 1] = '\0'; \ + return buf; \ + } \ + pos += l; \ + } while(0) + + for (bit_nr = 0; (1 << bit_nr) <= conn->use_tokens; bit_nr++) { + if (conn->use_tokens & (1 << bit_nr)) { + APPEND_STR("%s", get_value_string(ran_conn_use_names, bit_nr)); + } + } + return buf; +#undef APPEND_STR +} + +/* increment the ref-count. Needs to be called by every user */ +struct ran_conn *_ran_conn_get(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line) +{ + OSMO_ASSERT(conn); + + if (balance_token != RAN_CONN_USE_UNTRACKED) { + uint32_t flag = 1 << balance_token; + OSMO_ASSERT(balance_token < 32); + if (conn->use_tokens & flag) + LOGPSRC(DREF, LOGL_ERROR, file, line, + "%s: MSC conn use error: using an already used token: %s\n", + vlr_subscr_name(conn->vsub), + ran_conn_use_name(balance_token)); + conn->use_tokens |= flag; + } + + conn->use_count++; + LOGPSRC(DREF, LOGL_DEBUG, file, line, + "%s: MSC conn use + %s == %u (0x%x: %s)\n", + vlr_subscr_name(conn->vsub), ran_conn_use_name(balance_token), + conn->use_count, conn->use_tokens, used_ref_counts_str(conn)); + + return conn; +} + +/* decrement the ref-count. Once it reaches zero, we release */ +void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line) +{ + OSMO_ASSERT(conn); + + if (balance_token != RAN_CONN_USE_UNTRACKED) { + uint32_t flag = 1 << balance_token; + OSMO_ASSERT(balance_token < 32); + if (!(conn->use_tokens & flag)) + LOGPSRC(DREF, LOGL_ERROR, file, line, + "%s: MSC conn use error: freeing an unused token: %s\n", + vlr_subscr_name(conn->vsub), + ran_conn_use_name(balance_token)); + conn->use_tokens &= ~flag; + } + + if (conn->use_count == 0) { + LOGPSRC(DREF, LOGL_ERROR, file, line, + "%s: MSC conn use - %s failed: is already 0\n", + vlr_subscr_name(conn->vsub), + ran_conn_use_name(balance_token)); + return; + } + + conn->use_count--; + LOGPSRC(DREF, LOGL_DEBUG, file, line, + "%s: MSC conn use - %s == %u (0x%x: %s)\n", + vlr_subscr_name(conn->vsub), ran_conn_use_name(balance_token), + conn->use_count, conn->use_tokens, used_ref_counts_str(conn)); + + if (conn->use_count == 0) + osmo_fsm_inst_dispatch(conn->fi, RAN_CONN_E_UNUSED, NULL); +} + +bool ran_conn_used_by(struct ran_conn *conn, enum ran_conn_use token) +{ + return conn && (conn->use_tokens & (1 << token)); +} -- To view, visit https://gerrit.osmocom.org/12698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I593675d9bf56eaef12afdaf596ee1337b9a44259 Gerrit-Change-Number: 12698 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Jan 26 06:53:36 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 Jan 2019 06:53:36 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-simtrace2_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#264?= In-Reply-To: <1131546046.34.1548399078172.JavaMail.jenkins@jenkins.osmocom.org> References: <1131546046.34.1548399078172.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <98337423.59.1548485616652.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sat Jan 26 09:46:04 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 Jan 2019 09:46:04 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#839?= In-Reply-To: <1418240738.45.1548425912186.JavaMail.jenkins@jenkins.osmocom.org> References: <1418240738.45.1548425912186.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2101645706.62.1548495964623.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sat Jan 26 15:10:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 Jan 2019 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#382?= In-Reply-To: <356828629.47.1548429007083.JavaMail.jenkins@jenkins.osmocom.org> References: <356828629.47.1548429007083.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1111007244.63.1548515406899.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:06:10 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:06:10 +0000 Subject: Change in osmo-bts[master]: scheduler_trx: Fix erroneous multiply-by-four Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12699 Change subject: scheduler_trx: Fix erroneous multiply-by-four ...................................................................... scheduler_trx: Fix erroneous multiply-by-four Commit acefd0586e5d463b2e7a6a039131994bc12573fc introduced the "toa256" resolution change. Before the change, _sched_compose_ph_data_ind() used quarter-bits as units, so multiplying the old "toa" value by four made sense. However, after said change, the value is in 1/256th of bits, and hence we need to report the toa256 value without any multiply-by-four. Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d Related: OS#2977 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/12699/1 diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index fa3aed2..1b0ba73 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -846,7 +846,7 @@ ber10k = compute_ber10k(n_bits_total, n_errors); return _sched_compose_ph_data_ind(l1t, tn, *first_fn, chan, l2, l2_len, *rssi_sum / *rssi_num, - 4 * (*toa256_sum) / *toa_num, 0, ber10k, + *toa256_sum / *toa_num, 0, ber10k, PRES_INFO_UNKNOWN); } @@ -947,7 +947,7 @@ } ber10k = compute_ber10k(n_bits_total, n_errors); return _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 3) % GSM_HYPERFRAME, chan, - l2, rc, *rssi_sum / *rssi_num, 4 * (*toa256_sum) / *toa_num, 0, + l2, rc, *rssi_sum / *rssi_num, *toa256_sum / *toa_num, 0, ber10k, PRES_INFO_BOTH); } @@ -1071,7 +1071,7 @@ if (rc == GSM_MACBLOCK_LEN) { uint16_t ber10k = compute_ber10k(n_bits_total, n_errors); _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 7) % GSM_HYPERFRAME, chan, - tch_data + amr, GSM_MACBLOCK_LEN, rssi, 4 * toa256, 0, + tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0, ber10k, PRES_INFO_UNKNOWN); bfi: if (rsl_cmode == RSL_CMOD_SPD_SPEECH) { @@ -1263,7 +1263,7 @@ uint16_t ber10k = compute_ber10k(n_bits_total, n_errors); _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 10 - ((fn % 26) >= 19)) % GSM_HYPERFRAME, chan, - tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256/64, 0, + tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0, ber10k, PRES_INFO_UNKNOWN); bfi: if (rsl_cmode == RSL_CMOD_SPD_SPEECH) { -- To view, visit https://gerrit.osmocom.org/12699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d Gerrit-Change-Number: 12699 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:08:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:08:55 +0000 Subject: Change in osmo-msc[master]: transaction.c: cosmetic: use 'default' branch in trans_free() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12696 ) Change subject: transaction.c: cosmetic: use 'default' branch in trans_free() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia28ba52b0ea4771843a2a1faa346f7357604b8aa Gerrit-Change-Number: 12696 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 26 Jan 2019 16:08:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:09:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:09:05 +0000 Subject: Change in osmo-msc[master]: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12697 ) Change subject: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09515aea9da8e2b5836c5c6409f094fae05633d4 Gerrit-Change-Number: 12697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 26 Jan 2019 16:09:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:09:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:09:07 +0000 Subject: Change in osmo-msc[master]: transaction.c: cosmetic: use 'default' branch in trans_free() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12696 ) Change subject: transaction.c: cosmetic: use 'default' branch in trans_free() ...................................................................... transaction.c: cosmetic: use 'default' branch in trans_free() Change-Id: Ia28ba52b0ea4771843a2a1faa346f7357604b8aa --- M src/libmsc/transaction.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 17f8e96..70a39e8 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -138,7 +138,7 @@ */ void trans_free(struct gsm_trans *trans) { - enum ran_conn_use conn_usage_token = RAN_CONN_USE_UNTRACKED; + enum ran_conn_use conn_usage_token; struct ran_conn *conn; switch (trans->protocol) { @@ -154,6 +154,9 @@ _gsm911_nc_ss_trans_free(trans); conn_usage_token = RAN_CONN_USE_TRANS_NC_SS; break; + default: + conn_usage_token = RAN_CONN_USE_UNTRACKED; + break; } if (trans->paging_request) { -- To view, visit https://gerrit.osmocom.org/12696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia28ba52b0ea4771843a2a1faa346f7357604b8aa Gerrit-Change-Number: 12696 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:09:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:09:07 +0000 Subject: Change in osmo-msc[master]: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12697 ) Change subject: libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces ...................................................................... libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces Change-Id: I09515aea9da8e2b5836c5c6409f094fae05633d4 --- M src/libmsc/ran_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index dca8ce0..4eefa6d 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -442,7 +442,7 @@ /* allow everything to release for any odd behavior */ .in_event_mask = S(RAN_CONN_E_COMPLETE_LAYER_3) | S(RAN_CONN_E_COMMUNICATING) | - S(RAN_CONN_E_RELEASE_WHEN_UNUSED) | + S(RAN_CONN_E_RELEASE_WHEN_UNUSED) | S(RAN_CONN_E_ACCEPTED) | S(RAN_CONN_E_MO_CLOSE) | S(RAN_CONN_E_CN_CLOSE) | -- To view, visit https://gerrit.osmocom.org/12697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09515aea9da8e2b5836c5c6409f094fae05633d4 Gerrit-Change-Number: 12697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:10:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:10:15 +0000 Subject: Change in osmo-msc[master]: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12698 ) Change subject: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12698/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12698/1//COMMIT_MSG at 8 PS1, Line 8: the commit log is as often describing what, but not why. I can take guesses, but not everyone might make the same guess, so please include the reason. thanks! -- To view, visit https://gerrit.osmocom.org/12698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I593675d9bf56eaef12afdaf596ee1337b9a44259 Gerrit-Change-Number: 12698 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 26 Jan 2019 16:10:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 26 16:19:21 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 26 Jan 2019 16:19:21 +0000 Subject: Build failure of network:osmocom:nightly/binutils-arm-osmo-eabi in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5c4c88a188f87_549ab867833753c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/binutils-arm-osmo-eabi/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/binutils-arm-osmo-eabi failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly binutils-arm-osmo-eabi Last lines of build log: [ 95s] BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), [ 95s] ^~~~~~~~~~~~~~~~~~~~~~ [ 95s] cc1: all warnings being treated as errors [ 95s] make[5]: *** [Makefile:1517: binary.lo] Error 1 [ 95s] make[5]: *** Waiting for unfinished jobs.... [ 95s] cc1: all warnings being treated as errors [ 95s] make[5]: *** [Makefile:1517: srec.lo] Error 1 [ 95s] make[5]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 95s] make[4]: *** [Makefile:1555: all-recursive] Error 1 [ 95s] make[4]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 95s] make[3]: *** [Makefile:1066: all] Error 2 [ 95s] make[3]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 95s] make[2]: *** [Makefile:3331: all-bfd] Error 2 [ 95s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 95s] make[1]: *** [Makefile:850: all] Error 2 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 95s] dh_auto_build: cd build && make -j3 returned exit code 2 [ 95s] make: *** [debian/rules:43: build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 95s] [ 95s] build81 failed "build binutils-arm-osmo-eabi_2.21.1a.dsc" at Sat Jan 26 16:19:01 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 90.851699] sysrq: SysRq : Power Off [ 98s] [ 90.853665] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] build81 failed "build binutils-arm-osmo-eabi_2.21.1a.dsc" at Sat Jan 26 16:19:05 UTC 2019. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:36:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:36:17 +0000 Subject: Change in osmo-pcap[master]: change binary builds URL to network:osmocom as that's more maintained Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12700 Change subject: change binary builds URL to network:osmocom as that's more maintained ...................................................................... change binary builds URL to network:osmocom as that's more maintained Holgers' personal feed hasn't been updated for quite some time, and we're building osmo-pcap as part of the normal latest and nightly builds for quite some time now. The only disadvantage compared to Holgers' personal feed is the lack of support for RPM-based distributions (RHEL, CentOS, OpenSuSE). Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/00/12700/1 diff --git a/README.md b/README.md index b2a26cf..b125f3c 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ ## Installation and Configuration -There are Debian, Ubuntu, SLES, OpenSUSE and CentOS packages available via the excellent -[openSUSE Build Service](https://build.opensuse.org/project/show/home:zecke23:osmo-pcap). +There are Debian, Ubuntu, Raspbian packages available via the excellent +[openSUSE Build Service](https://build.opensuse.org/package/show/network:osmocom:nightly/osmo-pcap). Please see the *contrib/osmo-pcap-server.cfg* and *contrib/osmo-pcap-client.cfg* file in the repository -- To view, visit https://gerrit.osmocom.org/12700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa Gerrit-Change-Number: 12700 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 16:40:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 16:40:56 +0000 Subject: Change in osmo-pcap[master]: Fix compiler warning about deprecated _BSD_SOURCE Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12701 Change subject: Fix compiler warning about deprecated _BSD_SOURCE ...................................................................... Fix compiler warning about deprecated _BSD_SOURCE On (at least) Debian unstable I'm seeing the following compiler warninig: /usr/include/features.h:184:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" Apparently this was deprecated in glibc 2.20 released in 2014 (!) Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857 --- M src/osmo_client_core.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/01/12701/1 diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 6414552..a56ebb4 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -20,7 +20,7 @@ * */ -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include -- To view, visit https://gerrit.osmocom.org/12701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857 Gerrit-Change-Number: 12701 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:22:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 17:22:32 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12702 Change subject: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description ...................................................................... common/vty.c: fix 'cfg_phy_no_inst_cmd' command description There is no need to add comma as we concatenate two strings. Before this patch: OsmoBTS# configure terminal OsmoBTS(config)# phy 0 OsmoBTS(phy)# no? no PHY Instance number OsmoBTS(phy)# no ? instance osmotrx OsmoTRX Transceiver configuration After this patch: OsmoBTS# configure terminal OsmoBTS(config)# phy 0 OsmoBTS(phy)# no? no Negate a command or set its defaults OsmoBTS(phy)# no ? instance Select a PHY instance to remove osmotrx OsmoTRX Transceiver configuration Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/12702/1 diff --git a/src/common/vty.c b/src/common/vty.c index bb88c57..e4a9dc1 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1463,8 +1463,8 @@ } DEFUN(cfg_phy_no_inst, cfg_phy_no_inst_cmd, - "no instance <0-255>" - NO_STR "Select a PHY instance to remove\n", "PHY Instance number\n") + "no instance <0-255>", + NO_STR "Select a PHY instance to remove\n" "PHY Instance number\n") { int inst_nr = atoi(argv[0]); struct phy_link *plink = vty->index; -- To view, visit https://gerrit.osmocom.org/12702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea Gerrit-Change-Number: 12702 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:22:45 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 26 Jan 2019 17:22:45 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12702 ) Change subject: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea Gerrit-Change-Number: 12702 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 26 Jan 2019 17:22:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:29:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 17:29:07 +0000 Subject: Change in osmo-ci[master]: latest-packages: Add libosmo-dsp Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12703 Change subject: latest-packages: Add libosmo-dsp ...................................................................... latest-packages: Add libosmo-dsp Now that libosmo-dsp has a 0.4.0 tag that includes debian packaging information, we can add it to the latest feed. Change-Id: Ic082a4ad6b8582dfe44df5bdaafa525e52da7246 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/03/12703/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index f983d05..62a6da0 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -128,6 +128,7 @@ checkout osmo-msc checkout osmo-bsc checkout simtrace2 + checkout libosmo-dsp build limesuite --git-upstream-tree="$(get_last_tag limesuite)" build libosmocore @@ -152,6 +153,7 @@ build osmo-msc build osmo-bsc build simtrace2 + build libosmo-dsp cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" -- To view, visit https://gerrit.osmocom.org/12703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic082a4ad6b8582dfe44df5bdaafa525e52da7246 Gerrit-Change-Number: 12703 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:29:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 17:29:08 +0000 Subject: Change in osmo-ci[master]: osmocom-*-packages: clone via https:// not via unencrypted git:// Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12704 Change subject: osmocom-*-packages: clone via https:// not via unencrypted git:// ...................................................................... osmocom-*-packages: clone via https:// not via unencrypted git:// Change-Id: Ibfb52cbac93451ba402edb6b59350620954b0d81 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/04/12704/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 62a6da0..38c6b33 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -49,7 +49,7 @@ if [ "$project" = "limesuite" ]; then [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" else - [ -d "$project" ] || git clone "git://git.osmocom.org/$project" + [ -d "$project" ] || git clone "https://git.osmocom.org/$project" fi cd "$project" git fetch diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 55c744c..e2bdd25 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -16,7 +16,7 @@ checkout() { local name=$1 local branch=$2 - local url="git://git.osmocom.org" + local url="https://git.osmocom.org" cd "$REPO" -- To view, visit https://gerrit.osmocom.org/12704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfb52cbac93451ba402edb6b59350620954b0d81 Gerrit-Change-Number: 12704 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:30:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 17:30:12 +0000 Subject: Change in osmo-ci[master]: latest-packages: Add libosmo-dsp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12703 ) Change subject: latest-packages: Add libosmo-dsp ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic082a4ad6b8582dfe44df5bdaafa525e52da7246 Gerrit-Change-Number: 12703 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 26 Jan 2019 17:30:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 26 17:30:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 Jan 2019 17:30:24 +0000 Subject: Change in osmo-ci[master]: osmocom-*-packages: clone via https:// not via unencrypted git:// In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12704 ) Change subject: osmocom-*-packages: clone via https:// not via unencrypted git:// ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibfb52cbac93451ba402edb6b59350620954b0d81 Gerrit-Change-Number: 12704 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 26 Jan 2019 17:30:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 02:15:24 2019 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 27 Jan 2019 02:15:24 +0000 Subject: Change in osmo-pcap[master]: Fix compiler warning about deprecated _BSD_SOURCE In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12701 ) Change subject: Fix compiler warning about deprecated _BSD_SOURCE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857 Gerrit-Change-Number: 12701 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 27 Jan 2019 02:15:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 02:15:29 2019 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 27 Jan 2019 02:15:29 +0000 Subject: Change in osmo-pcap[master]: change binary builds URL to network:osmocom as that's more maintained In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12700 ) Change subject: change binary builds URL to network:osmocom as that's more maintained ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa Gerrit-Change-Number: 12700 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 27 Jan 2019 02:15:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Jan 27 09:06:00 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 Jan 2019 09:06:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-osmo-gsm-tester_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#50?= Message-ID: <513296717.75.1548579960491.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-gsm-tester" build number 50 originally caused by: Started by timer Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-gsm-tester # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-gsm-tester > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-gsm-tester +refs/heads/*:refs/remotes/origin/* Checking out Revision 82feeff1c504dbcd2cd516848a961206a74aca02 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 82feeff1c504dbcd2cd516848a961206a74aca02 Commit message: "mobile: Switch from removed cli option to vty port" > git rev-list --no-walk 82feeff1c504dbcd2cd516848a961206a74aca02 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins686722438156976893.sh + PUBLISH=1 ./contrib/jenkins-build-manuals.sh + base= + export OSMO_GSM_MANUALS_DIR= + [ -d ] + [ -d ] + git -C pull fatal: unable to access 'https://git.osmocom.org/osmo-gsm-manuals/': The requested URL returned error: 504 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Jan 27 09:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 09:10:59 +0000 Subject: Change in osmo-pcap[master]: change binary builds URL to network:osmocom as that's more maintained In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12700 ) Change subject: change binary builds URL to network:osmocom as that's more maintained ...................................................................... change binary builds URL to network:osmocom as that's more maintained Holgers' personal feed hasn't been updated for quite some time, and we're building osmo-pcap as part of the normal latest and nightly builds for quite some time now. The only disadvantage compared to Holgers' personal feed is the lack of support for RPM-based distributions (RHEL, CentOS, OpenSuSE). Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/README.md b/README.md index b2a26cf..b125f3c 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ ## Installation and Configuration -There are Debian, Ubuntu, SLES, OpenSUSE and CentOS packages available via the excellent -[openSUSE Build Service](https://build.opensuse.org/project/show/home:zecke23:osmo-pcap). +There are Debian, Ubuntu, Raspbian packages available via the excellent +[openSUSE Build Service](https://build.opensuse.org/package/show/network:osmocom:nightly/osmo-pcap). Please see the *contrib/osmo-pcap-server.cfg* and *contrib/osmo-pcap-client.cfg* file in the repository -- To view, visit https://gerrit.osmocom.org/12700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa Gerrit-Change-Number: 12700 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 09:11:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 09:11:01 +0000 Subject: Change in osmo-pcap[master]: Fix compiler warning about deprecated _BSD_SOURCE In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12701 ) Change subject: Fix compiler warning about deprecated _BSD_SOURCE ...................................................................... Fix compiler warning about deprecated _BSD_SOURCE On (at least) Debian unstable I'm seeing the following compiler warninig: /usr/include/features.h:184:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" Apparently this was deprecated in glibc 2.20 released in 2014 (!) Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857 --- M src/osmo_client_core.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 6414552..a56ebb4 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -20,7 +20,7 @@ * */ -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include -- To view, visit https://gerrit.osmocom.org/12701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857 Gerrit-Change-Number: 12701 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 09:11:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 09:11:45 +0000 Subject: Change in osmo-ci[master]: latest-packages: Add libosmo-dsp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12703 ) Change subject: latest-packages: Add libosmo-dsp ...................................................................... latest-packages: Add libosmo-dsp Now that libosmo-dsp has a 0.4.0 tag that includes debian packaging information, we can add it to the latest feed. Change-Id: Ic082a4ad6b8582dfe44df5bdaafa525e52da7246 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index f983d05..62a6da0 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -128,6 +128,7 @@ checkout osmo-msc checkout osmo-bsc checkout simtrace2 + checkout libosmo-dsp build limesuite --git-upstream-tree="$(get_last_tag limesuite)" build libosmocore @@ -152,6 +153,7 @@ build osmo-msc build osmo-bsc build simtrace2 + build libosmo-dsp cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" -- To view, visit https://gerrit.osmocom.org/12703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic082a4ad6b8582dfe44df5bdaafa525e52da7246 Gerrit-Change-Number: 12703 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 09:11:46 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 09:11:46 +0000 Subject: Change in osmo-ci[master]: osmocom-*-packages: clone via https:// not via unencrypted git:// In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12704 ) Change subject: osmocom-*-packages: clone via https:// not via unencrypted git:// ...................................................................... osmocom-*-packages: clone via https:// not via unencrypted git:// Change-Id: Ibfb52cbac93451ba402edb6b59350620954b0d81 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 62a6da0..38c6b33 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -49,7 +49,7 @@ if [ "$project" = "limesuite" ]; then [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" else - [ -d "$project" ] || git clone "git://git.osmocom.org/$project" + [ -d "$project" ] || git clone "https://git.osmocom.org/$project" fi cd "$project" git fetch diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 55c744c..e2bdd25 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -16,7 +16,7 @@ checkout() { local name=$1 local branch=$2 - local url="git://git.osmocom.org" + local url="https://git.osmocom.org" cd "$REPO" -- To view, visit https://gerrit.osmocom.org/12704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibfb52cbac93451ba402edb6b59350620954b0d81 Gerrit-Change-Number: 12704 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 11:22:30 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 27 Jan 2019 11:22:30 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12705 Change subject: Drop unused parameter ...................................................................... Drop unused parameter value_node_add() ignores it's first argument - let's drop it to make code more compact. Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 --- M src/osysmon_ctrl.c M src/osysmon_file.c M src/osysmon_main.c M src/osysmon_rtnl.c M src/osysmon_sysinfo.c M src/value_node.c M src/value_node.h 7 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/05/12705/1 diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c index 25c2b4c..4aa7a1d 100644 --- a/src/osysmon_ctrl.c +++ b/src/osysmon_ctrl.c @@ -266,7 +266,7 @@ static int ctrl_client_poll(struct ctrl_client *cc, struct value_node *parent) { struct ctrl_client_get_var *ccgv; - struct value_node *vn_clnt = value_node_add(parent, parent, cc->cfg.name, NULL); + struct value_node *vn_clnt = value_node_add(parent, cc->cfg.name, NULL); /* attempt to re-connect */ if (!cc->sch) @@ -288,7 +288,7 @@ return 0; } - value_node_add(vn_clnt, vn_clnt, ccgv->cfg.name, value); + value_node_add(vn_clnt, ccgv->cfg.name, value); free(value); /* no talloc, this is from sscanf() */ } return 0; diff --git a/src/osysmon_file.c b/src/osysmon_file.c index 3a228fa..1dec3db 100644 --- a/src/osysmon_file.c +++ b/src/osysmon_file.c @@ -82,19 +82,19 @@ f = fopen(of->cfg.path, "r"); if (!f) { - value_node_add(parent, parent, of->cfg.name, ""); + value_node_add(parent, of->cfg.name, ""); return; } s = fgets(buf, sizeof(buf), f); fclose(f); if (s == NULL) { - value_node_add(parent, parent, of->cfg.name, ""); + value_node_add(parent, of->cfg.name, ""); return; } buf[sizeof(buf)-1] = '\0'; while ((nl = strrchr(buf, '\n'))) *nl = '\0'; - value_node_add(parent, parent, of->cfg.name, buf); + value_node_add(parent, of->cfg.name, buf); } /*********************************************************************** @@ -153,7 +153,7 @@ struct value_node *vn_file; struct osysmon_file *of; - vn_file = value_node_add(parent, parent, "file", NULL); + vn_file = value_node_add(parent, "file", NULL); llist_for_each_entry(of, &g_oss->files, list) osysmon_file_read(of, vn_file); diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 486ee8f..82df61f 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -229,7 +229,7 @@ } while (1) { - struct value_node *root = value_node_add(g_oss, NULL, "root", NULL); + struct value_node *root = value_node_add(NULL, "root", NULL); osysmon_sysinfo_poll(root); osysmon_ctrl_poll(root); osysmon_rtnl_poll(root); diff --git a/src/osysmon_rtnl.c b/src/osysmon_rtnl.c index 94d8bf9..9fd4251 100644 --- a/src/osysmon_rtnl.c +++ b/src/osysmon_rtnl.c @@ -216,17 +216,17 @@ uint8_t *hwaddr = mnl_attr_get_payload(tb[IFLA_ADDRESS]); snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x", hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); - value_node_add(vn_if, vn_if, "hwaddr", buf); + value_node_add(vn_if, "hwaddr", buf); } if (ifm->ifi_flags & IFF_RUNNING) - value_node_add(vn_if, vn_if, "running", "true"); + value_node_add(vn_if, "running", "true"); else - value_node_add(vn_if, vn_if, "running", "false"); + value_node_add(vn_if, "running", "false"); if (ifm->ifi_flags & IFF_UP) - value_node_add(vn_if, vn_if, "up", "true"); + value_node_add(vn_if, "up", "true"); else - value_node_add(vn_if, vn_if, "up", "false"); + value_node_add(vn_if, "up", "false"); return MNL_CB_OK; } @@ -313,7 +313,7 @@ struct in_addr *addr = mnl_attr_get_payload(tb[IFA_ADDRESS]); char out[INET_ADDRSTRLEN+32]; snprintf(out, sizeof(out), "%s/%u", inet_ntoa(*addr), ifa->ifa_prefixlen); - value_node_add(vn_if, vn_if, "ip", out); + value_node_add(vn_if, "ip", out); } return MNL_CB_OK; @@ -404,7 +404,7 @@ if (!g_oss->rcs) g_oss->rcs = rtnl_init(NULL); - vn_net = value_node_add(parent, parent, "netdev", NULL); + vn_net = value_node_add(parent, "netdev", NULL); if (!g_oss->rcs) return -1; diff --git a/src/osysmon_sysinfo.c b/src/osysmon_sysinfo.c index 50616bc..85d9ee9 100644 --- a/src/osysmon_sysinfo.c +++ b/src/osysmon_sysinfo.c @@ -63,7 +63,7 @@ char buf[32]; int rc; - vn_sysinfo = value_node_add(parent, parent, "sysinfo", NULL); + vn_sysinfo = value_node_add(parent, "sysinfo", NULL); rc = sysinfo(&si); if (rc < 0) @@ -72,17 +72,17 @@ /* Load Factor 1/5/15min */ snprintf(buf, sizeof(buf), "%.2f/%.2f/%.2f", loadfac(si.loads[0]), loadfac(si.loads[1]), loadfac(si.loads[2])); - value_node_add(vn_sysinfo, vn_sysinfo, "load", buf); + value_node_add(vn_sysinfo, "load", buf); /* RAM information (total/free/sared) in megabytes */ snprintf(buf, sizeof(buf), "%lu/%lu/%lu", to_mbytes(si.totalram), to_mbytes(si.freeram), to_mbytes(si.sharedram)); - value_node_add(vn_sysinfo, vn_sysinfo, "ram", buf); + value_node_add(vn_sysinfo, "ram", buf); /* uptime in days/hours/minutes/seconds */ snprintf(buf, sizeof(buf), "%lud %02lu:%02lu:%02lu", to_days(si.uptime), to_hours(si.uptime), to_minutes(si.uptime), to_seconds(si.uptime)); - value_node_add(vn_sysinfo, vn_sysinfo, "uptime", buf); + value_node_add(vn_sysinfo, "uptime", buf); return 0; } diff --git a/src/value_node.c b/src/value_node.c index 38fb5c7..9143451 100644 --- a/src/value_node.c +++ b/src/value_node.c @@ -27,7 +27,7 @@ #include "value_node.h" -struct value_node *value_node_add(void *ctx, struct value_node *parent, +struct value_node *value_node_add(struct value_node *parent, const char *name, const char *value) { struct value_node *vn = talloc_zero(parent, struct value_node); @@ -67,7 +67,7 @@ struct value_node *vn; vn = value_node_find(parent, name); if (!vn) - vn = value_node_add(parent, parent, name, NULL); + vn = value_node_add(parent, name, NULL); return vn; } diff --git a/src/value_node.h b/src/value_node.h index b8183ba..84c3d7b 100644 --- a/src/value_node.h +++ b/src/value_node.h @@ -16,7 +16,7 @@ struct llist_head children; }; -struct value_node *value_node_add(void *ctx, struct value_node *parent, +struct value_node *value_node_add(struct value_node *parent, const char *name, const char *value); struct value_node *value_node_find(struct value_node *parent, const char *name); struct value_node *value_node_find_by_idx(struct value_node *parent, int idx); -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 12:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 27 Jan 2019 12:33:47 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12702 ) Change subject: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea Gerrit-Change-Number: 12702 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 27 Jan 2019 12:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 13:00:01 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 27 Jan 2019 13:00:01 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12702 ) Change subject: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea Gerrit-Change-Number: 12702 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 27 Jan 2019 13:00:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 13:42:13 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 13:42:13 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12702 ) Change subject: common/vty.c: fix 'cfg_phy_no_inst_cmd' command description ...................................................................... common/vty.c: fix 'cfg_phy_no_inst_cmd' command description A comma is needed to separate a command definition from its description, not the parts of description. Let's fix this. Before this patch: OsmoBTS# configure terminal OsmoBTS(config)# phy 0 OsmoBTS(phy)# no? no PHY Instance number OsmoBTS(phy)# no ? instance osmotrx OsmoTRX Transceiver configuration After this patch: OsmoBTS# configure terminal OsmoBTS(config)# phy 0 OsmoBTS(phy)# no? no Negate a command or set its defaults OsmoBTS(phy)# no ? instance Select a PHY instance to remove osmotrx OsmoTRX Transceiver configuration Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/vty.c b/src/common/vty.c index bb88c57..e4a9dc1 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1463,8 +1463,8 @@ } DEFUN(cfg_phy_no_inst, cfg_phy_no_inst_cmd, - "no instance <0-255>" - NO_STR "Select a PHY instance to remove\n", "PHY Instance number\n") + "no instance <0-255>", + NO_STR "Select a PHY instance to remove\n" "PHY Instance number\n") { int inst_nr = atoi(argv[0]); struct phy_link *plink = vty->index; -- To view, visit https://gerrit.osmocom.org/12702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If10d85abc6506118ba08c37e8101f423d6f838ea Gerrit-Change-Number: 12702 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 13:45:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 13:45:04 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter ...................................................................... Patch Set 1: don't you think the bug is rather that the talloc inside value_node_add is using 'parent' instead of 'ctx'? I don't recall the details. My suspicion is that originally not all nodes were dynamically allocated and hence the ctx would need to be specified explicitly. If that's no longer the case, than it appears we can go for removing the argument like in your patch. -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 27 Jan 2019 13:45:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 27 13:45:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 Jan 2019 13:45:19 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce initial LMS driver support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12676 ) Change subject: apps/grgsm_trx: introduce initial LMS driver support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 Gerrit-Change-Number: 12676 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 27 Jan 2019 13:45:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Jan 27 14:18:33 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 Jan 2019 14:18:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#842?= Message-ID: <1297244652.76.1548598713354.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.66 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html cp -r html /usr/bin/install -c -m 644 ../README ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel timer.c:45: warning 158: overflow in implicit constant conversion usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c ../common/fpga_load.c:181: warning 126: unreachable code srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Jan 27 15:10:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 Jan 2019 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#383?= In-Reply-To: <1111007244.63.1548515406899.JavaMail.jenkins@jenkins.osmocom.org> References: <1111007244.63.1548515406899.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <349178701.77.1548601806700.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.83 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Jan 27 23:18:24 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 Jan 2019 23:18:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc15?= =?UTF-8?Q?,v2017.01,0,default,osmocom-master-debian9_#1731?= Message-ID: <1276313260.79.1548631104386.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 53.32 KB...] CC rbtree.lo CC conv.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC stat_item.lo CC macaddr.lo CC stats.lo CC prim.lo CC stats_statsd.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.12.0.1 libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so.12 || { rm -f libosmocore.so.12 && ln -s libosmocore.so.12.0.1 libosmocore.so.12; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.12.0.1 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.12.0.1 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC vty.lo CC vector.lo CC command.lo CC stats_vty.lo CC telnet_interface.lo CC logging_vty.lo CC buffer.lo CC utils.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 6:0:2 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.2.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.2.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.2.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC ecu_fr.lo CC gsm690.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:453:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_ie.lo CC gsm48_arfcn_range_encode.lo CC sysinfo.lo CC gsm0808.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC kasumi.lo CC lapdm.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo /bin/bash: line 2: 27371 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gan.lo -MD -MP -MF $depbase.Tpo -c -o gan.lo gan.c Makefile:600: recipe for target 'gan.lo' failed make[3]: *** [gan.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ make[3]: Leaving directory ' Makefile:705: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Jan 28 00:02:15 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 Jan 2019 00:02:15 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_?= =?UTF-8?Q?lc15,v2017.01,0,default,osmocom-master-debian9_#1732?= In-Reply-To: <1276313260.79.1548631104386.JavaMail.jenkins@jenkins.osmocom.org> References: <1276313260.79.1548631104386.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2006162520.80.1548633735687.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Jan 28 09:05:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 Jan 2019 09:05:06 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-osmo-gsm-tester_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,a4=3Dd?= =?UTF-8?Q?efault,osmocom-master-debian9_#51?= In-Reply-To: <513296717.75.1548579960491.JavaMail.jenkins@jenkins.osmocom.org> References: <513296717.75.1548579960491.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <919616113.91.1548666306405.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Jan 28 09:41:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 Jan 2019 09:41:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#843?= In-Reply-To: <1297244652.76.1548598713354.JavaMail.jenkins@jenkins.osmocom.org> References: <1297244652.76.1548598713354.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1506292829.92.1548668518511.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 122.44 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel timer.c:45: warning 158: overflow in implicit constant conversion usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier isr.c:73: warning 94: comparison is always false due to limited range of data type isr.c:100: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 28 09:56:00 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 09:56:00 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#2). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 20 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/2 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 09:57:28 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 09:57:28 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12682/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/2/src/mncc.c at 415 PS2, Line 415: struct gsm_mncc *data; Is removing const here bad? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 09:57:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:00:30 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:00:30 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#3). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/3 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:01:58 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:01:58 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#4). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/4 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:02:32 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:02:32 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 415 PS4, Line 415: struct gsm_mncc *data; Is this OK or has some other consequences? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 10:02:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:07:14 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 10:07:14 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 415 PS4, Line 415: struct gsm_mncc *data; > Is this OK or has some other consequences? It's natuaral - you're changing it so it's not const. https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 429 PS4, Line 429: data->fields |= MNCC_F_CALLED; I'd rather use osmo_strlcpy() in here. Do we know the size of data->called.number? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 10:07:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:10:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 10:10:33 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 413 PS4, Line 413: static void check_setup(struct mncc_connection *conn, const char *buf, int rc) buf shouldn't be a const as well because you're effectively changing it for "emergency" case. https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 425 PS4, Line 425: data = (struct gsm_mncc *) buf; Also, since you're changing data which points to the same memory as buf means that buf is no longer const as well. I'm surprised compiler doesn't complain about it. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 10:10:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:21:12 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:21:12 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 429 PS4, Line 429: data->fields |= MNCC_F_CALLED; > I'd rather use osmo_strlcpy() in here. Do we know the size of data->called. [?] Yes. char number[33] libosmocore/include/osmocom/gsm/mncc.h line 38 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 10:21:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:29:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 10:29:00 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter ...................................................................... Patch Set 1: > don't you think the bug is rather that the talloc inside value_node_add is using 'parent' instead of 'ctx'? I'm not sure: the only case where they differ is root node allocation inside while(1){...} in main() - and it's deallocated at the end of each iteration. > I don't recall the details. My suspicion is that originally not all nodes were dynamically allocated and hence the ctx would need to be specified explicitly. If that's no longer the case, than it appears we can go for removing the argument like in your patch. I see, that make sense. I've checked all the places where it's called only with dynamically allocated parent so I think it's ok to drop it. -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 10:29:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:29:40 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:29:40 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#5). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/5 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:33:24 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 10:33:24 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/4/src/mncc.c at 429 PS4, Line 429: if (data->emergency) { > Yes. [?] Odd that we're not using #define for it. Anyway, since we know the size and it's fixed than we should definitely use osmo_strlcpy(..., sizeof(data->called.number)) or alike. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 10:33:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:34:51 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 10:34:51 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#6). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/6 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 6 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 10:58:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 10:58:33 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 6: Code-Review-1 (2 comments) It kinda feels like you're "cheating" compiler in here to keep the 'const' in place. Sure, you can outsmart compiler but I don't think you should. The 'const' is just an indicator for you (and any other person reading the code) to make it easier to understand what the code touches. Compiler is trying its best to check this expectation at compile-time - this check isn't perfect and we shouldn't make it even harder. If you change some data - just drop the 'const' from corresponding pointer, even if compiler fails to warn you about it. Especially in this case where all the check_*() functions are called on buffer local to the mncc_data(), which isn't used after it's checked by single check_() function. https://gerrit.osmocom.org/#/c/12682/6/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/6/src/mncc.c at 418 PS6, Line 418: uint32_t fields; Erm, why? https://gerrit.osmocom.org/#/c/12682/6/src/mncc.c at 440 PS6, Line 440: if ((fields & MNCC_F_CALLING) == 0) { I'd rather avoid changing this. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 6 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 10:58:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 11:16:45 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 11:16:45 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/12706 Change subject: Support International Caller ID ...................................................................... Support International Caller ID When the SIP call source contains + as first character, set the TON to International so that the MS displays caller ID correctly Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe --- M src/mncc.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/06/12706/1 diff --git a/src/mncc.c b/src/mncc.c index 71afaf4..b41f31c 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -781,8 +781,14 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; - mncc.calling.type = GSM48_TON_UNKNOWN; - osmo_strlcpy(mncc.calling.number, call->source, sizeof(mncc.calling.number)); + + if (strncmp(call->source, "+", 1) == 0) { + mncc.calling.type = GSM48_TON_INTERNATIONAL; + osmo_strlcpy(mncc.calling.number, call->source + 1, sizeof(mncc.calling.number)); + } else { + mncc.calling.type = GSM48_TON_UNKNOWN; + osmo_strlcpy(mncc.calling.number, call->source, sizeof(mncc.calling.number)); + } if (conn->app->use_imsi_as_id) { snprintf(mncc.imsi, 15, "%s", call->dest); -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 11:33:21 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 11:33:21 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 6: > (2 comments) > > It kinda feels like you're "cheating" compiler in here to keep the > 'const' in place. So then, to KISS, maybe just if.. else the block with the subsequent checks for the called flag? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 6 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 11:33:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 11:34:22 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 11:34:22 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 6: > maybe just if.. else the block with the > subsequent checks for the called flag? which is what Harald said in the 1st comment... -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 6 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 11:34:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 11:42:38 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 11:42:38 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#7). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/7 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 7 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 11:45:33 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 11:45:33 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 7: Not ignoring what Harald commented about implementing emergency calling support in the MSC, I'm now proposing this, possibly the simplest solution for inclusion. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 7 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 11:45:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 12:33:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 12:33:58 +0000 Subject: Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12695 ) Change subject: osmo-*/Dockerfile: fix default run command ...................................................................... Abandoned > We can get rid of both '/usr/bin/' and '/usr/local/bin/' prefixes in all Dockerfile's, and then, in the next patch, relay on default RUN command where possible. What do you think? Thanks for the idea and review (you are right with -c and -M). Honestly, I think this generates more complicated patches than necessary. The easiest solution seems to be just changing the commands in jenkins.sh not to use the absolute paths, and abandon this patch. -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 12:59:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 12:59:21 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/ paths from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Related: OS#3767 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 6 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/3 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 12:59:22 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 12:59:22 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12707 Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... ttcn3-sip-test/jenkins.sh: remove invalid -M arg osmo-sip-connector does not have a -M argument, it was probably confused with osmo-msc's -M, --mncc-sock-path argument. osmo-sip-connector printed out the following when started with -M, but otherwise functioned normally. Because it was started with Docker in background, the message did not get written to the build log. osmo-sip-connector: invalid option -- 'M' Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/07/12707/1 diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index f70943c..a918269 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -27,7 +27,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ - osmo-sip-connector -M /data/unix/mncc + osmo-sip-connector echo Starting container with SIP testsuite docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 13:04:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 13:04:47 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 3: (2 comments) New simple and clean patch that just removes /usr/local/bin. https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh at a37 PS2, Line 37: > whay are we removing the config file argument, if this commit is fixing the /usr/local/bin path?!? I had assumed that it would be cleaner to remove the entire run command here, and use the default run command specified in Dockerfile instead. That's why I had deleted the whole line (including the config parameter). But I've realized that the cleanest way to do this is just remove /usr/local/bin from each command in jenkins.sh and modify nothing else. So I've pushed a new patch version, please take another look. https://gerrit.osmocom.org/#/c/12694/3/ttcn3-sip-test/jenkins.sh File ttcn3-sip-test/jenkins.sh: https://gerrit.osmocom.org/#/c/12694/3/ttcn3-sip-test/jenkins.sh at 30 PS3, Line 30: -M /data/unix/mncc Vadim noted that -M is invalid for osmo-sip-connector in a related patch, so I've fixed it here: https://gerrit.osmocom.org/#/c/docker-playground/+/12707/ -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 13:04:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:04:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 14:04:13 +0000 Subject: Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12708 Change subject: ttcn3-bsc-test-sccplite-latest: enable job ...................................................................... ttcn3-bsc-test-sccplite-latest: enable job This job does not get stuck anymore since the latest Osmocom release. Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc --- M jobs/ttcn3-testsuites.yml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/08/12708/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ba0ce2a..cd7aaa9 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -36,8 +36,7 @@ - nplab-m3ua-test-latest - nplab-sua-test-latest - ttcn3-bsc-test-latest - - ttcn3-bsc-test-sccplite-latest: - disabled: true + - ttcn3-bsc-test-sccplite-latest - ttcn3-bts-test-latest - ttcn3-ggsn-test-latest - ttcn3-hlr-test-latest -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:04:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 14:04:14 +0000 Subject: Change in osmo-ci[master]: ttcn3: block latest jobs while master is running Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12709 Change subject: ttcn3: block latest jobs while master is running ...................................................................... ttcn3: block latest jobs while master is running Jenkins job builder does not support string replacing in variables, so the only way to make each ttcn3-foo-test-latest job get blocked by their ttcn3-foo-test counterpart was specifying them each time. Related: OS#3767 Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 --- M jobs/ttcn3-testsuites.yml 1 file changed, 25 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/09/12709/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index cd7aaa9..b7a3fd0 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -4,6 +4,8 @@ concurrent: false disabled: false timer: "@midnight" + # Block *-latest for all master jobs (without suffix) + blocking: "^{job-name}.*" jobs: - "{job-name}" # Folders from docker-playground.git @@ -33,17 +35,28 @@ timer: 00 07 * * * # latest stable - - nplab-m3ua-test-latest - - nplab-sua-test-latest - - ttcn3-bsc-test-latest - - ttcn3-bsc-test-sccplite-latest - - ttcn3-bts-test-latest - - ttcn3-ggsn-test-latest - - ttcn3-hlr-test-latest - - ttcn3-mgw-test-latest - - ttcn3-msc-test-latest - - ttcn3-sgsn-test-latest - - ttcn3-sip-test-latest + - nplab-m3ua-test-latest: + blocking: "^nplab-m3ua-test.*" + - nplab-sua-test-latest: + blocking: "^nplab-sua-test.*" + - ttcn3-bsc-test-latest: + blocking: "^ttcn3-bsc-test.*" + - ttcn3-bsc-test-sccplite-latest: + blocking: "^ttcn3-bsc-test-sccplite.*" + - ttcn3-bts-test-latest: + blocking: "^ttcn3-bts-test.*" + - ttcn3-ggsn-test-latest: + blocking: "^ttcn3-ggsn-test.*" + - ttcn3-hlr-test-latest: + blocking: "^ttcn3-hlr-test.*" + - ttcn3-mgw-test-latest: + blocking: "^ttcn3-mgw-test.*" + - ttcn3-msc-test-latest: + blocking: "^ttcn3-msc-test.*" + - ttcn3-sgsn-test-latest: + blocking: "^ttcn3-sgsn-test.*" + - ttcn3-sip-test-latest: + blocking: "^ttcn3-sip-test.*" - job-template: name: '{job-name}' project-type: freestyle @@ -107,7 +120,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - "^{job-name}.*" + - "{obj:blocking}" - build-discarder: days-to-keep: 30 num-to-keep: 120 -- To view, visit https://gerrit.osmocom.org/12709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 Gerrit-Change-Number: 12709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 28 14:22:38 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 Jan 2019 14:22:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#844?= In-Reply-To: <1506292829.92.1548668518511.JavaMail.jenkins@jenkins.osmocom.org> References: <1506292829.92.1548668518511.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1653780956.96.1548685358082.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:28:11 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:28:11 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12710 Change subject: Add ping probe support ...................................................................... Add ping probe support If liboping is available during ./configure than 'ping XXX' entries will be supported in .cfg file, where XXX can be either IP address or FQDN. Sample output: ... ping ya.ru IP: 2a02:6b8::2:242 dropped: 3/3 8.8.8.8 IP: 8.8.8.8 dropped: 0/3 latency: 20.4 ms TTL: 120 ... N. B: to gather actual ping statistic we have to be able to send ICMP requests (have enough privileges to work with RAW sockets). Related: SYS#2655 Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 --- M configure.ac M src/Makefile.am M src/osysmon.h M src/osysmon_main.c A src/osysmon_ping.c 5 files changed, 278 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/10/12710/1 diff --git a/configure.ac b/configure.ac index 734ac99..be60a8e 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,9 @@ AC_SUBST([COVERAGE_LDFLAGS]) fi +PKG_CHECK_MODULES(LIBOPING, liboping, found_oping=yes, [AC_DEFINE([NO_OPING], [1], [Don't use liboping])]) +AM_CONDITIONAL(HAVE_OPING, test "$found_oping" = yes) + AC_ARG_ENABLE(profile, [AS_HELP_STRING([--enable-profile], [Compile with profiling support enabled], )], [profile=$enableval], [profile="no"]) diff --git a/src/Makefile.am b/src/Makefile.am index 412337b..2e5f260 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,6 +37,12 @@ osysmon_main.c \ $(NULL) +if HAVE_OPING +osmo_sysmon_SOURCES += osysmon_ping.c +osmo_sysmon_LDADD += $(LIBOPING_LIBS) +osmo_sysmon_CFLAGS = $(AM_CFLAGS) $(LIBOPING_CFLAGS) +endif + osmo_ctrl_client_SOURCES = \ simple_ctrl.c \ osmo-ctrl-client.c \ diff --git a/src/osysmon.h b/src/osysmon.h index 735b11e..8b17972 100644 --- a/src/osysmon.h +++ b/src/osysmon.h @@ -6,9 +6,11 @@ #include +#include "config.h" #include "value_node.h" struct rtnl_client_state; +struct ping_state; struct osysmon_state { struct rtnl_client_state *rcs; @@ -18,6 +20,7 @@ struct llist_head netdevs; /* list of 'struct osysmon_file' */ struct llist_head files; + struct ping_state *pings; }; extern struct osysmon_state *g_oss; @@ -28,6 +31,7 @@ CTRL_CLIENT_NODE = _LAST_OSMOVTY_NODE + 1, CTRL_CLIENT_GETVAR_NODE, NETDEV_NODE, + PING_NODE, }; @@ -42,5 +46,8 @@ int osysmon_sysinfo_init(); int osysmon_sysinfo_poll(struct value_node *parent); +int osysmon_ping_init(); +int osysmon_ping_poll(struct value_node *parent); + int osysmon_file_init(); int osysmon_file_poll(struct value_node *parent); diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 82df61f..96dfa69 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -193,7 +193,7 @@ int main(int argc, char **argv) { - int rc; + int rc, ping_init; osmo_init_logging2(NULL, &log_info); @@ -207,6 +207,9 @@ osysmon_sysinfo_init(); osysmon_ctrl_init(); osysmon_rtnl_init(); +#ifndef NO_OPING + ping_init = osysmon_ping_init(); +#endif osysmon_file_init(); rc = vty_read_config_file(cmdline_opts.config_file, NULL); @@ -233,6 +236,10 @@ osysmon_sysinfo_poll(root); osysmon_ctrl_poll(root); osysmon_rtnl_poll(root); +#ifndef NO_OPING + if (ping_init == 0) + osysmon_ping_poll(root); +#endif osysmon_file_poll(root); display_update(root); diff --git a/src/osysmon_ping.c b/src/osysmon_ping.c new file mode 100644 index 0000000..eaa3d1b --- /dev/null +++ b/src/osysmon_ping.c @@ -0,0 +1,254 @@ +/* Simple Osmocom System Monitor (osysmon): Support for ping probe */ + +/* (C) 2018 by sysmocom - s.f.m.c. GmbH. + * Author: Max Suraev + * 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 +#include + +#include + +#include +#include +#include + +#include "osysmon.h" +#include "value_node.h" + +/*********************************************************************** + * Data model + ***********************************************************************/ + +#define BUFLEN 128 + +struct ping_state { + pingobj_t *ping_handle; +}; + +/* Workaround for liboping issue https://github.com/octo/liboping/issues/43 */ +static int add_host(pingobj_t *pinger, const char *host) +{ + int num_host = ping_iterator_count(pinger), + rc = ping_host_add(pinger, host); + + if (rc < 0) { + if (num_host != ping_iterator_count(pinger)) + ping_host_remove(pinger, host); + } + + return rc; +} + + +static bool add_drop(pingobj_iter_t *iter, struct value_node *vn_host) +{ + char *s = NULL; + uint32_t drop, seq; + size_t len = sizeof(drop); + int rc = ping_iterator_get_info(iter, PING_INFO_DROPPED, &drop, &len); + if (rc) + return false; + + len = sizeof(seq); + rc = ping_iterator_get_info(iter, PING_INFO_SEQUENCE, &seq, &len); + if (rc) + return false; + + osmo_talloc_asprintf(vn_host, s, "%u/%u", drop, seq); + value_node_add(vn_host, "dropped", s); + + return true; +} + +static bool add_ttl(pingobj_iter_t *iter, struct value_node *vn_host) +{ + int ttl, rc; + size_t len = sizeof(ttl); + + rc = ping_iterator_get_info(iter, PING_INFO_RECV_TTL, &ttl, &len); + if (rc) + return false; + + if (ttl > -1) { + char *s = NULL; + osmo_talloc_asprintf(vn_host, s, "%d", ttl); + value_node_add(vn_host, "TTL", s); + } + + return true; +} + +static bool add_latency(pingobj_iter_t *iter, struct value_node *vn_host) +{ + double latency; + size_t len = sizeof(latency); + int rc = ping_iterator_get_info(iter, PING_INFO_LATENCY, &latency, &len); + if (rc) + return false; + + if (latency > -1) { + char *s = NULL; + osmo_talloc_asprintf(vn_host, s, "%.1lf ms", latency); + value_node_add(vn_host, "latency", s); + } + + return true; +} + + +/*********************************************************************** + * VTY + ***********************************************************************/ + +static struct cmd_node ping_node = { + PING_NODE, + "%s(config-ping)# ", + 1, +}; + +int osysmon_ping_go_parent(struct vty *vty) +{ + switch (vty->node) { + case PING_NODE: + vty->node = CONFIG_NODE; + vty->index = NULL; + break; + default: + break; + } + return vty->node; +} + +#define PING_STR "Configure a host to be monitored/pinged\n" + +DEFUN(cfg_ping, cfg_ping_cmd, + "ping HOST", + PING_STR "Name of the host to ping\n") +{ + int rc = add_host(g_oss->pings->ping_handle, argv[0]); + if (rc < 0) { + vty_out(vty, "[%d] Couldn't add pinger for %s: %s%s", + ping_iterator_count(g_oss->pings->ping_handle), argv[0], + ping_get_error(g_oss->pings->ping_handle), VTY_NEWLINE); + + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_ping, cfg_no_ping_cmd, + "no ping HOST", + NO_STR PING_STR "Name of the host to ping\n") +{ + int rc = ping_host_remove(g_oss->pings->ping_handle, argv[0]); + if (rc < 0) { + vty_out(vty, "[%d] Couldn't remove %s pinger: %s%s", + ping_iterator_count(g_oss->pings->ping_handle), argv[0], + ping_get_error(g_oss->pings->ping_handle), VTY_NEWLINE); + + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +static int config_write_ping(struct vty *vty) +{ + char buf[BUFLEN]; + pingobj_iter_t *iter; + for (iter = ping_iterator_get(g_oss->pings->ping_handle); iter; iter = ping_iterator_next(iter)) { + size_t len = BUFLEN; + /* hostname as it was supplied via vty 'ping' entry */ + if (ping_iterator_get_info(iter, PING_INFO_USERNAME, buf, &len)) + return CMD_WARNING; + + vty_out(vty, "ping %s%s", buf, VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + + +/*********************************************************************** + * Runtime Code + ***********************************************************************/ + +/* called once on startup before config file parsing */ +int osysmon_ping_init() +{ + install_element(CONFIG_NODE, &cfg_ping_cmd); + install_element(CONFIG_NODE, &cfg_no_ping_cmd); + install_node(&ping_node, config_write_ping); + + g_oss->pings = talloc_zero(NULL, struct ping_state); + if (!g_oss->pings) + return -ENOMEM; + + g_oss->pings->ping_handle = ping_construct(); + + if (g_oss->pings->ping_handle) + return 0; + + return -EINVAL; +} + +/* called periodically */ +int osysmon_ping_poll(struct value_node *parent) +{ + char buf[BUFLEN]; + struct value_node *vn_host; + int num_host = ping_iterator_count(g_oss->pings->ping_handle); + pingobj_iter_t *iter; + struct value_node *vn_ping = value_node_add(parent, "ping", NULL); + if (!vn_ping) + return -ENOMEM; + + for (iter = ping_iterator_get(g_oss->pings->ping_handle); iter; iter = ping_iterator_next(iter)) { + size_t len = BUFLEN; + int rc = ping_iterator_get_info(iter, PING_INFO_USERNAME, buf, &len); + if (rc) + return -EINVAL; + + vn_host = value_node_find_or_add(vn_ping, talloc_strdup(vn_ping, buf)); + if (!vn_host) + return -ENOMEM; + + len = BUFLEN; /* IP address is looked up on-call, even 40 bytes should be enough */ + rc = ping_iterator_get_info(iter, PING_INFO_ADDRESS, buf, &len); + if (rc) + return -EINVAL; + + value_node_add(vn_host, "IP", buf); + + add_drop(iter, vn_host); + + /* Parameters below might be absent from output depending on the host reachability: */ + add_latency(iter, vn_host); + add_ttl(iter, vn_host); + } + + if (num_host) + return ping_send(g_oss->pings->ping_handle); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:36:37 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:36:37 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 7 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 14:36:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:46:18 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:46:18 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c at 783 PS2, Line 783: if (strncmp(call->source, "+", 1) == 0) { Since you're comparing just a single character you can do it directly like: call->source[0] != '+' provided call->source is initialized. https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c at 785 PS2, Line 785: osmo_strlcpy(mncc.calling.number, call->source + 1, sizeof(mncc.calling.number)); Curious, so in case of international number format, the + sign is not actually transmitted - didn't know that. Do you recall spec. which describe this? -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 14:46:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:54:16 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:54:16 +0000 Subject: Change in osmo-ci[master]: ttcn3: block latest jobs while master is running In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12709 ) Change subject: ttcn3: block latest jobs while master is running ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 Gerrit-Change-Number: 12709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 28 Jan 2019 14:54:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:54:47 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:54:47 +0000 Subject: Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12708 ) Change subject: ttcn3-bsc-test-sccplite-latest: enable job ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 28 Jan 2019 14:54:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:56:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 14:56:13 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 14:56:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 14:57:05 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 14:57:05 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... Patch Set 1: This -M probably was here for a reason - to use particular path for MNCC socket. Do you have to change corresponding .cfg file as well to get the right path or it's already updated? -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 28 Jan 2019 14:57:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:00:08 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 15:00:08 +0000 Subject: Change in osmo-msc[master]: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12698 ) Change subject: libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12698/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12698/1//COMMIT_MSG at 8 PS1, Line 8: > not everyone might make the same guess Like me, for example :) I have no idea why it's being moved. -- To view, visit https://gerrit.osmocom.org/12698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I593675d9bf56eaef12afdaf596ee1337b9a44259 Gerrit-Change-Number: 12698 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 15:00:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:04:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:04:14 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... Patch Set 1: > This -M probably was here for a reason - to use particular path for MNCC socket. The -M argument works for osmo-msc, but osmo-sip-connector does not have such an argument: https://git.osmocom.org/osmo-sip-connector/tree/src/main.c?id=336add4990191011ec6b8f621593e24b2ad5e324#n98 > Do you have to change corresponding .cfg file as well to get the right path or it's already updated? osmo-sip-connector.cfg has the real socket path: https://git.osmocom.org/docker-playground/tree/osmo-sip-master/osmo-sip-connector.cfg#n3 https://git.osmocom.org/docker-playground/tree/osmo-sip-latest/osmo-sip-connector.cfg#n3 -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:04:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:05:26 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 28 Jan 2019 15:05:26 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 15:05:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:08:47 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 15:08:47 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:08:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:09:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 15:09:59 +0000 Subject: Change in osmo-sysmon[master]: Drop unused parameter In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter ...................................................................... Drop unused parameter value_node_add() ignores it's first argument - let's drop it to make code more compact. Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 --- M src/osysmon_ctrl.c M src/osysmon_file.c M src/osysmon_main.c M src/osysmon_rtnl.c M src/osysmon_sysinfo.c M src/value_node.c M src/value_node.h 7 files changed, 21 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c index 25c2b4c..4aa7a1d 100644 --- a/src/osysmon_ctrl.c +++ b/src/osysmon_ctrl.c @@ -266,7 +266,7 @@ static int ctrl_client_poll(struct ctrl_client *cc, struct value_node *parent) { struct ctrl_client_get_var *ccgv; - struct value_node *vn_clnt = value_node_add(parent, parent, cc->cfg.name, NULL); + struct value_node *vn_clnt = value_node_add(parent, cc->cfg.name, NULL); /* attempt to re-connect */ if (!cc->sch) @@ -288,7 +288,7 @@ return 0; } - value_node_add(vn_clnt, vn_clnt, ccgv->cfg.name, value); + value_node_add(vn_clnt, ccgv->cfg.name, value); free(value); /* no talloc, this is from sscanf() */ } return 0; diff --git a/src/osysmon_file.c b/src/osysmon_file.c index 3a228fa..1dec3db 100644 --- a/src/osysmon_file.c +++ b/src/osysmon_file.c @@ -82,19 +82,19 @@ f = fopen(of->cfg.path, "r"); if (!f) { - value_node_add(parent, parent, of->cfg.name, ""); + value_node_add(parent, of->cfg.name, ""); return; } s = fgets(buf, sizeof(buf), f); fclose(f); if (s == NULL) { - value_node_add(parent, parent, of->cfg.name, ""); + value_node_add(parent, of->cfg.name, ""); return; } buf[sizeof(buf)-1] = '\0'; while ((nl = strrchr(buf, '\n'))) *nl = '\0'; - value_node_add(parent, parent, of->cfg.name, buf); + value_node_add(parent, of->cfg.name, buf); } /*********************************************************************** @@ -153,7 +153,7 @@ struct value_node *vn_file; struct osysmon_file *of; - vn_file = value_node_add(parent, parent, "file", NULL); + vn_file = value_node_add(parent, "file", NULL); llist_for_each_entry(of, &g_oss->files, list) osysmon_file_read(of, vn_file); diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 486ee8f..82df61f 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -229,7 +229,7 @@ } while (1) { - struct value_node *root = value_node_add(g_oss, NULL, "root", NULL); + struct value_node *root = value_node_add(NULL, "root", NULL); osysmon_sysinfo_poll(root); osysmon_ctrl_poll(root); osysmon_rtnl_poll(root); diff --git a/src/osysmon_rtnl.c b/src/osysmon_rtnl.c index 94d8bf9..9fd4251 100644 --- a/src/osysmon_rtnl.c +++ b/src/osysmon_rtnl.c @@ -216,17 +216,17 @@ uint8_t *hwaddr = mnl_attr_get_payload(tb[IFLA_ADDRESS]); snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x", hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); - value_node_add(vn_if, vn_if, "hwaddr", buf); + value_node_add(vn_if, "hwaddr", buf); } if (ifm->ifi_flags & IFF_RUNNING) - value_node_add(vn_if, vn_if, "running", "true"); + value_node_add(vn_if, "running", "true"); else - value_node_add(vn_if, vn_if, "running", "false"); + value_node_add(vn_if, "running", "false"); if (ifm->ifi_flags & IFF_UP) - value_node_add(vn_if, vn_if, "up", "true"); + value_node_add(vn_if, "up", "true"); else - value_node_add(vn_if, vn_if, "up", "false"); + value_node_add(vn_if, "up", "false"); return MNL_CB_OK; } @@ -313,7 +313,7 @@ struct in_addr *addr = mnl_attr_get_payload(tb[IFA_ADDRESS]); char out[INET_ADDRSTRLEN+32]; snprintf(out, sizeof(out), "%s/%u", inet_ntoa(*addr), ifa->ifa_prefixlen); - value_node_add(vn_if, vn_if, "ip", out); + value_node_add(vn_if, "ip", out); } return MNL_CB_OK; @@ -404,7 +404,7 @@ if (!g_oss->rcs) g_oss->rcs = rtnl_init(NULL); - vn_net = value_node_add(parent, parent, "netdev", NULL); + vn_net = value_node_add(parent, "netdev", NULL); if (!g_oss->rcs) return -1; diff --git a/src/osysmon_sysinfo.c b/src/osysmon_sysinfo.c index 50616bc..85d9ee9 100644 --- a/src/osysmon_sysinfo.c +++ b/src/osysmon_sysinfo.c @@ -63,7 +63,7 @@ char buf[32]; int rc; - vn_sysinfo = value_node_add(parent, parent, "sysinfo", NULL); + vn_sysinfo = value_node_add(parent, "sysinfo", NULL); rc = sysinfo(&si); if (rc < 0) @@ -72,17 +72,17 @@ /* Load Factor 1/5/15min */ snprintf(buf, sizeof(buf), "%.2f/%.2f/%.2f", loadfac(si.loads[0]), loadfac(si.loads[1]), loadfac(si.loads[2])); - value_node_add(vn_sysinfo, vn_sysinfo, "load", buf); + value_node_add(vn_sysinfo, "load", buf); /* RAM information (total/free/sared) in megabytes */ snprintf(buf, sizeof(buf), "%lu/%lu/%lu", to_mbytes(si.totalram), to_mbytes(si.freeram), to_mbytes(si.sharedram)); - value_node_add(vn_sysinfo, vn_sysinfo, "ram", buf); + value_node_add(vn_sysinfo, "ram", buf); /* uptime in days/hours/minutes/seconds */ snprintf(buf, sizeof(buf), "%lud %02lu:%02lu:%02lu", to_days(si.uptime), to_hours(si.uptime), to_minutes(si.uptime), to_seconds(si.uptime)); - value_node_add(vn_sysinfo, vn_sysinfo, "uptime", buf); + value_node_add(vn_sysinfo, "uptime", buf); return 0; } diff --git a/src/value_node.c b/src/value_node.c index 38fb5c7..9143451 100644 --- a/src/value_node.c +++ b/src/value_node.c @@ -27,7 +27,7 @@ #include "value_node.h" -struct value_node *value_node_add(void *ctx, struct value_node *parent, +struct value_node *value_node_add(struct value_node *parent, const char *name, const char *value) { struct value_node *vn = talloc_zero(parent, struct value_node); @@ -67,7 +67,7 @@ struct value_node *vn; vn = value_node_find(parent, name); if (!vn) - vn = value_node_add(parent, parent, name, NULL); + vn = value_node_add(parent, name, NULL); return vn; } diff --git a/src/value_node.h b/src/value_node.h index b8183ba..84c3d7b 100644 --- a/src/value_node.h +++ b/src/value_node.h @@ -16,7 +16,7 @@ struct llist_head children; }; -struct value_node *value_node_add(void *ctx, struct value_node *parent, +struct value_node *value_node_add(struct value_node *parent, const char *name, const char *value); struct value_node *value_node_find(struct value_node *parent, const char *name); struct value_node *value_node_find_by_idx(struct value_node *parent, int idx); -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Jan 28 15:10:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 Jan 2019 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#384?= In-Reply-To: <349178701.77.1548601806700.JavaMail.jenkins@jenkins.osmocom.org> References: <349178701.77.1548601806700.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1898799632.98.1548688206847.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:21:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:21:56 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 5: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c File src/simple_ctrl.c: https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c at 40 PS4, Line 40: #define CTRL_ERR(cfg, fmt, args...) fprintf(stderr, "CTRL %s:%u error: " fmt, cfg->remote_host, cfg->remote_port, ##args) This line is longer than 120 characters, which is the max allowed length defined here: https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c at 103 PS4, Line 103: struct ctrl_cfg *cfg; Pau asked in your other path: > Do we really need a pointer allocated by talloc here? and an alloc function? just to have 2 strings and one int, all this seems overengineered to me. https://gerrit.osmocom.org/#/c/osmo-sysmon/+/12316/2/src/osysmon_ctrl.c at 41 Then you changed it to "struct ctrl_cfg cfg;". So shouldn't it be the same here for consistency? -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 28 Jan 2019 15:21:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:22:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:22:38 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 28 Jan 2019 15:22:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:28:49 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 28 Jan 2019 15:28:49 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:28:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 28 Jan 2019 15:30:08 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 15:30:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:31:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:31:06 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:31:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:34:58 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 28 Jan 2019 15:34:58 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 28 Jan 2019 15:34:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:36:06 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 28 Jan 2019 15:36:06 +0000 Subject: Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12708 ) Change subject: ttcn3-bsc-test-sccplite-latest: enable job ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 28 Jan 2019 15:36:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:36:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:36:47 +0000 Subject: Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12708 ) Change subject: ttcn3-bsc-test-sccplite-latest: enable job ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:36:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:36:54 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 28 Jan 2019 15:36:54 +0000 Subject: Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12708 ) Change subject: ttcn3-bsc-test-sccplite-latest: enable job ...................................................................... ttcn3-bsc-test-sccplite-latest: enable job This job does not get stuck anymore since the latest Osmocom release. Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc --- M jobs/ttcn3-testsuites.yml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Max: Looks good to me, but someone else must approve daniel: Looks good to me, approved osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ba0ce2a..cd7aaa9 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -36,8 +36,7 @@ - nplab-m3ua-test-latest - nplab-sua-test-latest - ttcn3-bsc-test-latest - - ttcn3-bsc-test-sccplite-latest: - disabled: true + - ttcn3-bsc-test-sccplite-latest - ttcn3-bts-test-latest - ttcn3-ggsn-test-latest - ttcn3-hlr-test-latest -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 15:38:33 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 28 Jan 2019 15:38:33 +0000 Subject: Change in osmo-ci[master]: ttcn3: block latest jobs while master is running In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12709 ) Change subject: ttcn3: block latest jobs while master is running ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 Gerrit-Change-Number: 12709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 28 Jan 2019 15:38:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:05:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 23:05:17 +0000 Subject: Change in osmo-sysmon[master]: Build shared source as conveniency library Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12711 Change subject: Build shared source as conveniency library ...................................................................... Build shared source as conveniency library The simple_ctrl.c is used by 2 independent binaries. Let's build it as a convenience libtool library [1] to make it easier to add further external dependencies in future. [1] https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 --- M .gitignore M src/Makefile.am 2 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/11/12711/1 diff --git a/.gitignore b/.gitignore index c89e9b0..e68f4e2 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ tests/testsuite.log writtenconfig/ +/src/libctrl.la diff --git a/src/Makefile.am b/src/Makefile.am index 412337b..ed0f3a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +LDADD = libctrl.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) AM_CPPFLAGS = \ $(all_includes) \ @@ -22,6 +22,10 @@ osmo-ctrl-client \ $(NULL) +noinst_LTLIBRARIES = libctrl.la +libctrl_la_SOURCES = simple_ctrl.c +libctrl_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ @@ -29,7 +33,6 @@ osmo_sysmon_SOURCES = \ value_node.c \ - simple_ctrl.c \ osysmon_ctrl.c \ osysmon_sysinfo.c \ osysmon_rtnl.c \ @@ -37,11 +40,6 @@ osysmon_main.c \ $(NULL) -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - noinst_HEADERS = \ osysmon.h \ simple_ctrl.h \ -- To view, visit https://gerrit.osmocom.org/12711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 Gerrit-Change-Number: 12711 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:06:10 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 28 Jan 2019 23:06:10 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... ctrl: separate config structure Moving configuration data from anonymous struct into shared header as a preparation for ctrl logging improvements in follow-up patches. Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Related: SYS#2655 --- M src/osysmon_ctrl.c M src/simple_ctrl.h 2 files changed, 11 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c index 4aa7a1d..c2d0725 100644 --- a/src/osysmon_ctrl.c +++ b/src/osysmon_ctrl.c @@ -38,14 +38,7 @@ struct ctrl_client { /* links to osysmon.ctrl_clients */ struct llist_head list; - struct { - /* name of this CTRL client */ - const char *name; - /* remote host/IP */ - const char *remote_host; - /* remote CTRL port */ - uint16_t remote_port; - } cfg; + struct ctrl_cfg cfg; struct simple_ctrl_handle *sch; /* list of ctrl_client_get_var objects */ struct llist_head get_vars; diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h index 81a759d..f35eab1 100644 --- a/src/simple_ctrl.h +++ b/src/simple_ctrl.h @@ -2,6 +2,16 @@ #include +/* a CTRL client config */ +struct ctrl_cfg { + /* name of this CTRL client */ + const char *name; + /* remote host/IP */ + const char *remote_host; + /* remote CTRL port */ + uint16_t remote_port; +}; + struct simple_ctrl_handle; struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport, -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:49:02 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 23:49:02 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c at 785 PS2, Line 785: osmo_strlcpy(mncc.calling.number, call->source + 1, sizeof(mncc.calling.number)); > Curious, so in case of international number format, the + sign is not actually transmitted - didn't [?] gsm 04.08 10.5.4.9? -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 23:49:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:01 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:01 +0000 Subject: Change in libosmocore[master]: build: add missing logging_vty_test.vty to EXTRA_DIST Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12712 Change subject: build: add missing logging_vty_test.vty to EXTRA_DIST ...................................................................... build: add missing logging_vty_test.vty to EXTRA_DIST It was introduced and forgotten to add to EXTRA_DIST in: "logging vty: add VTY transcript test" commit 3a9ff11e574fa7ee19b1062b2c90151dbf7f0e27 change-Id I948e832a33131f8eab98651d6010ceb0ccbc9a9c Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e --- M tests/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/12712/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 028abc2..a307886 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -246,6 +246,7 @@ gprs/gprs_test.ok kasumi/kasumi_test.ok \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ logging/logging_test.ok logging/logging_test.err \ + logging/logging_vty_test.vty \ fr/fr_test.ok loggingrb/logging_test.ok \ loggingrb/logging_test.err strrb/strrb_test.ok \ codec/codec_test.ok \ -- To view, visit https://gerrit.osmocom.org/12712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Gerrit-Change-Number: 12712 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:02 +0000 Subject: Change in libosmocore[master]: distcheck: enable external tests Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12713 Change subject: distcheck: enable external tests ...................................................................... distcheck: enable external tests It was recently discovered that logging_vty_test.vty was missing from EXTRA_DIST. To make sure we don't forget similar files in the future, add python tests to 'make distcheck', by means of DISTCHECK_CONFIGURE_FLAGS. Related: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af --- M contrib/jenkins_amd64.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/12713/1 diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh index cd7b666..9b83793 100755 --- a/contrib/jenkins_amd64.sh +++ b/contrib/jenkins_amd64.sh @@ -28,7 +28,8 @@ # do distcheck only once, which is fine from built source tree, since distcheck # is well separated from the source tree state. -$MAKE distcheck \ +DISTCHECK_CONFIGURE_FLAGS=--enable-external-tests \ + $MAKE distcheck \ || cat-testlogs.sh osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:02 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12714 Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... logging sanity: initialize osmo_log_info = NULL logging.c assert_loginfo() wants to make sure that an osmo_log_info was set by asserting non-NULL. Hence we should make sure it is initialized as NULL in the first place. Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e --- M src/logging.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/12714/1 diff --git a/src/logging.c b/src/logging.c index 2bb53ae..b8a84da 100644 --- a/src/logging.c +++ b/src/logging.c @@ -57,7 +57,7 @@ osmo_static_assert(_LOG_FLT_COUNT <= 8*sizeof(((struct log_target*)NULL)->filter_map), enum_logging_filters_fit_in_log_target_filter_map); -struct log_info *osmo_log_info; +struct log_info *osmo_log_info = NULL; static struct log_context log_context; void *tall_log_ctx = NULL; -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:02 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12715 Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout ...................................................................... osmo_fsm_inst_state_chg(): set T also for zero timeout Before this patch, if timeout_secs == 0 was passed to osmo_fsm_inst_state_chg(), the previous T value remained set in the osmo_fsm_inst->T. For example: osmo_fsm_inst_state_chg(fi, ST_X, 23, 42); // timer == 23 seconds; fi->T == 42 osmo_fsm_inst_state_chg(fi, ST_Y, 0, 0); // no timer; fi->T == 42! Instead, always set to the T value passed to osmo_fsm_inst_state_chg(). Adjust osmo_fsm_inst_state_chg() API doc; need to rephrase to accurately describe the otherwise unchanged behaviour independently from T. Verify in fsm_test.c. Rationale: it is confusing to have a T number remaining from some past state, especially since the user explicitly passed a T number to osmo_fsm_inst_state_chg(). (Usually we are passing timeout_secs=0, T=0). I first thought this behavior was introduced with osmo_fsm_inst_state_chg_keep_timer(), but in fact osmo_fsm_inst_state_chg() behaved this way from the start. This shows up in the C test for the upcoming tdef API, where the test result printout was showing some past T value sticking around after FSM state transitions. After this patch, there will be no such confusion. Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c --- M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err M tests/fsm/fsm_test.ok 4 files changed, 71 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/12715/1 diff --git a/src/fsm.c b/src/fsm.c index 1f6141f..ae7c0f5 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -458,9 +458,10 @@ fi->state = new_state; st = &fsm->states[new_state]; - if (!keep_timer && timeout_secs) { + if (!keep_timer) { fi->T = T; - osmo_timer_schedule(&fi->timer, timeout_secs, 0); + if (timeout_secs) + osmo_timer_schedule(&fi->timer, timeout_secs, 0); } /* Call 'onenter' last, user might terminate FSM from there */ @@ -480,11 +481,17 @@ * function. It verifies that the existing state actually permits a * transition to new_state. * - * timeout_secs and T are optional parameters, and only have any effect - * if timeout_secs is not 0. If the timeout function is used, then the - * new_state is entered, and the FSM instances timer is set to expire - * in timeout_secs functions. At that time, the FSM's timer_cb - * function will be called for handling of the timeout by the user. + * If timeout_secs is 0, stay in the new state indefinitely, without a timeout + * (stop the FSM instance's timer if it was runnning). + * + * If timeout_secs > 0, start or reset the FSM instance's timer with this + * timeout. On expiry, invoke the FSM instance's timer_cb -- if no timer_cb is + * set, an expired timer immediately terminates the FSM instance with + * OSMO_FSM_TERM_TIMEOUT. + * + * The value of T is stored in fi->T and is then available for query in + * timer_cb. If passing timeout_secs == 0, it is recommended to also pass T == + * 0, so that fi->T is reset to 0 when no timeout is invoked. * * \param[in] fi FSM instance whose state is to change * \param[in] new_state The new state into which we should change diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 34a8399..7aac8d3 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -349,6 +349,43 @@ fprintf(stderr, "--- %s() done\n", __func__); } +static void test_state_chg_T() +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = NULL; + + /* Test setting to timeout_secs = 0, T = 0 */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 42); + osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 0); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 0); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + /* Test setting to timeout_secs = 0, T != 0 */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 42); + osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 11); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 11); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + static const struct log_info_cat default_categories[] = { [DMAIN] = { .name = "DMAIN", @@ -390,6 +427,7 @@ test_id_api(); test_state_chg_keep_timer(); + test_state_chg_T(); osmo_fsm_unregister(&fsm); exit(0); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 85606e2..bf474ab 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -101,3 +101,18 @@ Test_FSM{TWO}: Freeing instance Test_FSM{TWO}: Deallocated --- test_state_chg_keep_timer() done + +--- test_state_chg_T() +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_T() done diff --git a/tests/fsm/fsm_test.ok b/tests/fsm/fsm_test.ok index e69de29..c3536fb 100644 --- a/tests/fsm/fsm_test.ok +++ b/tests/fsm/fsm_test.ok @@ -0,0 +1,4 @@ +T = 42 +T = 0 +T = 42 +T = 11 -- To view, visit https://gerrit.osmocom.org/12715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c Gerrit-Change-Number: 12715 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:03 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12716 Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years During testing of the upcoming tdef API, it became apparent that passing very large timeout values to osmo_fsm_inst_state_chg() wraps back in the number range, and might actually result in effectively very short timeouts instead. Since time_t's range is not well defined across platforms, use a reasonable maximum value of signed 64 bit integer. Hence this will be safe at least on systems with an int64_t for struct timeval.tv_sec and larger. Clamp the osmo_fsm_inst_state_chg() timeout_secs argument to a maximum of 0x7fffffff, which amounts to just above 68 years: float(0x7fffffff) / (60. * 60 * 24 * 365.25) = 68.04965038532715 (In upcoming patch Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5, this can be verified to work by invoking tdef_test manually with a cmdline argument passed to enable the range check.) Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a --- M src/fsm.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/12716/1 diff --git a/src/fsm.c b/src/fsm.c index ae7c0f5..33a5bbd 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -437,6 +437,11 @@ uint32_t old_state = fi->state; const struct osmo_fsm_state *st = &fsm->states[fi->state]; + /* Limit to 0x7fffffff seconds as explained by + * _osmo_fsm_inst_state_chg()'s API doc. */ + if (timeout_secs > 0x7fffffff) + timeout_secs = 0x7fffffff; + /* validate if new_state is a valid state */ if (!(st->out_state_mask & (1 << new_state))) { LOGPFSMLSRC(fi, LOGL_ERROR, file, line, @@ -493,9 +498,16 @@ * timer_cb. If passing timeout_secs == 0, it is recommended to also pass T == * 0, so that fi->T is reset to 0 when no timeout is invoked. * + * Range: since time_t's maximum value is not well defined in a cross platform + * way, clamp timeout_secs to the maximum of the signed 64bit range, or roughly + * 68 years (float(0x7fffffff) / (60. * 60 * 24 * 365.25) = 68.0497). Thus + * ensure that very large timeouts do not wrap around to become very small + * ones. Note though that this might still be unsafe on systems with a time_t + * range below 64 bits. + * * \param[in] fi FSM instance whose state is to change * \param[in] new_state The new state into which we should change - * \param[in] timeout_secs Timeout in seconds (if !=0) + * \param[in] timeout_secs Timeout in seconds (if !=0), maximum-clamped to 2147483647 seconds. * \param[in] T Timer number (if \ref timeout_secs != 0) * \param[in] file Calling source file (from osmo_fsm_inst_state_chg macro) * \param[in] line Calling source line (from osmo_fsm_inst_state_chg macro) -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:57:04 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:57:04 +0000 Subject: Change in libosmocore[master]: add osmo_tdef API, moved from osmo-bsc T_def Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12717 Change subject: add osmo_tdef API, moved from osmo-bsc T_def ...................................................................... add osmo_tdef API, moved from osmo-bsc T_def Move T_def from osmo-bsc to libosmocore as osmo_tdef. Adjust naming to be more consistent. Upgrade to first class API: add mising API doc, add both a C test and a VTY transcript test. >From osmo_fsm_inst_state_chg() API doc, cross reference to osmo_tdef API. The root reason for moving to libosmocore is that I want to use the mgw_endpoint_fsm in osmo-msc for inter-MSC handover, and hence want to move the FSM to libosmo-mgcp-client. This FSM uses the T_def from osmo-bsc. Though the mgw_endpoint_fsm's use of T_def is minimal, I intend to use the osmo_tdef API in osmo-msc (and probably elsewhere) as well. libosmocore is the most sensible place for this. osmo_tdef provides: - a list of Tnnnn (GSM) timers with description, unit and default value. - vty UI to allow users to configure non-default timeouts. - API to tie T timers to osmo_fsm states and set them on state transitions. - a few standard units (minute, second, millisecond) as well as a custom unit (which relies on the timer's human readable description to indicate the meaning of the value). - conversion for standard units: for example, some GSM timers are defined in minutes, while our FSM definitions need timeouts in seconds. Conversion is for convenience only and can be easily avoided via the custom unit. T_def was introduced during the recent osmo-bsc refactoring for inter-BSC handover, and has proven useful: - without osmo_tdef, each invocation of osmo_fsm_inst_state_chg() needs to be programmed with the right timeout value, for all code paths that invoke this state change. It is a likely source of errors to get one of them wrong. By defining a T timer exactly for an FSM state, the caller can merely invoke the state change and trust on the original state definition to apply the correct timeout. - it is helpful to have a standardized config file UI to provide user configurable timeouts, instead of inventing new VTY commands for each separate application of T timer numbers. Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 --- M include/Makefile.am A include/osmocom/core/tdef.h A include/osmocom/vty/tdef.h M src/Makefile.am M src/fsm.c A src/tdef.c M src/vty/Makefile.am A src/vty/tdef_vty.c M tests/Makefile.am A tests/tdef/tdef_test.c A tests/tdef/tdef_test.ok A tests/tdef/tdef_vty_test.c A tests/tdef/tdef_vty_test.vty M tests/testsuite.at 14 files changed, 1,494 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12717/1 diff --git a/include/Makefile.am b/include/Makefile.am index 25a6d75..ca1f8f0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -47,6 +47,7 @@ osmocom/core/statistics.h \ osmocom/core/strrb.h \ osmocom/core/talloc.h \ + osmocom/core/tdef.h \ osmocom/core/timer.h \ osmocom/core/timer_compat.h \ osmocom/core/utils.h \ @@ -154,6 +155,7 @@ osmocom/vty/vector.h \ osmocom/vty/vty.h \ osmocom/vty/ports.h \ + osmocom/vty/tdef.h \ osmocom/ctrl/control_vty.h endif diff --git a/include/osmocom/core/tdef.h b/include/osmocom/core/tdef.h new file mode 100644 index 0000000..701ce54 --- /dev/null +++ b/include/osmocom/core/tdef.h @@ -0,0 +1,113 @@ +/* API to define Tnnn timers globally, configure in VTY and use for FSM state changes. */ +#pragma once + +#include +#include + +struct osmo_fsm_inst; + +enum osmo_tdef_unit { + OSMO_TDEF_S = 0, /*< most T are in seconds, keep 0 as default. */ + OSMO_TDEF_MS, /*< milliseconds */ + OSMO_TDEF_M, /*< minutes */ + OSMO_TDEF_CUSTOM, +}; + +extern const struct value_string osmo_tdef_unit_names[]; +static inline const char *osmo_tdef_unit_name(enum osmo_tdef_unit val) +{ return get_value_string(osmo_tdef_unit_names, val); } + +/*! Define a GSM timer of the form Tnnn, with unit, default value and doc string. + * Typically used as an array with the last entry being left zero-initialized, e.g.: + * + * struct osmo_tdef tdefs[] = { + * { .T=10, .default_val=6, .desc="RR Assignment" }, + * { .T=101, .default_val=10, .desc="inter-BSC Handover MT, HO Request to HO Accept" }, + * { .T=3101, .default_val=3, .desc="RR Immediate Assignment" }, + * {} + * }; + * + * Program initialization should call osmo_tdefs_reset() so that all timers return the default_val, until e.g. the VTY + * configuration sets user-defined values (see osmo_tdef_vty_init()). See also the examples at osmo_tdef_get(). + */ +struct osmo_tdef { + /*! T1234 number; type corresponds to struct osmo_fsm_inst.T. */ + const int T; + /*! Timeout duration (according to unit), default value; type corresponds to osmo_fsm_inst_state_chg()'s + * timeout_secs argument. Note that osmo_fsm_inst_state_chg() clamps the range to 0x7fffffff. */ + const unsigned long default_val; + const enum osmo_tdef_unit unit; + const char *desc; + /*! Currently active timeout value, e.g. set by user config. This is the only mutable member: a user may + * configure the timeout value, but neither unit nor any other field. */ + unsigned long val; +}; + +/*! Iterate an array of struct osmo_tdef, the last item should be fully zero, i.e. "{}". + * \param[inout] t A struct osmo_tdef *t used for interation, points at the current entry. + * \param[in] tdefs Array of struct osmo_tdef to iterate. + */ +#define osmo_tdef_for_each(t, tdefs) \ + for (t = tdefs; t && (t->T || t->default_val || t->desc); t++) + +void osmo_tdefs_reset(struct osmo_tdef *tdefs); +unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, + unsigned long val_if_not_present); +struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T); + +/*! Using osmo_tdef for osmo_fsm_inst: array entry for a mapping of state numbers to timeout definitions. + * For a usage example, see osmo_tdef_get_state_timeout(). */ +struct osmo_tdef_state_timeout { + /*! Timer number to match struct osmo_tdef.T, and to pass to osmo_fsm_inst_state_chg(). */ + int T; + /*! If true, call osmo_fsm_inst_state_chg_keep_timer(). + * If T == 0, keep previous T number, otherwise also set fi->T. */ + bool keep_timer; +}; + +const struct osmo_tdef_state_timeout *osmo_tdef_get_state_timeout(uint32_t state, + const struct osmo_tdef_state_timeout *timeouts_array); + +/*! Call osmo_fsm_inst_state_chg() or osmo_fsm_inst_state_chg_keep_timer(), depending on the timeouts_array, tdefs and + * default_timeout. + * + * A T timer configured in sub-second precision is rounded up to the next full second. A timer in unit = + * OSMO_TDEF_CUSTOM is applied as if the unit is in seconds (i.e. this macro does not make sense for custom units!). + * + * See osmo_tdef_get_state_timeout() and osmo_tdef_get(). + * + * If no T timer is defined for the given state, invoke the state change without a timeout. + * + * Should a T number be defined in timeouts_array that is not defined in tdefs, use default_timeout (in seconds). If + * default_timeout is negative, a missing T definition in tdefs instead causes a program abort. + * + * This is best used by wrapping this function call in a macro suitable for a specific FSM implementation, which can + * become as short as: my_fsm_state_chg(fi, NEXT_STATE): + * + * #define my_fsm_state_chg(fi, NEXT_STATE) \ + * osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, my_fsm_timeouts, global_T_defs, 5) + * + * my_fsm_state_chg(fi, MY_FSM_STATE_1); + * // -> No timeout configured, will enter state without timeout. + * + * my_fsm_state_chg(fi, MY_FSM_STATE_3); + * // T423 configured for this state, will look up T423 in tdefs, or use 5 seconds if unset. + * + * my_fsm_state_chg(fi, MY_FSM_STATE_8); + * // keep_timer == true for this state, will invoke osmo_fsm_inst_state_chg_keep_timer(). + * + * \param[inout] fi osmo_fsm_inst to transition to another state. + * \param[in] state State number to transition to. + * \param[in] timeouts_array Array of struct osmo_tdef_state_timeout[32] to look up state in. + * \param[in] tdefs Array of struct osmo_tdef (last entry zero initialized) to look up T in. + * \param[in] default_timeout If a T is set in timeouts_array, but no timeout value is configured for T, then use this + * default timeout value as fallback, or pass -1 to abort the program. + * \return Return value from osmo_fsm_inst_state_chg() or osmo_fsm_inst_state_chg_keep_timer(). + */ +#define osmo_tdef_fsm_inst_state_chg(fi, state, timeouts_array, tdefs, default_timeout) \ + _osmo_tdef_fsm_inst_state_chg(fi, state, timeouts_array, tdefs, default_timeout, \ + __FILE__, __LINE__) +int _osmo_tdef_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t state, + const struct osmo_tdef_state_timeout *timeouts_array, + const struct osmo_tdef *tdefs, unsigned long default_timeout, + const char *file, int line); diff --git a/include/osmocom/vty/tdef.h b/include/osmocom/vty/tdef.h new file mode 100644 index 0000000..7f7b338 --- /dev/null +++ b/include/osmocom/vty/tdef.h @@ -0,0 +1,11 @@ +/* API to define Tnnn timers globally, configure in VTY and use for FSM state changes. */ +#pragma once + +#include + +struct vty; +struct osmo_tdef; + +void osmo_tdef_vty_init(struct osmo_tdef *tdefs, int cfg_parent_node); +void osmo_tdef_vty_write(struct vty *vty, const char *indent); +struct osmo_tdef *osmo_tdef_vty_parse_T_arg(struct vty *vty, const char *osmo_tdef_str); diff --git a/src/Makefile.am b/src/Makefile.am index 6840f79..27ab702 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,8 @@ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ - isdnhdlc.c + isdnhdlc.c \ + tdef.c if HAVE_SSSE3 libosmocore_la_SOURCES += conv_acc_sse.c diff --git a/src/fsm.c b/src/fsm.c index 33a5bbd..e4e2711 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -498,6 +498,10 @@ * timer_cb. If passing timeout_secs == 0, it is recommended to also pass T == * 0, so that fi->T is reset to 0 when no timeout is invoked. * + * See also osmo_tdef_fsm_inst_state_chg() from the osmo_tdef API, which + * provides a unified way to configure and apply GSM style Tnnnn timers to FSM + * state transitions. + * * Range: since time_t's maximum value is not well defined in a cross platform * way, clamp timeout_secs to the maximum of the signed 64bit range, or roughly * 68 years (float(0x7fffffff) / (60. * 60 * 24 * 365.25) = 68.0497). Thus diff --git a/src/tdef.c b/src/tdef.c new file mode 100644 index 0000000..43f3893 --- /dev/null +++ b/src/tdef.c @@ -0,0 +1,220 @@ +/* Implementation to define Tnnn timers globally and use for FSM state changes. */ +/* (C) 2018-2019 by sysmocom - s.f.m.c. GmbH + * + * Author: Neels Hofmeyr + * + * 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 + +/* a = return_val * b. Return 0 if factor is below 1. */ +static unsigned long osmo_tdef_factor(enum osmo_tdef_unit a, enum osmo_tdef_unit b) +{ + if (b == a + || b == OSMO_TDEF_CUSTOM || a == OSMO_TDEF_CUSTOM) + return 1; + + switch (b) { + case OSMO_TDEF_MS: + switch (a) { + case OSMO_TDEF_S: + return 1000; + case OSMO_TDEF_M: + return 60*1000; + default: + return 0; + } + case OSMO_TDEF_S: + switch (a) { + case OSMO_TDEF_M: + return 60; + default: + return 0; + } + default: + return 0; + } +} + +static unsigned long osmo_tdef_round(unsigned long val, enum osmo_tdef_unit from_unit, enum osmo_tdef_unit to_unit) +{ + unsigned long f; + if (!val) + return 0; + + f = osmo_tdef_factor(from_unit, to_unit); + if (f == 1) + return val; + if (f < 1) { + f = osmo_tdef_factor(to_unit, from_unit); + return (val / f) + (val % f? 1 : 0); + } + /* range checking */ + if (f > (ULONG_MAX / val)) + return ULONG_MAX; + return val * f; +} + +/*! Set all osmo_tdef values to the default_val. + * It is convenient to define a tdefs array by setting only the default_val, and calling osmo_tdefs_reset() once for + * program startup. (See also osmo_tdef_vty_init()) + * \param[in] tdefs Array of timer definitions, last entry being fully zero. + */ +void osmo_tdefs_reset(struct osmo_tdef *tdefs) +{ + struct osmo_tdef *t; + osmo_tdef_for_each(t, tdefs) + t->val = t->default_val; +} + +/*! Return the value of a T timer from a list of osmo_tdef, in the given unit. + * If no such timer is defined, return the default value passed, or abort the program if default < 0. + * + * Round up any value match as_unit: 1100 ms as OSMO_TDEF_S becomes 2 seconds, as OSMO_TDEF_M becomes one minute. + * However, always return a value of zero as zero (0 ms as OSMO_TDEF_M still is 0 m). + * + * Range: even though the value range is unsigned long here, in practice, using ULONG_MAX as value for a timeout in + * seconds may actually wrap to negative or low timeout values (e.g. in struct timeval). It is recommended to stay below + * INT_MAX seconds. See also osmo_fsm_inst_state_chg(). + * + * Usage example: + * + * struct osmo_tdef global_T_defs[] = { + * { .T=7, .default_val=50, .desc="Water Boiling Timeout" }, // default is .unit=OSMO_TDEF_S == 0 + * { .T=8, .default_val=300, .desc="Tea brewing" }, + * { .T=9, .default_val=5, .unit=OSMO_TDEF_M, .desc="Let tea cool down before drinking" }, + * { .T=10, .default_val=20, .unit=OSMO_TDEF_M, .desc="Forgot to drink tea while it's warm" }, + * {} // <-- important! last entry shall be zero + * }; + * osmo_tdefs_reset(global_T_defs); // make all values the default + * osmo_tdef_vty_init(global_T_defs, CONFIG_NODE); + * + * val = osmo_tdef_get(global_T_defs, 7, OSMO_TDEF_S, -1); // -> 50 + * sleep(val); + * + * val = osmo_tdef_get(global_T_defs, 7, OSMO_TDEF_M, -1); // 50 seconds becomes 1 minute -> 1 + * sleep_minutes(val); + * + * val = osmo_tdef_get(global_T_defs, 99, OSMO_TDEF_S, 3); // not defined, returns 3 + * + * val = osmo_tdef_get(global_T_defs, 99, OSMO_TDEF_S, -1); // not defined, program aborts! + * + * \param[in] tdefs Array of timer definitions, last entry must be fully zero initialized. + * \param[in] T Timer number to get the value for. + * \param[in] as_unit Return timeout value in this unit. + * \param[in] val_if_not_present Fallback value to return if no timeout is defined. + * \return Timeout value in the unit given by as_unit, rounded up if necessary, or val_if_not_present. + */ +unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, unsigned long val_if_not_present) +{ + const struct osmo_tdef *t = osmo_tdef_get_entry((struct osmo_tdef*)tdefs, T); + if (!t) { + OSMO_ASSERT(val_if_not_present >= 0); + return val_if_not_present; + } + return osmo_tdef_round(t->val, t->unit, as_unit); +} + +/*! Find tdef entry matching T. + * This is useful for manipulation, which is usually limited to the VTY configuration. To retrieve a timeout value, + * most callers probably should use osmo_tdef_get() instead. + * \param[in] tdefs Array of timer definitions, last entry being fully zero. + * \param[in] T Timer number to get the entry for. + * \return osmo_tdef entry matching T in given array, or NULL if no match is found. + */ +struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T) +{ + struct osmo_tdef *t; + osmo_tdef_for_each(t, tdefs) { + if (t->T == T) + return t; + } + return NULL; +} + +/*! Using osmo_tdef for osmo_fsm_inst: find a given state's osmo_tdef_state_timeout entry. + * + * The timeouts_array shall contain exactly 32 elements, regardless whether only some of them are actually populated + * with nonzero values. 32 corresponds to the number of states allowed by the osmo_fsm_* API. Lookup is by array index. + * Not populated entries imply a state change invocation without timeout. + * + * For example: + * + * struct osmo_tdef_state_timeout my_fsm_timeouts[32] = { + * [MY_FSM_STATE_3] = { .T = 423 }, // look up timeout configured for T423 + * [MY_FSM_STATE_7] = { .T = 235 }, + * [MY_FSM_STATE_8] = { .keep_timer = true }, // keep previous state's T number, continue timeout. + * // any state that is omitted will remain zero == no timeout + * }; + * osmo_tdef_get_state_timeout(MY_FSM_STATE_0, &my_fsm_timeouts) -> NULL, + * osmo_tdef_get_state_timeout(MY_FSM_STATE_7, &my_fsm_timeouts) -> { .T = 235 } + * + * The intention is then to obtain the timer like osmo_tdef_get(global_T_defs, T=235); see also + * fsm_inst_state_chg_T() below. + * + * \param[in] state State constant to look up. + * \param[in] timeouts_array Array[32] of struct osmo_tdef_state_timeout defining which timer number to use per state. + * \return A struct osmo_tdef_state_timeout entry, or NULL if that entry is zero initialized. + */ +const struct osmo_tdef_state_timeout *osmo_tdef_get_state_timeout(uint32_t state, const struct osmo_tdef_state_timeout *timeouts_array) +{ + const struct osmo_tdef_state_timeout *t; + OSMO_ASSERT(state < 32); + t = &timeouts_array[state]; + if (!t->keep_timer && !t->T) + return NULL; + return t; +} + +/*! See invocation macro osmo_tdef_fsm_inst_state_chg() instead. + * \param[in] file Source file name, like __FILE__. + * \param[in] line Source file line number, like __LINE__. + */ +int _osmo_tdef_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t state, + const struct osmo_tdef_state_timeout *timeouts_array, + const struct osmo_tdef *tdefs, unsigned long default_timeout, + const char *file, int line) +{ + const struct osmo_tdef_state_timeout *t = osmo_tdef_get_state_timeout(state, timeouts_array); + unsigned long val; + + /* No timeout defined for this state? */ + if (!t) + return _osmo_fsm_inst_state_chg(fi, state, 0, 0, file, line); + + if (t->keep_timer) { + int rc = _osmo_fsm_inst_state_chg_keep_timer(fi, state, file, line); + if (t->T && !rc) + fi->T = t->T; + return rc; + } + + val = osmo_tdef_get(tdefs, t->T, OSMO_TDEF_S, default_timeout); + return _osmo_fsm_inst_state_chg(fi, state, val, t->T, file, line); +} + +const struct value_string osmo_tdef_unit_names[] = { + { OSMO_TDEF_S, "s" }, + { OSMO_TDEF_MS, "ms" }, + { OSMO_TDEF_M, "m" }, + { OSMO_TDEF_CUSTOM, "custom-unit" }, + { 0, NULL } +}; diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 2e49498..cdde0fa 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -11,7 +11,8 @@ libosmovty_la_SOURCES = buffer.c command.c vty.c vector.c utils.c \ telnet_interface.c logging_vty.c stats_vty.c \ - fsm_vty.c talloc_ctx_vty.c + fsm_vty.c talloc_ctx_vty.c \ + tdef_vty.c libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) endif diff --git a/src/vty/tdef_vty.c b/src/vty/tdef_vty.c new file mode 100644 index 0000000..da0a198 --- /dev/null +++ b/src/vty/tdef_vty.c @@ -0,0 +1,138 @@ +/* Implementation to configure Tnnn timers in VTY */ +/* (C) 2018-2019 by sysmocom - s.f.m.c. GmbH + * + * Author: Neels Hofmeyr + * + * 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 + +/* Global singleton list used for the VTY configuration. See osmo_tdef_vty_init(). */ +static struct osmo_tdef *g_vty_tdefs = NULL; + +/*! Parse an argument like "T1234", "t1234" or "1234". + * \param[in] vty VTY context. + * \param[in] T_str Argument string. + * \return the corresponding osmo_tdef entry from the global tdefs list originally passed to osmo_tdef_vty_init(), + * or NULL if no such entry exists. + */ +struct osmo_tdef *osmo_tdef_vty_parse_T_arg(struct vty *vty, const char *T_str) +{ + int T; + struct osmo_tdef *t; + + if (T_str[0] == 't' || T_str[0] == 'T') + T_str++; + T = atoi(T_str); + + t = osmo_tdef_get_entry(g_vty_tdefs, T); + if (!t) + vty_out(vty, "No such timer: T%d%s", T, VTY_NEWLINE); + return t; +} + +static void vty_out_timer(struct vty *vty, struct osmo_tdef *t) +{ + OSMO_ASSERT(t); + vty_out(vty, "T%d = %lu %s\t%s (default: %lu %s)%s", + t->T, t->val, osmo_tdef_unit_name(t->unit), t->desc, t->default_val, osmo_tdef_unit_name(t->unit), + VTY_NEWLINE); +} + +/* Installed in the VTY on osmo_tdef_vty_init(). */ +DEFUN(cfg_timer, cfg_timer_cmd, + "timer TNNNN (default|<1-65535>)", + "Configure GSM Timers\n" + "T-number, optionally preceded by 't' or 'T'." + "See also 'show timer' for a list of available timers.\n" + "Set to default timer value\n" "Timer value\n") +{ + const char *val_str = argv[1]; + struct osmo_tdef *t; + + t = osmo_tdef_vty_parse_T_arg(vty, argv[0]); + if (!t) + return CMD_WARNING; + + if (!strcmp(val_str, "default")) + t->val = t->default_val; + else + t->val = atoi(val_str); + + vty_out_timer(vty, t); + return CMD_SUCCESS; +} + +/* Installed in the VTY on osmo_tdef_vty_init(). */ +DEFUN(show_timer, show_timer_cmd, + "show timer [TNNNN]", + SHOW_STR "GSM Timers\n" + "Specific timer to show, or all timers if omitted.\n") +{ + struct osmo_tdef *t; + + if (argc) { + t = osmo_tdef_vty_parse_T_arg(vty, argv[0]); + if (!t) + return CMD_WARNING; + vty_out_timer(vty, t); + return CMD_SUCCESS; + } + + osmo_tdef_for_each(t, g_vty_tdefs) + vty_out_timer(vty, t); + return CMD_SUCCESS; +} + +/*! Install GSM timer configuration commands in the VTY. This calls osmo_tdefs_reset(tdefs) to ensure that the timer + * values reflect the defaults on program startup. + * \param[in] tdefs Array of Tnnn definitions, terminated by a zero-initialized array member. This array is + * subsequently used for all VTY commands, hence only one osmo_tdef_vty_init() should be called per + * main() context. + * \param[in] cfg_parent_node VTY node number below which to add the "timer T123" commands. The "show timer" commands + * are added only on the VIEW_NODE and ENABLE_NODE, regardless. + */ +void osmo_tdef_vty_init(struct osmo_tdef *tdefs, int cfg_parent_node) +{ + g_vty_tdefs = tdefs; + + /* Make sure the timer values initially reflect exactly their defaults. */ + osmo_tdefs_reset(tdefs); + + install_element_ve(&show_timer_cmd); + install_element(cfg_parent_node, &cfg_timer_cmd); +} + +/*! Write current GSM timer configuration to the vty. Skip all entries that reflect their default value. + * \param[in] vty VTY context. + * \param[in] indent Indentation string to prepend to each VTY command printed on the vty. + */ +void osmo_tdef_vty_write(struct vty *vty, const char *indent) +{ + struct osmo_tdef *t; + osmo_tdef_for_each(t, g_vty_tdefs) { + if (t->val != t->default_val) + vty_out(vty, "%stimer T%d %lu%s", indent, t->T, t->val, VTY_NEWLINE); + } +} diff --git a/tests/Makefile.am b/tests/Makefile.am index a307886..2fde901 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ codec/codec_ecu_fr_test timer/clk_override_test \ oap/oap_client_test gsm29205/gsm29205_test \ logging/logging_vty_test \ + tdef/tdef_test tdef/tdef_vty_test \ $(NULL) if ENABLE_MSGFILE @@ -217,6 +218,12 @@ gsm23003_gsm23003_test_SOURCES = gsm23003/gsm23003_test.c gsm23003_gsm23003_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +tdef_tdef_test_SOURCES = tdef/tdef_test.c +tdef_tdef_test_LDADD = $(LDADD) + +tdef_tdef_vty_test_SOURCES = tdef/tdef_vty_test.c +tdef_tdef_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ @@ -278,7 +285,9 @@ sercomm/sercomm_test.ok prbs/prbs_test.ok \ gsm29205/gsm29205_test.ok gsm23003/gsm23003_test.ok \ timer/clk_override_test.ok \ - oap/oap_client_test.ok oap/oap_client_test.err + oap/oap_client_test.ok oap/oap_client_test.err \ + tdef/tdef_test.ok tdef/tdef_vty_test.vty \ + $(NULL) DISTCLEANFILES = atconfig atlocal conv/gsm0503_test_vectors.c BUILT_SOURCES = conv/gsm0503_test_vectors.c @@ -322,11 +331,22 @@ # To update the VTY script from current application behavior, # pass -u to osmo_verify_transcript_vty.py by doing: # make vty-test U=-u -vty-test: + +vty-test-logging: osmo_verify_transcript_vty.py -v \ -p 42042 \ -r "$(top_builddir)/tests/logging/logging_vty_test" \ $(U) $(srcdir)/logging/*.vty +vty-test-tdef: + osmo_verify_transcript_vty.py -v \ + -p 42042 \ + -r "$(top_builddir)/tests/tdef/tdef_vty_test" \ + $(U) $(srcdir)/tdef/*.vty + +vty-test: + $(MAKE) vty-test-logging + $(MAKE) vty-test-tdef + ctrl-test: echo "No CTRL tests exist currently" diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c new file mode 100644 index 0000000..263ebc3 --- /dev/null +++ b/tests/tdef/tdef_test.c @@ -0,0 +1,444 @@ +/* + * (C) 2019 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Author: Neels Hofmeyr + * + * 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 + +static void *ctx = NULL; + +static struct osmo_tdef tdefs[] = { + { .T=1, .default_val=100, .desc="100s" }, + { .T=2, .default_val=100, .unit=OSMO_TDEF_MS, .desc="100ms" }, + { .T=3, .default_val=100, .unit=OSMO_TDEF_M, .desc="100m" }, + { .T=4, .default_val=100, .unit=OSMO_TDEF_CUSTOM, .desc="100 potatoes" }, + + { .T=7, .default_val=50, .desc="Water Boiling Timeout" }, // default is .unit=OSMO_TDEF_S == 0 + { .T=8, .default_val=300, .desc="Tea brewing" }, + { .T=9, .default_val=5, .unit=OSMO_TDEF_M, .desc="Let tea cool down before drinking" }, + { .T=10, .default_val=20, .unit=OSMO_TDEF_M, .desc="Forgot to drink tea while it's warm" }, + + /* test conversions */ + { .T=1000, .default_val=2*1000, .unit=OSMO_TDEF_MS, .desc="two seconds from ms" }, + { .T=1001, .default_val=60*1000, .unit=OSMO_TDEF_MS, .desc="one minute from ms" }, + { .T=1002, .default_val=(ULONG_MAX/60), .unit=OSMO_TDEF_M, .desc="almost too many seconds" }, + { .T=1003, .default_val=ULONG_MAX, .unit=OSMO_TDEF_M, .desc="too many seconds" }, + { .T=1004, .default_val=1, .unit=OSMO_TDEF_MS, .desc="one ms" }, + { .T=1005, .default_val=0, .unit=OSMO_TDEF_MS, .desc="zero ms" }, + { .T=1006, .default_val=0, .unit=OSMO_TDEF_S, .desc="zero s" }, + { .T=1007, .default_val=0, .unit=OSMO_TDEF_M, .desc="zero m" }, + { .T=1008, .default_val=0, .unit=OSMO_TDEF_CUSTOM, .desc="zero" }, + + /* test range */ + { .T=INT_MAX, .default_val=ULONG_MAX, .unit=OSMO_TDEF_S, .desc="very large" }, + { .T=INT_MAX-1, .default_val=ULONG_MAX-1, .unit=OSMO_TDEF_S, .desc="very large" }, + { .T=INT_MAX-2, .default_val=LONG_MAX, .unit=OSMO_TDEF_S, .desc="very large" }, + { .T=INT_MAX-3, .default_val=ULONG_MAX, .unit=OSMO_TDEF_M, .desc="very large in minutes" }, + { .T=INT_MIN, .default_val=ULONG_MAX, .unit=OSMO_TDEF_S, .desc="negative" }, + + { .T=0, .default_val=1, .unit=OSMO_TDEF_CUSTOM, .desc="zero" }, + + /* no desc */ + { .T=123, .default_val=1 }, + + {} // <-- important! last entry shall be zero +}; + +#define print_tdef_get(T, AS_UNIT) do { \ + unsigned long val = osmo_tdef_get(tdefs, T, AS_UNIT, 999); \ + printf("osmo_tdef_get(tdefs, %d, %s, 999)\t= %lu\n", T, osmo_tdef_unit_name(AS_UNIT), val); \ + } while (0) + +#define print_tdef_get_short(T, AS_UNIT) do { \ + unsigned long val = osmo_tdef_get(tdefs, T, AS_UNIT, 999); \ + printf("osmo_tdef_get(%d, %s)\t= %lu\n", T, osmo_tdef_unit_name(AS_UNIT), val); \ + } while (0) + +void print_tdef_info(unsigned int T) +{ + const struct osmo_tdef *t = osmo_tdef_get_entry(tdefs, T); + if (!t) { + printf("T%d=NULL", T); + return; + } + printf("T%d=%lu%s", T, t->val, osmo_tdef_unit_name(t->unit)); + if (t->val != t->default_val) + printf("(def=%lu)", t->default_val); + printf("\n"); +} + +static void test_tdef_get() +{ + int i; + enum osmo_tdef_unit as_unit; + + printf("\n%s()\n", __func__); + + osmo_tdefs_reset(tdefs); // make all values the default + + for (i = 0; i < ARRAY_SIZE(tdefs)-1; i++) { + unsigned int T = tdefs[i].T; + print_tdef_info(T); + for (as_unit = OSMO_TDEF_S; as_unit <= OSMO_TDEF_CUSTOM; as_unit++) { + print_tdef_get_short(T, as_unit); + } + } +} + +static void test_tdef_get_nonexisting() +{ + printf("\n%s()\n", __func__); + + print_tdef_get(5, OSMO_TDEF_S); + print_tdef_get(5, OSMO_TDEF_MS); + print_tdef_get(5, OSMO_TDEF_M); + print_tdef_get(5, OSMO_TDEF_CUSTOM); +} + +static void test_tdef_set_and_get() +{ + struct osmo_tdef *t; + printf("\n%s()\n", __func__); + + t = osmo_tdef_get_entry(tdefs, 7); + printf("setting 7 = 42\n"); + t->val = 42; + print_tdef_info(7); + print_tdef_get_short(7, OSMO_TDEF_MS); + print_tdef_get_short(7, OSMO_TDEF_S); + print_tdef_get_short(7, OSMO_TDEF_M); + print_tdef_get_short(7, OSMO_TDEF_CUSTOM); + + printf("setting 7 = 420\n"); + t->val = 420; + print_tdef_info(7); + print_tdef_get_short(7, OSMO_TDEF_MS); + print_tdef_get_short(7, OSMO_TDEF_S); + print_tdef_get_short(7, OSMO_TDEF_M); + print_tdef_get_short(7, OSMO_TDEF_CUSTOM); + + printf("resetting\n"); + osmo_tdefs_reset(tdefs); + print_tdef_info(7); + print_tdef_get_short(7, OSMO_TDEF_S); +} + +enum test_tdef_fsm_states { + S_A = 0, + S_B, + S_C, + S_D, + S_G, + S_H, + S_I, + S_J, + S_K, + S_L, + S_M, + S_N, + S_O, + S_X, + S_Y, + S_Z, +}; + +static const struct osmo_tdef_state_timeout test_tdef_state_timeouts[32] = { + [S_A] = { .T = 1 }, + [S_B] = { .T = 2 }, + [S_C] = { .T = 3 }, + [S_D] = { .T = 4 }, + + [S_G] = { .T = 7 }, + [S_H] = { .T = 8 }, + [S_I] = { .T = 9 }, + [S_J] = { .T = 10 }, + + /* keep_timer: adopt whichever T was running before and continue the timeout. */ + [S_K] = { .keep_timer = true }, + /* S_F defines an undefined T, but should continue previous state's timeout. */ + [S_L] = { .T = 123, .keep_timer = true }, + + /* range */ + [S_M] = { .T = INT_MAX }, + [S_N] = { .T = INT_MIN }, + + /* T0 is not addressable from osmo_tdef_state_timeout, since it is indistinguishable from an unset entry. Even + * though a timeout value is set for T=0, the transition to state S_O will show "no timer configured". */ + [S_O] = { .T = 0 }, + + /* S_X undefined on purpose */ + /* S_Y defines a T that does not exist */ + [S_Y] = { .T = 666 }, + /* S_Z undefined on purpose */ +}; + +#define S(x) (1 << (x)) + +static const struct osmo_fsm_state test_tdef_fsm_states[] = { +#define DEF_STATE(NAME) \ + [S_##NAME] = { \ + .name = #NAME, \ + .out_state_mask = 0 \ + | S(S_A) \ + | S(S_B) \ + | S(S_C) \ + | S(S_D) \ + | S(S_G) \ + | S(S_H) \ + | S(S_I) \ + | S(S_J) \ + | S(S_K) \ + | S(S_L) \ + | S(S_M) \ + | S(S_N) \ + | S(S_O) \ + | S(S_X) \ + | S(S_Y) \ + | S(S_Z) \ + , \ + } + + DEF_STATE(A), + DEF_STATE(B), + DEF_STATE(C), + DEF_STATE(D), + + DEF_STATE(G), + DEF_STATE(H), + DEF_STATE(I), + DEF_STATE(J), + + DEF_STATE(K), + DEF_STATE(L), + + DEF_STATE(M), + DEF_STATE(N), + DEF_STATE(O), + + DEF_STATE(X), + DEF_STATE(Y), + /* Z: test not being allowed to transition to other states. */ + [S_Z] = { + .name = "Z", + .out_state_mask = 0 + | S(S_A) + , + }, +}; + +static const struct value_string test_tdef_fsm_event_names[] = { {} }; + +static struct osmo_fsm test_tdef_fsm = { + .name = "tdef_test", + .states = test_tdef_fsm_states, + .event_names = test_tdef_fsm_event_names, + .num_states = ARRAY_SIZE(test_tdef_fsm_states), + .log_subsys = DLGLOBAL, +}; + +const struct timeval fake_time_start_time = { 123, 456 }; + +#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); \ + printf("Total time passed: %ld.%06ld s\n", diff.tv_sec, diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +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 print_fsm_state(struct osmo_fsm_inst *fi) +{ + struct timeval remaining; + printf("state=%s T=%d", osmo_fsm_inst_state_name(fi), fi->T); + + if (!osmo_timer_pending(&fi->timer)) { + printf(", no timeout\n"); + return; + } + + osmo_timer_remaining(&fi->timer, &osmo_gettimeofday_override_time, &remaining); + printf(", %lu.%06lu s remaining\n", remaining.tv_sec, remaining.tv_usec); +} + + +#define test_tdef_fsm_state_chg(NEXT_STATE) do { \ + const struct osmo_tdef_state_timeout *st = osmo_tdef_get_state_timeout(NEXT_STATE, \ + test_tdef_state_timeouts); \ + if (!st) { \ + printf(" --> %s (no timer configured for this state)\n", \ + osmo_fsm_state_name(&test_tdef_fsm, NEXT_STATE)); \ + } else { \ + struct osmo_tdef *t = osmo_tdef_get_entry(tdefs, st->T); \ + int rc = osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, test_tdef_state_timeouts, tdefs, 999); \ + printf(" --> %s (configured as T%d%s %lu %s) rc=%d;\t", osmo_fsm_state_name(&test_tdef_fsm, \ + NEXT_STATE), \ + st->T, st->keep_timer ? "(keep_timer)" : "", \ + t? t->val : -1, t? osmo_tdef_unit_name(t->unit) : "-", \ + rc); \ + print_fsm_state(fi); \ + } \ + } while(0) + + + +static void test_tdef_state_timeout(bool test_range) +{ + struct osmo_fsm_inst *fi; + struct osmo_tdef *m = osmo_tdef_get_entry(tdefs, INT_MAX); + unsigned long m_secs; + printf("\n%s()\n", __func__); + + osmo_tdefs_reset(tdefs); + + fake_time_start(); + + fi = osmo_fsm_inst_alloc(&test_tdef_fsm, ctx, NULL, LOGL_DEBUG, __func__); + OSMO_ASSERT(fi); + print_fsm_state(fi); + + test_tdef_fsm_state_chg(S_A); + test_tdef_fsm_state_chg(S_B); + test_tdef_fsm_state_chg(S_C); + test_tdef_fsm_state_chg(S_D); + + test_tdef_fsm_state_chg(S_G); + test_tdef_fsm_state_chg(S_H); + test_tdef_fsm_state_chg(S_I); + test_tdef_fsm_state_chg(S_J); + + printf("- test keep_timer:\n"); + fake_time_passes(123, 45678); + print_fsm_state(fi); + test_tdef_fsm_state_chg(S_K); + test_tdef_fsm_state_chg(S_A); + fake_time_passes(23, 45678); + print_fsm_state(fi); + test_tdef_fsm_state_chg(S_K); + + test_tdef_fsm_state_chg(S_A); + fake_time_passes(23, 45678); + print_fsm_state(fi); + test_tdef_fsm_state_chg(S_L); + + printf("- test large T:\n"); + test_tdef_fsm_state_chg(S_M); + + printf("- test T<0:\n"); + test_tdef_fsm_state_chg(S_N); + + printf("- test T=0:\n"); + test_tdef_fsm_state_chg(S_O); + + printf("- test no timer:\n"); + test_tdef_fsm_state_chg(S_X); + + printf("- test undefined timer, using default_val arg of osmo_tdef_fsm_inst_state_chg(), here passed as 999:\n"); + test_tdef_fsm_state_chg(S_Y); + + /* the range of unsigned long is architecture dependent. This test can be invoked manually to see whether + * clamping the timeout values works, but the output will be of varying lengths depending on the system's + * unsigned long range, and would cause differences in expected output. */ + if (test_range) { + printf("- test range:\n"); + test_tdef_fsm_state_chg(S_M); + /* sweep through all the bits, shifting in 0xfffff.. from the right. */ + m_secs = 0; + do { + m_secs = (m_secs << 1) + 1; + switch (m_secs) { + case 0x7fff: + printf("--- int32_t max ---\n"); + break; + case 0xffff: + printf("--- uint32_t max ---\n"); + break; + case 0x7fffffff: + printf("--- int64_t max ---\n"); + break; + case 0xffffffff: + printf("--- uint64_t max ---\n"); + break; + default: + break; + } + + m->val = m_secs - 1; + test_tdef_fsm_state_chg(S_M); + m->val = m_secs; + test_tdef_fsm_state_chg(S_M); + m->val = m_secs + 1; + test_tdef_fsm_state_chg(S_M); + } while (m_secs < ULONG_MAX); + } + + printf("- test disallowed transition:\n"); + test_tdef_fsm_state_chg(S_Z); + test_tdef_fsm_state_chg(S_B); + test_tdef_fsm_state_chg(S_C); + test_tdef_fsm_state_chg(S_D); +} + +int main(int argc, char **argv) +{ + ctx = talloc_named_const(NULL, 0, "tdef_test.c"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + osmo_fsm_register(&test_tdef_fsm); + + test_tdef_get(); + test_tdef_get_nonexisting(); + test_tdef_set_and_get(); + /* Run range test iff any argument is passed on the cmdline. For the rationale, see the comment in + * test_tdef_state_timeout(). */ + test_tdef_state_timeout(argc > 1); + + return EXIT_SUCCESS; +} diff --git a/tests/tdef/tdef_test.ok b/tests/tdef/tdef_test.ok new file mode 100644 index 0000000..cf4b77f --- /dev/null +++ b/tests/tdef/tdef_test.ok @@ -0,0 +1,184 @@ + +test_tdef_get() +T1=100s +osmo_tdef_get(1, s) = 100 +osmo_tdef_get(1, ms) = 100000 +osmo_tdef_get(1, m) = 2 +osmo_tdef_get(1, custom-unit) = 100 +T2=100ms +osmo_tdef_get(2, s) = 1 +osmo_tdef_get(2, ms) = 100 +osmo_tdef_get(2, m) = 1 +osmo_tdef_get(2, custom-unit) = 100 +T3=100m +osmo_tdef_get(3, s) = 6000 +osmo_tdef_get(3, ms) = 6000000 +osmo_tdef_get(3, m) = 100 +osmo_tdef_get(3, custom-unit) = 100 +T4=100custom-unit +osmo_tdef_get(4, s) = 100 +osmo_tdef_get(4, ms) = 100 +osmo_tdef_get(4, m) = 100 +osmo_tdef_get(4, custom-unit) = 100 +T7=50s +osmo_tdef_get(7, s) = 50 +osmo_tdef_get(7, ms) = 50000 +osmo_tdef_get(7, m) = 1 +osmo_tdef_get(7, custom-unit) = 50 +T8=300s +osmo_tdef_get(8, s) = 300 +osmo_tdef_get(8, ms) = 300000 +osmo_tdef_get(8, m) = 5 +osmo_tdef_get(8, custom-unit) = 300 +T9=5m +osmo_tdef_get(9, s) = 300 +osmo_tdef_get(9, ms) = 300000 +osmo_tdef_get(9, m) = 5 +osmo_tdef_get(9, custom-unit) = 5 +T10=20m +osmo_tdef_get(10, s) = 1200 +osmo_tdef_get(10, ms) = 1200000 +osmo_tdef_get(10, m) = 20 +osmo_tdef_get(10, custom-unit) = 20 +T1000=2000ms +osmo_tdef_get(1000, s) = 2 +osmo_tdef_get(1000, ms) = 2000 +osmo_tdef_get(1000, m) = 1 +osmo_tdef_get(1000, custom-unit) = 2000 +T1001=60000ms +osmo_tdef_get(1001, s) = 60 +osmo_tdef_get(1001, ms) = 60000 +osmo_tdef_get(1001, m) = 1 +osmo_tdef_get(1001, custom-unit) = 60000 +T1002=307445734561825860m +osmo_tdef_get(1002, s) = 18446744073709551600 +osmo_tdef_get(1002, ms) = 18446744073709551615 +osmo_tdef_get(1002, m) = 307445734561825860 +osmo_tdef_get(1002, custom-unit) = 307445734561825860 +T1003=18446744073709551615m +osmo_tdef_get(1003, s) = 18446744073709551615 +osmo_tdef_get(1003, ms) = 18446744073709551615 +osmo_tdef_get(1003, m) = 18446744073709551615 +osmo_tdef_get(1003, custom-unit) = 18446744073709551615 +T1004=1ms +osmo_tdef_get(1004, s) = 1 +osmo_tdef_get(1004, ms) = 1 +osmo_tdef_get(1004, m) = 1 +osmo_tdef_get(1004, custom-unit) = 1 +T1005=0ms +osmo_tdef_get(1005, s) = 0 +osmo_tdef_get(1005, ms) = 0 +osmo_tdef_get(1005, m) = 0 +osmo_tdef_get(1005, custom-unit) = 0 +T1006=0s +osmo_tdef_get(1006, s) = 0 +osmo_tdef_get(1006, ms) = 0 +osmo_tdef_get(1006, m) = 0 +osmo_tdef_get(1006, custom-unit) = 0 +T1007=0m +osmo_tdef_get(1007, s) = 0 +osmo_tdef_get(1007, ms) = 0 +osmo_tdef_get(1007, m) = 0 +osmo_tdef_get(1007, custom-unit) = 0 +T1008=0custom-unit +osmo_tdef_get(1008, s) = 0 +osmo_tdef_get(1008, ms) = 0 +osmo_tdef_get(1008, m) = 0 +osmo_tdef_get(1008, custom-unit) = 0 +T2147483647=18446744073709551615s +osmo_tdef_get(2147483647, s) = 18446744073709551615 +osmo_tdef_get(2147483647, ms) = 18446744073709551615 +osmo_tdef_get(2147483647, m) = 307445734561825861 +osmo_tdef_get(2147483647, custom-unit) = 18446744073709551615 +T2147483646=18446744073709551614s +osmo_tdef_get(2147483646, s) = 18446744073709551614 +osmo_tdef_get(2147483646, ms) = 18446744073709551615 +osmo_tdef_get(2147483646, m) = 307445734561825861 +osmo_tdef_get(2147483646, custom-unit) = 18446744073709551614 +T2147483645=9223372036854775807s +osmo_tdef_get(2147483645, s) = 9223372036854775807 +osmo_tdef_get(2147483645, ms) = 18446744073709551615 +osmo_tdef_get(2147483645, m) = 153722867280912931 +osmo_tdef_get(2147483645, custom-unit) = 9223372036854775807 +T2147483644=18446744073709551615m +osmo_tdef_get(2147483644, s) = 18446744073709551615 +osmo_tdef_get(2147483644, ms) = 18446744073709551615 +osmo_tdef_get(2147483644, m) = 18446744073709551615 +osmo_tdef_get(2147483644, custom-unit) = 18446744073709551615 +T-2147483648=18446744073709551615s +osmo_tdef_get(-2147483648, s) = 18446744073709551615 +osmo_tdef_get(-2147483648, ms) = 18446744073709551615 +osmo_tdef_get(-2147483648, m) = 307445734561825861 +osmo_tdef_get(-2147483648, custom-unit) = 18446744073709551615 +T0=1custom-unit +osmo_tdef_get(0, s) = 1 +osmo_tdef_get(0, ms) = 1 +osmo_tdef_get(0, m) = 1 +osmo_tdef_get(0, custom-unit) = 1 +T123=1s +osmo_tdef_get(123, s) = 1 +osmo_tdef_get(123, ms) = 1000 +osmo_tdef_get(123, m) = 1 +osmo_tdef_get(123, custom-unit) = 1 + +test_tdef_get_nonexisting() +osmo_tdef_get(tdefs, 5, s, 999) = 999 +osmo_tdef_get(tdefs, 5, ms, 999) = 999 +osmo_tdef_get(tdefs, 5, m, 999) = 999 +osmo_tdef_get(tdefs, 5, custom-unit, 999) = 999 + +test_tdef_set_and_get() +setting 7 = 42 +T7=42s(def=50) +osmo_tdef_get(7, ms) = 42000 +osmo_tdef_get(7, s) = 42 +osmo_tdef_get(7, m) = 1 +osmo_tdef_get(7, custom-unit) = 42 +setting 7 = 420 +T7=420s(def=50) +osmo_tdef_get(7, ms) = 420000 +osmo_tdef_get(7, s) = 420 +osmo_tdef_get(7, m) = 7 +osmo_tdef_get(7, custom-unit) = 420 +resetting +T7=50s +osmo_tdef_get(7, s) = 50 + +test_tdef_state_timeout() +Total time passed: 0.000000 s +state=A T=0, no timeout + --> A (configured as T1 100 s) rc=0; state=A T=1, 100.000000 s remaining + --> B (configured as T2 100 ms) rc=0; state=B T=2, 1.000000 s remaining + --> C (configured as T3 100 m) rc=0; state=C T=3, 6000.000000 s remaining + --> D (configured as T4 100 custom-unit) rc=0; state=D T=4, 100.000000 s remaining + --> G (configured as T7 50 s) rc=0; state=G T=7, 50.000000 s remaining + --> H (configured as T8 300 s) rc=0; state=H T=8, 300.000000 s remaining + --> I (configured as T9 5 m) rc=0; state=I T=9, 300.000000 s remaining + --> J (configured as T10 20 m) rc=0; state=J T=10, 1200.000000 s remaining +- test keep_timer: +Total time passed: 123.045678 s +state=J T=10, 1076.954322 s remaining + --> K (configured as T0(keep_timer) 1 custom-unit) rc=0; state=K T=10, 1076.954322 s remaining + --> A (configured as T1 100 s) rc=0; state=A T=1, 100.000000 s remaining +Total time passed: 146.091356 s +state=A T=1, 76.954322 s remaining + --> K (configured as T0(keep_timer) 1 custom-unit) rc=0; state=K T=1, 76.954322 s remaining + --> A (configured as T1 100 s) rc=0; state=A T=1, 100.000000 s remaining +Total time passed: 169.137034 s +state=A T=1, 76.954322 s remaining + --> L (configured as T123(keep_timer) 1 s) rc=0; state=L T=123, 76.954322 s remaining +- test large T: + --> M (configured as T2147483647 18446744073709551615 s) rc=0; state=M T=2147483647, 2147483647.000000 s remaining +- test T<0: + --> N (configured as T-2147483648 18446744073709551615 s) rc=0; state=N T=-2147483648, 2147483647.000000 s remaining +- test T=0: + --> O (no timer configured for this state) +- test no timer: + --> X (no timer configured for this state) +- test undefined timer, using default_val arg of osmo_tdef_fsm_inst_state_chg(), here passed as 999: + --> Y (configured as T666 18446744073709551615 -) rc=0; state=Y T=666, 999.000000 s remaining +- test disallowed transition: + --> Z (no timer configured for this state) + --> B (configured as T2 100 ms) rc=0; state=B T=2, 1.000000 s remaining + --> C (configured as T3 100 m) rc=0; state=C T=3, 6000.000000 s remaining + --> D (configured as T4 100 custom-unit) rc=0; state=D T=4, 100.000000 s remaining diff --git a/tests/tdef/tdef_vty_test.c b/tests/tdef/tdef_vty_test.c new file mode 100644 index 0000000..6dd0a90 --- /dev/null +++ b/tests/tdef/tdef_vty_test.c @@ -0,0 +1,252 @@ +/* test program with a vty interface to test osmo_tdef behavior */ +/* + * (C) 2019 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * 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 "config.h" + +void *root_ctx = NULL; + +static void print_help() +{ + printf( "options:\n" + " -h --help this text\n" + " -d --debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)\n" + " -D --daemonize For the process into a background daemon\n" + " -c --config-file Specify the filename of the config file\n" + " -s --disable-color Don't use colors in stderr log output\n" + " -T --timestamp Prefix every log line with a timestamp\n" + " -V --version Print version information and exit\n" + " -e --log-level Set a global log-level\n" + ); +} + +static struct { + const char *config_file; + int daemonize; +} cmdline_config = {}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_idx = 0, c; + static const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "debug", 1, 0, 'd' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "disable-color", 0, 0, 's' }, + { "timestamp", 0, 0, 'T' }, + { "version", 0, 0, 'V' }, + { "log-level", 1, 0, 'e' }, + {} + }; + + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:", + long_options, &option_idx); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_config.daemonize = 1; + break; + case 'c': + cmdline_config.config_file = optarg; + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + } + } +} + +static int quit = 0; + +static void signal_handler(int signal) +{ + fprintf(stdout, "signal %u received\n", signal); + + switch (signal) { + case SIGINT: + case SIGTERM: + quit++; + break; + case SIGABRT: + osmo_generate_backtrace(); + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process */ + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(root_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static struct vty_app_info vty_info = { + .name = "tdef_vty_test", + .version = PACKAGE_VERSION, +}; + +static const struct log_info_cat default_categories[] = {}; + +const struct log_info log_info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +static struct osmo_tdef tdefs[] = { + { .T=1, .default_val=100, .desc="Testing a hundred seconds" }, + { .T=2, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Testing a hundred milliseconds" }, + { .T=3, .default_val=100, .unit=OSMO_TDEF_M, .desc="Testing a hundred minutes" }, + { .T=4, .default_val=100, .unit=OSMO_TDEF_CUSTOM, .desc="Testing a hundred potatoes" }, + + { .T=7, .default_val=50, .desc="Water Boiling Timeout" }, // default is .unit=OSMO_TDEF_S == 0 + { .T=8, .default_val=300, .desc="Tea brewing" }, + { .T=9, .default_val=5, .unit=OSMO_TDEF_M, .desc="Let tea cool down before drinking" }, + { .T=10, .default_val=20, .unit=OSMO_TDEF_M, .desc="Forgot to drink tea while it's warm" }, + { .T=INT_MAX, .default_val=ULONG_MAX, .unit=OSMO_TDEF_M, .desc="Very large" }, + { .T=-23, .default_val=-15, .desc="Negative T number" }, + {} // <-- important! last entry shall be zero +}; + +enum tdef_vty_node { + TDEF_NODE = _LAST_OSMOVTY_NODE + 1, +}; + +static struct cmd_node tdef_node = { + TDEF_NODE, + "%s(config-tdef)# ", + 1, +}; + +DEFUN(cfg_tdef, + cfg_tdef_cmd, + "tdef", "enter tdef test node") +{ + vty->node = TDEF_NODE; + return CMD_SUCCESS; +} + +static int config_write_tdef(struct vty *vty) +{ + vty_out(vty, "tdef%s", VTY_NEWLINE); + osmo_tdef_vty_write(vty, " "); + return CMD_SUCCESS; +} + +int main(int argc, char **argv) +{ + int rc; + + root_ctx = talloc_named_const(NULL, 0, "tdef_vty_test"); + + vty_info.tall_ctx = root_ctx; + vty_init(&vty_info); + + osmo_init_logging2(root_ctx, &log_info); + + install_element(CONFIG_NODE, &cfg_tdef_cmd); + install_node(&tdef_node, config_write_tdef); + osmo_tdef_vty_init(tdefs, TDEF_NODE); + + handle_options(argc, argv); + + osmo_talloc_vty_add_cmds(); + + if (cmdline_config.config_file) { + rc = vty_read_config_file(cmdline_config.config_file, NULL); + if (rc < 0) { + fprintf(stderr, "Failed to parse the config file: '%s'\n", cmdline_config.config_file); + return 1; + } + } + + rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + if (rc < 0) + return 2; + + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } + } + + while (!quit) { + log_reset_context(); + osmo_select_main(0); + } + + talloc_free(root_ctx); + talloc_free(tall_vty_ctx); + + return 0; +} diff --git a/tests/tdef/tdef_vty_test.vty b/tests/tdef/tdef_vty_test.vty new file mode 100644 index 0000000..d2a260d --- /dev/null +++ b/tests/tdef/tdef_vty_test.vty @@ -0,0 +1,94 @@ +tdef_vty_test> enable +tdef_vty_test# configure terminal + +tdef_vty_test(config)# tdef +tdef_vty_test(config-tdef)# show running-config +... !timer + +tdef_vty_test(config-tdef)# do show timer +T1 = 100 s Testing a hundred seconds (default: 100 s) +T2 = 100 ms Testing a hundred milliseconds (default: 100 ms) +T3 = 100 m Testing a hundred minutes (default: 100 m) +T4 = 100 (custom) Testing a hundred potatoes (default: 100 (custom)) +T7 = 50 s Water Boiling Timeout (default: 50 s) +T8 = 300 s Tea brewing (default: 300 s) +T9 = 5 m Let tea cool down before drinking (default: 5 m) +T10 = 20 m Forgot to drink tea while it's warm (default: 20 m) +T2147483647 = 18446744073709551615 m Very large (default: 18446744073709551615 m) +T-23 = 18446744073709551601 s Negative T number (default: 18446744073709551601 s) + +tdef_vty_test(config-tdef)# do show timer T7 +T7 = 50 s Water Boiling Timeout (default: 50 s) +tdef_vty_test(config-tdef)# do show timer 7 +T7 = 50 s Water Boiling Timeout (default: 50 s) +tdef_vty_test(config-tdef)# do show timer t7 +T7 = 50 s Water Boiling Timeout (default: 50 s) + +tdef_vty_test(config-tdef)# timer T10 5 +T10 = 5 m Forgot to drink tea while it's warm (default: 20 m) +tdef_vty_test(config-tdef)# do show timer 10 +T10 = 5 m Forgot to drink tea while it's warm (default: 20 m) + +tdef_vty_test(config-tdef)# timer t10 25 +T10 = 25 m Forgot to drink tea while it's warm (default: 20 m) +tdef_vty_test(config-tdef)# do show timer 10 +T10 = 25 m Forgot to drink tea while it's warm (default: 20 m) + +tdef_vty_test(config-tdef)# timer 10 55 +T10 = 55 m Forgot to drink tea while it's warm (default: 20 m) +tdef_vty_test(config-tdef)# do show timer 10 +T10 = 55 m Forgot to drink tea while it's warm (default: 20 m) + +tdef_vty_test(config-tdef)# do show timer T666 +No such timer: T666 +tdef_vty_test(config-tdef)# timer T666 5 +No such timer: T666 + +tdef_vty_test(config-tdef)# timer T-23 42 +T-23 = 42 s Negative T number (default: 18446744073709551601 s) +tdef_vty_test(config-tdef)# timer t-23 42 +T-23 = 42 s Negative T number (default: 18446744073709551601 s) +tdef_vty_test(config-tdef)# timer -23 42 +T-23 = 42 s Negative T number (default: 18446744073709551601 s) + +tdef_vty_test(config-tdef)# do show timer +T1 = 100 s Testing a hundred seconds (default: 100 s) +T2 = 100 ms Testing a hundred milliseconds (default: 100 ms) +T3 = 100 m Testing a hundred minutes (default: 100 m) +T4 = 100 (custom) Testing a hundred potatoes (default: 100 (custom)) +T7 = 50 s Water Boiling Timeout (default: 50 s) +T8 = 300 s Tea brewing (default: 300 s) +T9 = 5 m Let tea cool down before drinking (default: 5 m) +T10 = 55 m Forgot to drink tea while it's warm (default: 20 m) +T2147483647 = 18446744073709551615 m Very large (default: 18446744073709551615 m) +T-23 = 42 s Negative T number (default: 18446744073709551601 s) + +tdef_vty_test(config-tdef)# show running-config + +Current configuration: +! +! +line vty + no login +! +tdef + timer T10 55 + timer T-23 42 +end + +tdef_vty_test(config-tdef)# timer 10 default +T10 = 20 m Forgot to drink tea while it's warm (default: 20 m) +tdef_vty_test(config-tdef)# do show timer 10 +T10 = 20 m Forgot to drink tea while it's warm (default: 20 m) + +tdef_vty_test(config-tdef)# show running-config + +Current configuration: +! +! +line vty + no login +! +tdef + timer T-23 42 +end diff --git a/tests/testsuite.at b/tests/testsuite.at index 6aaaa78..0093403 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -325,3 +325,9 @@ cat $abs_srcdir/gsm23003/gsm23003_test.ok > expout AT_CHECK([$abs_top_builddir/tests/gsm23003/gsm23003_test], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([tdef]) +AT_KEYWORDS([tdef]) +cat $abs_srcdir/tdef/tdef_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/tdef/tdef_test], [0], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/12717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 Gerrit-Change-Number: 12717 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:58:12 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 Jan 2019 23:58:12 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/2/src/mncc.c at 783 PS2, Line 783: if (strncmp(call->source, "+", 1) == 0) { > Since you're comparing just a single character you can do it directly like: [?] I'm /pretty/ sure it is initialised, but I'm not 100% sure what that term means here, technically. If we actually got to exec'ing this code and call->source has no value, then something is horribly wrong anyway. -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 28 Jan 2019 23:58:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:58:53 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:58:53 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_match() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC or MSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 645 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 7c6f707..e1e345d 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -78,6 +78,9 @@ int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil); int gsm0808_cell_id_u_name(char *buf, size_t buflen, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); +bool gsm0808_cell_ids_match(const struct gsm0808_cell_id *id1, const struct gsm0808_cell_id *id2, bool exact_match); +int gsm0808_cell_id_matches_list(const struct gsm0808_cell_id *id, const struct gsm0808_cell_id_list2 *list, + unsigned int match_nr, bool exact_match); uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause); uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index b5c8dcd..b34a677 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -122,6 +122,8 @@ int osmo_mnc_cmp(uint16_t a_mnc, bool a_mnc_3_digits, uint16_t b_mnc, bool b_mnc_3_digits); int osmo_plmn_cmp(const struct osmo_plmn_id *a, const struct osmo_plmn_id *b); +int osmo_lai_cmp(const struct osmo_location_area_id *a, const struct osmo_location_area_id *b); +int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b); int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn); int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 9fcccae..54ec19c 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1391,6 +1391,151 @@ } } +/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. + * This is useful to supplement one CGI with information from more than one Cell Identifier, + * which in turn is useful to match Cell Identifiers of differing kinds to each other. + * Before first invocation, clear the *dst struct externally, this function does only write those members + * that are present in parameter u. + */ +static void cell_id_to_cgi(struct osmo_cell_global_id *dst, + enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) +{ + switch (discr) { + case CELL_IDENT_WHOLE_GLOBAL: + *dst = u->global; + return; + + case CELL_IDENT_LAC_AND_CI: + dst->lai.lac = u->lac_and_ci.lac; + dst->cell_identity = u->lac_and_ci.ci; + return; + + case CELL_IDENT_CI: + dst->cell_identity = u->ci; + return; + + case CELL_IDENT_LAI_AND_LAC: + dst->lai = u->lai_and_lac; + return; + + case CELL_IDENT_LAC: + dst->lai.lac = u->lac; + return; + + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + /* No values to set. */ + return; + } +} + +/*! Return true if the common information between the two Cell Identifiers match. + * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. + * Note that CELL_IDENT_NO_CELL will always return false. + * Also CELL_IDENT_BSS will always return false, since this function cannot possibly + * know the bounds of the BSS, so the caller must handle CELL_IDENT_BSS specially. + * \param[in] discr1 Cell Identifier type. + * \param[in] u1 Cell Identifier value. + * \param[in] discr2 Other Cell Identifier type. + * \param[in] u2 Other Cell Identifier value. + * \param[in] exact_match If true, return true only if the CELL_IDENT types and all values are identical. + * \returns True if the common fields of the above match. + */ +static bool gsm0808_cell_id_u_match(enum CELL_IDENT discr1, const union gsm0808_cell_id_u *u1, + enum CELL_IDENT discr2, const union gsm0808_cell_id_u *u2, + bool exact_match) +{ + struct osmo_cell_global_id a = {}; + struct osmo_cell_global_id b = {}; + + if (exact_match && discr1 != discr2) + return false; + + /* First handle the odd wildcard like CELL_IDENT kinds. We can't really match any of these. */ + switch (discr1) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + return discr1 == discr2; + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + return false; + default: + break; + } + switch (discr2) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + case CELL_IDENT_BSS: + return false; + default: + break; + } + + /* Enrich both sides to full CGI, then compare those. First set the *other* ID's values in case + * they assign more items. For example: + * u1 = LAC:42 + * u2 = LAC+CI:23+5 + * 1) a <- LAC+CI:23+5 + * 2) a <- LAC:42 so that a = LAC+CI:42+5 + * Now we can compare those two and find a mismatch. If the LAC were the same, we would get + * identical LAC+CI and hence a match. */ + + cell_id_to_cgi(&a, discr2, u2); + cell_id_to_cgi(&a, discr1, u1); + + cell_id_to_cgi(&b, discr1, u1); + cell_id_to_cgi(&b, discr2, u2); + + return osmo_cgi_cmp(&a, &b) == 0; +} + +/*! Return true if the common information between the two Cell Identifiers match. + * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. + * Note that CELL_IDENT_NO_CELL will always return false. + * Also CELL_IDENT_BSS will always return false, since this function cannot possibly + * know the bounds of the BSS, so the caller must handle CELL_IDENT_BSS specially. + * \param[in] id1 Cell Identifier. + * \param[in] id2 Other Cell Identifier. + * \param[in] exact_match If true, return true only if the CELL_IDENT types and all values are identical. + * \returns True if the common fields of the above match. + */ +bool gsm0808_cell_ids_match(const struct gsm0808_cell_id *id1, const struct gsm0808_cell_id *id2, bool exact_match) +{ + return gsm0808_cell_id_u_match(id1->id_discr, &id1->id, id2->id_discr, &id2->id, exact_match); +} + +/*! Find an index in a Cell Identifier list that matches a given single Cell Identifer. + * Compare \a id against each entry in \a list using gsm0808_cell_ids_match(), and return the list index + * if a match is found. \a match_nr allows iterating all matches in the list. A match_nr <= 0 returns the + * first match in the list, match_nr == 1 the second match, etc., and if match_nr exceeds the available + * matches in the list, -1 is returned. + * \param[in] id Cell Identifier to match. + * \param[in] list Cell Identifier list to search in. + * \param[in] match_nr Ignore this many matches. + * \param[in] exact_match If true, consider as match only if the CELL_IDENT types and all values are identical. + * \returns -1 if no match is found, list index if a match is found. + */ +int gsm0808_cell_id_matches_list(const struct gsm0808_cell_id *id, const struct gsm0808_cell_id_list2 *list, + unsigned int match_nr, bool exact_match) +{ + int i; + for (i = 0; i < list->id_list_len; i++) { + if (gsm0808_cell_id_u_match(id->id_discr, &id->id, list->id_discr, &list->id_list[i], exact_match)) { + if (match_nr) + match_nr--; + else + return i; + } + } + return -1; +} + /*! value_string[] for enum CELL_IDENT. */ const struct value_string gsm0808_cell_id_discr_names[] = { { CELL_IDENT_WHOLE_GLOBAL, "CGI" }, diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 1d9cefe..95fca91 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -324,6 +324,40 @@ return osmo_mnc_cmp(a->mnc, a->mnc_3_digits, b->mnc, b->mnc_3_digits); } +/* Compare two LAI. + * The order of comparison is MCC, MNC, LAC. See also osmo_plmn_cmp(). + * \param a[in] "Left" side LAI. + * \param b[in] "Right" side LAI. + * \returns 0 if the LAI are equal, -1 if a < b, 1 if a > b. */ +int osmo_lai_cmp(const struct osmo_location_area_id *a, const struct osmo_location_area_id *b) +{ + int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); + if (rc) + return rc; + if (a->lac < b->lac) + return -1; + if (a->lac > b->lac) + return 1; + return 0; +} + +/* Compare two CGI. + * The order of comparison is MCC, MNC, LAC, CI. See also osmo_lai_cmp(). + * \param a[in] "Left" side CGI. + * \param b[in] "Right" side CGI. + * \returns 0 if the CGI are equal, -1 if a < b, 1 if a > b. */ +int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b) +{ + int rc = osmo_lai_cmp(&a->lai, &b->lai); + if (rc) + return rc; + if (a->cell_identity < b->cell_identity) + return -1; + if (a->cell_identity > b->cell_identity) + return 1; + return 0; +} + /*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form) * \param out[out] caller-provided output buffer, at least 33 bytes long * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC) diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index c440a79..ea8c9be 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -210,6 +210,8 @@ gsm0808_cell_id_list_name_buf; gsm0808_cell_id_discr_names; gsm0808_cell_id_u_name; +gsm0808_cell_ids_match; +gsm0808_cell_id_matches_list; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_sc_cfg_from_gsm48_mr_cfg; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 90bef21..f06e8b7 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1937,6 +1937,275 @@ (GSM0808_SC_CFG_DEFAULT_AMR_7_95 | GSM0808_SC_CFG_DEFAULT_AMR_12_2); } +struct test_cell_id_matching_data { + struct gsm0808_cell_id id; + struct gsm0808_cell_id match_id; + bool expect_match; + bool expect_exact_match; +}; + +#define lac_23 { .id_discr = CELL_IDENT_LAC, .id.lac = 23, } +#define lac_42 { .id_discr = CELL_IDENT_LAC, .id.lac = 42, } +#define ci_5 { .id_discr = CELL_IDENT_CI, .id.ci = 5, } +#define ci_6 { .id_discr = CELL_IDENT_CI, .id.ci = 6, } +#define lac_ci_23_5 { \ + .id_discr = CELL_IDENT_LAC_AND_CI, \ + .id.lac_and_ci = { .lac = 23, .ci = 5, }, \ + } +#define lac_ci_42_6 { \ + .id_discr = CELL_IDENT_LAC_AND_CI, \ + .id.lac_and_ci = { .lac = 42, .ci = 6, }, \ + } +#define lai_23_042_23 { \ + .id_discr = CELL_IDENT_LAI_AND_LAC, \ + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 23, }, \ + } +#define lai_23_042_42 { \ + .id_discr = CELL_IDENT_LAI_AND_LAC, \ + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 42, }, \ + } +#define lai_23_99_23 { \ + .id_discr = CELL_IDENT_LAI_AND_LAC, \ + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 99, .mnc_3_digits = false }, .lac = 23, }, \ + } +#define lai_23_42_23 { \ + .id_discr = CELL_IDENT_LAI_AND_LAC, \ + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = false }, .lac = 23, }, \ + } +#define cgi_23_042_23_5 { \ + .id_discr = CELL_IDENT_WHOLE_GLOBAL, \ + .id.global = { \ + .lai = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 23, }, \ + .cell_identity = 5, \ + }, \ + } +#define cgi_23_042_42_6 { \ + .id_discr = CELL_IDENT_WHOLE_GLOBAL, \ + .id.global = { \ + .lai = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 42, }, \ + .cell_identity = 6, \ + }, \ + } +#define cgi_23_99_23_5 { \ + .id_discr = CELL_IDENT_WHOLE_GLOBAL, \ + .id.global = { \ + .lai = { .plmn = { .mcc = 23, .mnc = 99, .mnc_3_digits = false }, .lac = 23, }, \ + .cell_identity = 5, \ + }, \ + } + + +static const struct test_cell_id_matching_data test_cell_id_matching_tests[] = { + { .id = lac_23, .match_id = lac_23, .expect_match = true, .expect_exact_match = true }, + { .id = lac_23, .match_id = lac_42, .expect_match = false, .expect_exact_match = false }, + { .id = lac_23, .match_id = ci_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = ci_6, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = lac_ci_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = lac_ci_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lac_23, .match_id = lai_23_042_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = lai_23_042_42, .expect_match = false, .expect_exact_match = false }, + { .id = lac_23, .match_id = lai_23_99_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = lai_23_42_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = cgi_23_042_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_23, .match_id = cgi_23_042_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lac_23, .match_id = cgi_23_99_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lac_23, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lac_42, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = ci_5, .expect_match = true, .expect_exact_match = true }, + { .id = ci_5, .match_id = ci_6, .expect_match = false, .expect_exact_match = false }, + { .id = ci_5, .match_id = lac_ci_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lac_ci_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = ci_5, .match_id = lai_23_042_23, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lai_23_042_42, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lai_23_99_23, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = lai_23_42_23, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = cgi_23_042_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = ci_5, .match_id = cgi_23_042_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = ci_5, .match_id = cgi_23_99_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lac_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lac_42, .expect_match = false, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = ci_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = ci_6, .expect_match = false, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lac_ci_23_5, .expect_match = true, .expect_exact_match = true }, + { .id = lac_ci_23_5, .match_id = lac_ci_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_042_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_042_42, .expect_match = false, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_99_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_42_23, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = cgi_23_042_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = cgi_23_042_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lac_ci_23_5, .match_id = cgi_23_99_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lac_23, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lac_42, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = ci_5, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = ci_6, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lac_ci_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lac_ci_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_042_23, .expect_match = true, .expect_exact_match = true }, + { .id = lai_23_042_23, .match_id = lai_23_042_42, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_99_23, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_42_23, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = cgi_23_042_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = cgi_23_042_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = lai_23_042_23, .match_id = cgi_23_99_23_5, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_23, .expect_match = true, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_42, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = ci_5, .expect_match = true, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = ci_6, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_ci_23_5, .expect_match = true, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_ci_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_042_23, .expect_match = true, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_042_42, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_99_23, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_42_23, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_042_23_5, .expect_match = true, .expect_exact_match = true }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_042_42_6, .expect_match = false, .expect_exact_match = false }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_99_23_5, .expect_match = false, .expect_exact_match = false }, +}; + +static void test_cell_id_matching() +{ + int i; + bool ok = true; + printf("\n%s\n", __func__); + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + int exact_match; + + for (exact_match = 0; exact_match < 2; exact_match++) { + bool result; + bool expect_result = exact_match ? d->expect_exact_match : d->expect_match; + + result = gsm0808_cell_ids_match(&d->id, &d->match_id, (bool)exact_match); + + printf("[%d] %s %s %s%s\n", + i, + gsm0808_cell_id_name(&d->id), + gsm0808_cell_id_name2(&d->match_id), + result ? "MATCH" : "don't match", + exact_match ? " exactly" : ""); + if (result != expect_result) { + printf(" ERROR: expected %s\n", d->expect_match ? "MATCH" : "no match"); + ok = false; + } + } + } + + OSMO_ASSERT(ok); +} + +static bool test_cell_id_list_matching_discrs(bool test_match, + enum CELL_IDENT id_discr, + enum CELL_IDENT list_discr) +{ + int i, j; + const struct gsm0808_cell_id *id = NULL; + struct gsm0808_cell_id_list2 list = {}; + int match_idx = -1; + int result; + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + if (id_discr != d->id.id_discr) + continue; + id = &d->id; + break; + } + + if (!id) { + printf("Did not find any entry for %s\n", gsm0808_cell_id_discr_name(id_discr)); + return true; + } + + /* Collect those entries with exactly this id on the left, of type list_discr on the right. + * Collect the mismatches first, for more interesting match indexes in the results. */ + for (j = 0; j < 2; j++) { + bool collect_matches = (bool)j; + + /* If we want to have a mismatching list, don't add any entries that match. */ + if (!test_match && collect_matches) + continue; + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + struct gsm0808_cell_id_list2 add; + + /* Ignore those with a different d->id */ + if (!gsm0808_cell_ids_match(&d->id, id, true)) + continue; + + /* Ignore those with a different d->match_id discr */ + if (d->match_id.id_discr != list_discr) + continue; + + if (collect_matches != d->expect_match) + continue; + + if (match_idx < 0 && d->expect_match) { + match_idx = list.id_list_len; + } + + gsm0808_cell_id_to_list(&add, &d->match_id); + gsm0808_cell_id_list_add(&list, &add); + } + } + + if (!list.id_list_len) { + printf("%s vs. %s: No match_id entries to test %s\n", + gsm0808_cell_id_name(id), + gsm0808_cell_id_discr_name(list_discr), + test_match ? "MATCH" : "mismatch"); + return true; + } + + result = gsm0808_cell_id_matches_list(id, &list, 0, false); + + printf("%s and %s: ", + gsm0808_cell_id_name(id), + gsm0808_cell_id_list_name(&list)); + if (result >= 0) + printf("MATCH at [%d]\n", result); + else + printf("mismatch\n"); + + if (test_match + && (result < 0 || result != match_idx)) { + printf(" ERROR: expected MATCH at %d\n", match_idx); + return false; + } + + if (!test_match && result >= 0) { + printf(" ERROR: expected mismatch\n"); + return false; + } + + return true; +} + +static void test_cell_id_list_matching(bool test_match) +{ + int i, j; + bool ok = true; + + const enum CELL_IDENT discrs[] = { + CELL_IDENT_LAC, CELL_IDENT_CI, CELL_IDENT_LAC_AND_CI, CELL_IDENT_LAI_AND_LAC, + CELL_IDENT_WHOLE_GLOBAL, + }; + + printf("\n%s(%s)\n", __func__, test_match ? "test match" : "test mismatch"); + + /* Autogenerate Cell ID lists from above dataset, which should match / not match. */ + for (i = 0; i < ARRAY_SIZE(discrs); i++) { + for (j = 0; j < ARRAY_SIZE(discrs); j++) + if (!test_cell_id_list_matching_discrs(test_match, + discrs[i], discrs[j])) + ok = false; + } + + OSMO_ASSERT(ok); +} + int main(int argc, char **argv) { void *ctx = talloc_named_const(NULL, 0, "gsm0808 test"); @@ -2002,6 +2271,10 @@ test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); + test_cell_id_matching(); + test_cell_id_list_matching(true); + test_cell_id_list_matching(false); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 8e6d262..aae8959 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -439,4 +439,190 @@ m10_2= 0 m12_2= 1 + +test_cell_id_matching +[0] LAC:23 LAC:23 MATCH +[0] LAC:23 LAC:23 MATCH exactly +[1] LAC:23 LAC:42 don't match +[1] LAC:23 LAC:42 don't match exactly +[2] LAC:23 CI:5 MATCH +[2] LAC:23 CI:5 don't match exactly +[3] LAC:23 CI:6 MATCH +[3] LAC:23 CI:6 don't match exactly +[4] LAC:23 LAC-CI:23-5 MATCH +[4] LAC:23 LAC-CI:23-5 don't match exactly +[5] LAC:23 LAC-CI:42-6 don't match +[5] LAC:23 LAC-CI:42-6 don't match exactly +[6] LAC:23 LAI:023-042-23 MATCH +[6] LAC:23 LAI:023-042-23 don't match exactly +[7] LAC:23 LAI:023-042-42 don't match +[7] LAC:23 LAI:023-042-42 don't match exactly +[8] LAC:23 LAI:023-99-23 MATCH +[8] LAC:23 LAI:023-99-23 don't match exactly +[9] LAC:23 LAI:023-42-23 MATCH +[9] LAC:23 LAI:023-42-23 don't match exactly +[10] LAC:23 CGI:023-042-23-5 MATCH +[10] LAC:23 CGI:023-042-23-5 don't match exactly +[11] LAC:23 CGI:023-042-42-6 don't match +[11] LAC:23 CGI:023-042-42-6 don't match exactly +[12] LAC:23 CGI:023-99-23-5 MATCH +[12] LAC:23 CGI:023-99-23-5 don't match exactly +[13] CI:5 LAC:23 MATCH +[13] CI:5 LAC:23 don't match exactly +[14] CI:5 LAC:42 MATCH +[14] CI:5 LAC:42 don't match exactly +[15] CI:5 CI:5 MATCH +[15] CI:5 CI:5 MATCH exactly +[16] CI:5 CI:6 don't match +[16] CI:5 CI:6 don't match exactly +[17] CI:5 LAC-CI:23-5 MATCH +[17] CI:5 LAC-CI:23-5 don't match exactly +[18] CI:5 LAC-CI:42-6 don't match +[18] CI:5 LAC-CI:42-6 don't match exactly +[19] CI:5 LAI:023-042-23 MATCH +[19] CI:5 LAI:023-042-23 don't match exactly +[20] CI:5 LAI:023-042-42 MATCH +[20] CI:5 LAI:023-042-42 don't match exactly +[21] CI:5 LAI:023-99-23 MATCH +[21] CI:5 LAI:023-99-23 don't match exactly +[22] CI:5 LAI:023-42-23 MATCH +[22] CI:5 LAI:023-42-23 don't match exactly +[23] CI:5 CGI:023-042-23-5 MATCH +[23] CI:5 CGI:023-042-23-5 don't match exactly +[24] CI:5 CGI:023-042-42-6 don't match +[24] CI:5 CGI:023-042-42-6 don't match exactly +[25] CI:5 CGI:023-99-23-5 MATCH +[25] CI:5 CGI:023-99-23-5 don't match exactly +[26] LAC-CI:23-5 LAC:23 MATCH +[26] LAC-CI:23-5 LAC:23 don't match exactly +[27] LAC-CI:23-5 LAC:42 don't match +[27] LAC-CI:23-5 LAC:42 don't match exactly +[28] LAC-CI:23-5 CI:5 MATCH +[28] LAC-CI:23-5 CI:5 don't match exactly +[29] LAC-CI:23-5 CI:6 don't match +[29] LAC-CI:23-5 CI:6 don't match exactly +[30] LAC-CI:23-5 LAC-CI:23-5 MATCH +[30] LAC-CI:23-5 LAC-CI:23-5 MATCH exactly +[31] LAC-CI:23-5 LAC-CI:42-6 don't match +[31] LAC-CI:23-5 LAC-CI:42-6 don't match exactly +[32] LAC-CI:23-5 LAI:023-042-23 MATCH +[32] LAC-CI:23-5 LAI:023-042-23 don't match exactly +[33] LAC-CI:23-5 LAI:023-042-42 don't match +[33] LAC-CI:23-5 LAI:023-042-42 don't match exactly +[34] LAC-CI:23-5 LAI:023-99-23 MATCH +[34] LAC-CI:23-5 LAI:023-99-23 don't match exactly +[35] LAC-CI:23-5 LAI:023-42-23 MATCH +[35] LAC-CI:23-5 LAI:023-42-23 don't match exactly +[36] LAC-CI:23-5 CGI:023-042-23-5 MATCH +[36] LAC-CI:23-5 CGI:023-042-23-5 don't match exactly +[37] LAC-CI:23-5 CGI:023-042-42-6 don't match +[37] LAC-CI:23-5 CGI:023-042-42-6 don't match exactly +[38] LAC-CI:23-5 CGI:023-99-23-5 MATCH +[38] LAC-CI:23-5 CGI:023-99-23-5 don't match exactly +[39] LAI:023-042-23 LAC:23 MATCH +[39] LAI:023-042-23 LAC:23 don't match exactly +[40] LAI:023-042-23 LAC:42 don't match +[40] LAI:023-042-23 LAC:42 don't match exactly +[41] LAI:023-042-23 CI:5 MATCH +[41] LAI:023-042-23 CI:5 don't match exactly +[42] LAI:023-042-23 CI:6 MATCH +[42] LAI:023-042-23 CI:6 don't match exactly +[43] LAI:023-042-23 LAC-CI:23-5 MATCH +[43] LAI:023-042-23 LAC-CI:23-5 don't match exactly +[44] LAI:023-042-23 LAC-CI:42-6 don't match +[44] LAI:023-042-23 LAC-CI:42-6 don't match exactly +[45] LAI:023-042-23 LAI:023-042-23 MATCH +[45] LAI:023-042-23 LAI:023-042-23 MATCH exactly +[46] LAI:023-042-23 LAI:023-042-42 don't match +[46] LAI:023-042-23 LAI:023-042-42 don't match exactly +[47] LAI:023-042-23 LAI:023-99-23 don't match +[47] LAI:023-042-23 LAI:023-99-23 don't match exactly +[48] LAI:023-042-23 LAI:023-42-23 don't match +[48] LAI:023-042-23 LAI:023-42-23 don't match exactly +[49] LAI:023-042-23 CGI:023-042-23-5 MATCH +[49] LAI:023-042-23 CGI:023-042-23-5 don't match exactly +[50] LAI:023-042-23 CGI:023-042-42-6 don't match +[50] LAI:023-042-23 CGI:023-042-42-6 don't match exactly +[51] LAI:023-042-23 CGI:023-99-23-5 don't match +[51] LAI:023-042-23 CGI:023-99-23-5 don't match exactly +[52] CGI:023-042-23-5 LAC:23 MATCH +[52] CGI:023-042-23-5 LAC:23 don't match exactly +[53] CGI:023-042-23-5 LAC:42 don't match +[53] CGI:023-042-23-5 LAC:42 don't match exactly +[54] CGI:023-042-23-5 CI:5 MATCH +[54] CGI:023-042-23-5 CI:5 don't match exactly +[55] CGI:023-042-23-5 CI:6 don't match +[55] CGI:023-042-23-5 CI:6 don't match exactly +[56] CGI:023-042-23-5 LAC-CI:23-5 MATCH +[56] CGI:023-042-23-5 LAC-CI:23-5 don't match exactly +[57] CGI:023-042-23-5 LAC-CI:42-6 don't match +[57] CGI:023-042-23-5 LAC-CI:42-6 don't match exactly +[58] CGI:023-042-23-5 LAI:023-042-23 MATCH +[58] CGI:023-042-23-5 LAI:023-042-23 don't match exactly +[59] CGI:023-042-23-5 LAI:023-042-42 don't match +[59] CGI:023-042-23-5 LAI:023-042-42 don't match exactly +[60] CGI:023-042-23-5 LAI:023-99-23 don't match +[60] CGI:023-042-23-5 LAI:023-99-23 don't match exactly +[61] CGI:023-042-23-5 LAI:023-42-23 don't match +[61] CGI:023-042-23-5 LAI:023-42-23 don't match exactly +[62] CGI:023-042-23-5 CGI:023-042-23-5 MATCH +[62] CGI:023-042-23-5 CGI:023-042-23-5 MATCH exactly +[63] CGI:023-042-23-5 CGI:023-042-42-6 don't match +[63] CGI:023-042-23-5 CGI:023-042-42-6 don't match exactly +[64] CGI:023-042-23-5 CGI:023-99-23-5 don't match +[64] CGI:023-042-23-5 CGI:023-99-23-5 don't match exactly + +test_cell_id_list_matching(test match) +LAC:23 and LAC[2]:{42, 23}: MATCH at [1] +LAC:23 and CI[2]:{5, 6}: MATCH at [0] +LAC:23 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAC:23 and LAI[4]:{023-042-42, 023-042-23, 023-99-23, 023-42-23}: MATCH at [1] +LAC:23 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +CI:5 and LAC[2]:{23, 42}: MATCH at [0] +CI:5 and CI[2]:{6, 5}: MATCH at [1] +CI:5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +CI:5 and LAI[4]:{023-042-23, 023-042-42, 023-99-23, 023-42-23}: MATCH at [0] +CI:5 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +LAC-CI:23-5 and LAC[2]:{42, 23}: MATCH at [1] +LAC-CI:23-5 and CI[2]:{6, 5}: MATCH at [1] +LAC-CI:23-5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAC-CI:23-5 and LAI[4]:{023-042-42, 023-042-23, 023-99-23, 023-42-23}: MATCH at [1] +LAC-CI:23-5 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +LAI:023-042-23 and LAC[2]:{42, 23}: MATCH at [1] +LAI:023-042-23 and CI[2]:{5, 6}: MATCH at [0] +LAI:023-042-23 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAI:023-042-23 and LAI[4]:{023-042-42, 023-99-23, 023-42-23, 023-042-23}: MATCH at [3] +LAI:023-042-23 and CGI[3]:{023-042-42-6, 023-99-23-5, 023-042-23-5}: MATCH at [2] +CGI:023-042-23-5 and LAC[2]:{42, 23}: MATCH at [1] +CGI:023-042-23-5 and CI[2]:{6, 5}: MATCH at [1] +CGI:023-042-23-5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +CGI:023-042-23-5 and LAI[4]:{023-042-42, 023-99-23, 023-42-23, 023-042-23}: MATCH at [3] +CGI:023-042-23-5 and CGI[3]:{023-042-42-6, 023-99-23-5, 023-042-23-5}: MATCH at [2] + +test_cell_id_list_matching(test mismatch) +LAC:23 and LAC[1]:{42}: mismatch +LAC:23 vs. CI: No match_id entries to test mismatch +LAC:23 and LAC-CI[1]:{42-6}: mismatch +LAC:23 and LAI[1]:{023-042-42}: mismatch +LAC:23 and CGI[1]:{023-042-42-6}: mismatch +CI:5 vs. LAC: No match_id entries to test mismatch +CI:5 and CI[1]:{6}: mismatch +CI:5 and LAC-CI[1]:{42-6}: mismatch +CI:5 vs. LAI: No match_id entries to test mismatch +CI:5 and CGI[1]:{023-042-42-6}: mismatch +LAC-CI:23-5 and LAC[1]:{42}: mismatch +LAC-CI:23-5 and CI[1]:{6}: mismatch +LAC-CI:23-5 and LAC-CI[1]:{42-6}: mismatch +LAC-CI:23-5 and LAI[1]:{023-042-42}: mismatch +LAC-CI:23-5 and CGI[1]:{023-042-42-6}: mismatch +LAI:023-042-23 and LAC[1]:{42}: mismatch +LAI:023-042-23 vs. CI: No match_id entries to test mismatch +LAI:023-042-23 and LAC-CI[1]:{42-6}: mismatch +LAI:023-042-23 and LAI[3]:{023-042-42, 023-99-23, 023-42-23}: mismatch +LAI:023-042-23 and CGI[2]:{023-042-42-6, 023-99-23-5}: mismatch +CGI:023-042-23-5 and LAC[1]:{42}: mismatch +CGI:023-042-23-5 and CI[1]:{6}: mismatch +CGI:023-042-23-5 and LAC-CI[1]:{42-6}: mismatch +CGI:023-042-23-5 and LAI[3]:{023-042-42, 023-99-23, 023-42-23}: mismatch +CGI:023-042-23-5 and CGI[2]:{023-042-42-6, 023-99-23-5}: mismatch Done -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 12 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 28 23:58:54 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 Jan 2019 23:58:54 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_buf() and test In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12658 ) Change subject: add osmo_hexdump_buf() and test ...................................................................... add osmo_hexdump_buf() and test Add osmo_hexdump_buf() as an all-purpose hexdump function, which all other osmo_hexdump_*() implementations now call. It absorbs the static _osmo_hexdump(). Add tests for osmo_hexdump_buf(). Rationale: recently during patch review, a situation came up where two hexdumps in a single printf would have been useful. Now I've faced a similar situation again, in ongoing development. So I decided it is time to provide this API. The traditional osmo_hexdump() API returns a non-const char*, which should probably have been a const instead. Particularly this new function may return a string constant "" if the buf is NULL or empty, so return const char*. That is why the older implementations calling osmo_hexdump_buf() separately return the buffer instead of the const return value directly. Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 163 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 987080e..fe360b3 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -56,6 +56,9 @@ char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); char *osmo_hexdump(const unsigned char *buf, int len); char *osmo_hexdump_nospc(const unsigned char *buf, int len); +const char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last); + char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) __attribute__((__deprecated__)); #define osmo_static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1] __attribute__((__unused__)); diff --git a/src/utils.c b/src/utils.c index d1da4fa..0b2ed31 100644 --- a/src/utils.c +++ b/src/utils.c @@ -219,30 +219,55 @@ static char hexd_buff[4096]; static const char hex_chars[] = "0123456789abcdef"; -static char *_osmo_hexdump(const unsigned char *buf, int len, char *delim) +/*! Convert binary sequence to hexadecimal ASCII string. + * \param[out] out_buf Output buffer to write the resulting string to. + * \param[in] out_buf_size sizeof(out_buf). + * \param[in] buf Input buffer, pointer to sequence of bytes. + * \param[in] len Length of input buf in number of bytes. + * \param[in] delim String to separate each byte; NULL or "" for no delim. + * \param[in] delim_after_last If true, end the string in delim (true: "1a:ef:d9:", false: "1a:ef:d9"); + * if out_buf has insufficient space, the string will always end in a delim. + * \returns out_buf, containing a zero-terminated string, or "" (empty string) if out_buf == NULL or out_buf_size < 1. + * + * This function will print a sequence of bytes as hexadecimal numbers, adding one delim between each byte (e.g. for + * delim passed as ":", return a string like "1a:ef:d9"). + * + * The delim_after_last argument exists to be able to exactly show the original osmo_hexdump() behavior, which always + * ends the string with a delimiter. + */ +const char *osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last) { int i; - char *cur = hexd_buff; + char *cur = out_buf; + size_t delim_len; - hexd_buff[0] = 0; + if (!out_buf || !out_buf_size) + return ""; + + delim = delim ? : ""; + delim_len = strlen(delim); + for (i = 0; i < len; i++) { const char *delimp = delim; - int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); - if (len_remain < 3) + int len_remain = out_buf_size - (cur - out_buf) - 1; + if (len_remain < (2 + delim_len) + && !(!delim_after_last && i == (len - 1) && len_remain >= 2)) break; *cur++ = hex_chars[buf[i] >> 4]; *cur++ = hex_chars[buf[i] & 0xf]; + if (i == (len - 1) && !delim_after_last) + break; + while (len_remain > 1 && *delimp) { *cur++ = *delimp++; len_remain--; } - - *cur = 0; } - hexd_buff[sizeof(hexd_buff)-1] = 0; - return hexd_buff; + *cur = '\0'; + return out_buf; } /*! Convert a sequence of unpacked bits to ASCII string @@ -292,7 +317,8 @@ */ char *osmo_hexdump(const unsigned char *buf, int len) { - return _osmo_hexdump(buf, len, " "); + osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, " ", true); + return hexd_buff; } /*! Convert binary sequence to hexadecimal ASCII string @@ -308,7 +334,8 @@ */ char *osmo_hexdump_nospc(const unsigned char *buf, int len) { - return _osmo_hexdump(buf, len, ""); + osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); + return hexd_buff; } /* Compat with previous typo to preserve abi */ diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index a773b3f..822861f 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -37,6 +37,7 @@ static void hexdump_test(void) { uint8_t data[4098]; + char buf[256]; int i; for (i = 0; i < ARRAY_SIZE(data); ++i) @@ -44,10 +45,34 @@ printf("Plain dump\n"); printf("%s\n", osmo_hexdump(data, 4)); + printf("%s\n", osmo_hexdump_nospc(data, 4)); printf("Corner case\n"); printf("%s\n", osmo_hexdump(data, ARRAY_SIZE(data))); printf("%s\n", osmo_hexdump_nospc(data, ARRAY_SIZE(data))); + +#define _HEXDUMP_BUF_TEST(SIZE, DELIM, DELIM_AFTER) \ + buf[0] = '!'; \ + buf[1] = '\0'; \ + printf("osmo_hexdump_buf(buf, " #SIZE ", data, 4, %s, " #DELIM_AFTER ")\n = \"%s\"\n", \ + DELIM ? #DELIM : "NULL", \ + osmo_hexdump_buf(buf, SIZE, data, 4, DELIM, DELIM_AFTER)) +#define HEXDUMP_BUF_TEST(DELIM) \ + _HEXDUMP_BUF_TEST(sizeof(buf), DELIM, false); \ + _HEXDUMP_BUF_TEST(sizeof(buf), DELIM, true); \ + _HEXDUMP_BUF_TEST(6, DELIM, false); \ + _HEXDUMP_BUF_TEST(7, DELIM, false); \ + _HEXDUMP_BUF_TEST(8, DELIM, false); \ + _HEXDUMP_BUF_TEST(6, DELIM, true); \ + _HEXDUMP_BUF_TEST(7, DELIM, true); \ + _HEXDUMP_BUF_TEST(8, DELIM, true) + + HEXDUMP_BUF_TEST("[delim]"); + HEXDUMP_BUF_TEST(" "); + HEXDUMP_BUF_TEST(":"); + HEXDUMP_BUF_TEST("::"); + HEXDUMP_BUF_TEST(""); + HEXDUMP_BUF_TEST(NULL); } static void hexparse_test(void) diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index 65e32ed..8d7ced8 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -1,8 +1,105 @@ Plain dump 00 01 02 03 +00010203 Corner case 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfe +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "[delim]", false) + = "00[delim]01[delim]02[delim]03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "[delim]", true) + = "00[delim]01[delim]02[delim]03[delim]" +osmo_hexdump_buf(buf, 6, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 7, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 8, data, 4, "[delim]", false) + = "" +osmo_hexdump_buf(buf, 6, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, 7, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, 8, data, 4, "[delim]", true) + = "" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, " ", false) + = "00 01 02 03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, " ", true) + = "00 01 02 03 " +osmo_hexdump_buf(buf, 6, data, 4, " ", false) + = "00 " +osmo_hexdump_buf(buf, 7, data, 4, " ", false) + = "00 01 " +osmo_hexdump_buf(buf, 8, data, 4, " ", false) + = "00 01 " +osmo_hexdump_buf(buf, 6, data, 4, " ", true) + = "00 " +osmo_hexdump_buf(buf, 7, data, 4, " ", true) + = "00 01 " +osmo_hexdump_buf(buf, 8, data, 4, " ", true) + = "00 01 " +osmo_hexdump_buf(buf, sizeof(buf), data, 4, ":", false) + = "00:01:02:03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, ":", true) + = "00:01:02:03:" +osmo_hexdump_buf(buf, 6, data, 4, ":", false) + = "00:" +osmo_hexdump_buf(buf, 7, data, 4, ":", false) + = "00:01:" +osmo_hexdump_buf(buf, 8, data, 4, ":", false) + = "00:01:" +osmo_hexdump_buf(buf, 6, data, 4, ":", true) + = "00:" +osmo_hexdump_buf(buf, 7, data, 4, ":", true) + = "00:01:" +osmo_hexdump_buf(buf, 8, data, 4, ":", true) + = "00:01:" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "::", false) + = "00::01::02::03" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "::", true) + = "00::01::02::03::" +osmo_hexdump_buf(buf, 6, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 7, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 8, data, 4, "::", false) + = "00::" +osmo_hexdump_buf(buf, 6, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, 7, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, 8, data, 4, "::", true) + = "00::" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "", false) + = "00010203" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, "", true) + = "00010203" +osmo_hexdump_buf(buf, 6, data, 4, "", false) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, "", false) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, "", false) + = "000102" +osmo_hexdump_buf(buf, 6, data, 4, "", true) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, "", true) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, "", true) + = "000102" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, NULL, false) + = "00010203" +osmo_hexdump_buf(buf, sizeof(buf), data, 4, NULL, true) + = "00010203" +osmo_hexdump_buf(buf, 6, data, 4, NULL, false) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, NULL, false) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, NULL, false) + = "000102" +osmo_hexdump_buf(buf, 6, data, 4, NULL, true) + = "0001" +osmo_hexdump_buf(buf, 7, data, 4, NULL, true) + = "000102" +osmo_hexdump_buf(buf, 8, data, 4, NULL, true) + = "000102" Hexparse 0..255 in lower case rc = 256 -- To view, visit https://gerrit.osmocom.org/12658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I590595567b218b24e53c9eb1fd8736c0324d371d Gerrit-Change-Number: 12658 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:00:27 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 00:00:27 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12682 to look at the new patch set (#8). Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/8 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:00:27 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 00:00:27 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12706 to look at the new patch set (#3). Change subject: Support International Caller ID ...................................................................... Support International Caller ID When the SIP call source contains + as first character, set the TON to International so that the MS displays caller ID correctly Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe --- M src/mncc.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/06/12706/3 -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:00:29 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:00:29 +0000 Subject: Change in libosmocore[master]: osmo_fsm_state_name: make robust against NULL fi In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12670 ) Change subject: osmo_fsm_state_name: make robust against NULL fi ...................................................................... osmo_fsm_state_name: make robust against NULL fi Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 --- M include/osmocom/core/fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 5bf5328..df7e348 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -220,7 +220,7 @@ /*! return the name of the state the FSM instance is currently in. */ static inline const char *osmo_fsm_inst_state_name(struct osmo_fsm_inst *fi) -{ return osmo_fsm_state_name(fi->fsm, fi->state); } +{ return fi ? osmo_fsm_state_name(fi->fsm, fi->state) : "NULL"; } /*! perform a state change of the given FSM instance * -- To view, visit https://gerrit.osmocom.org/12670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I61d4f7dfada2763948f330745ac886405d889a12 Gerrit-Change-Number: 12670 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:00:30 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:00:30 +0000 Subject: Change in libosmocore[master]: add osmo_classmark_* API In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12659 ) Change subject: add osmo_classmark_* API ...................................................................... add osmo_classmark_* API osmo-bsc and osmo-msc implement identical Classmark structures. It makes sense to define once near the gsm48 protocol definitions. Also move along some generic Classmark API from osmo-msc. Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 149 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 234fa79..fbd4fe6 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -56,6 +56,22 @@ #endif } __attribute__ ((packed)); +struct osmo_gsm48_classmark { + bool classmark1_set; + struct gsm48_classmark1 classmark1; + uint8_t classmark2_len; + struct gsm48_classmark2 classmark2; + uint8_t classmark3_len; + uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ +}; + +bool osmo_gsm48_classmark_is_r99(const struct osmo_gsm48_classmark *cm); +bool osmo_gsm48_classmark1_is_r99(const struct gsm48_classmark1 *cm1); +bool osmo_gsm48_classmark2_is_r99(const struct gsm48_classmark2 *cm2, uint8_t cm2_len); +int osmo_gsm48_classmark_supports_a5(const struct osmo_gsm48_classmark *cm, uint8_t a5); +const char *osmo_gsm48_classmark_a5_name(const struct osmo_gsm48_classmark *cm); +void osmo_gsm48_classmark_update(struct osmo_gsm48_classmark *dst, const struct osmo_gsm48_classmark *src); + /* Chapter 10.5.2.1b.3 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 86d40d4..4166c15 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1160,4 +1160,130 @@ {} }; +bool osmo_gsm48_classmark1_is_r99(const struct gsm48_classmark1 *cm1) +{ + return cm1->rev_lev >= 2; +} + +bool osmo_gsm48_classmark2_is_r99(const struct gsm48_classmark2 *cm2, uint8_t cm2_len) +{ + if (!cm2_len) + return false; + return cm2->rev_lev >= 2; +} + +/*! Return true if any of Classmark 1 or Classmark 2 are present and indicate R99 capability. + * \param[in] cm Classmarks. + * \returns True if R99 or later, false if pre-R99 or no Classmarks are present. + */ +bool osmo_gsm48_classmark_is_r99(const struct osmo_gsm48_classmark *cm) +{ + if (cm->classmark1_set) + return osmo_gsm48_classmark1_is_r99(&cm->classmark1); + return osmo_gsm48_classmark2_is_r99(&cm->classmark2, cm->classmark2_len); +} + +/*! Return a string representation of A5 cipher algorithms indicated by Classmark 1, 2 and 3. + * \param[in] cm Classmarks. + * \returns A statically allocated string like "cm1{a5/1=supported} cm2{0x23= A5/2 A5/3} no-cm3" + */ +const char *osmo_gsm48_classmark_a5_name(const struct osmo_gsm48_classmark *cm) +{ + static char buf[128]; + char cm1[42] = "no-cm1"; + char cm2[42] = " no-cm2"; + char cm3[42] = " no-cm2"; + + if (cm->classmark1_set) + snprintf(cm1, sizeof(cm1), "cm1{a5/1=%s}", + cm->classmark1.a5_1 ? "not-supported":"supported" /* inverted logic */); + + if (cm->classmark2_len >= 3) + snprintf(cm2, sizeof(cm2), " cm2{0x%x=%s%s}", + cm->classmark2.a5_2 + (cm->classmark2.a5_3 << 1), + cm->classmark2.a5_2 ? " A5/2" : "", + cm->classmark2.a5_3 ? " A5/3" : ""); + + if (cm->classmark3_len >= 1) + snprintf(cm3, sizeof(cm3), " cm3{0x%x=%s%s%s%s}", + cm->classmark3[0], + cm->classmark3[0] & (1 << 0) ? " A5/4" : "", + cm->classmark3[0] & (1 << 1) ? " A5/5" : "", + cm->classmark3[0] & (1 << 2) ? " A5/6" : "", + cm->classmark3[0] & (1 << 3) ? " A5/7" : ""); + + snprintf(buf, sizeof(buf), "%s%s%s", cm1, cm2, cm3); + return buf; +} + +/*! Overwrite dst with the Classmark information present in src. + * Add an new Classmark and overwrite in dst what src has to offer, but where src has no Classmark information, leave + * dst unchanged. (For Classmark 2 and 3, dst will exactly match any non-zero Classmark length from src, hence may end + * up with a shorter Classmark after this call.) + * \param[out] dst The target Classmark storage to be updated. + * \param[in] src The new Classmark information to read from. + */ +void osmo_gsm48_classmark_update(struct osmo_gsm48_classmark *dst, const struct osmo_gsm48_classmark *src) +{ + if (src->classmark1_set) { + dst->classmark1 = src->classmark1; + dst->classmark1_set = true; + } + if (src->classmark2_len) { + dst->classmark2_len = src->classmark2_len; + dst->classmark2 = src->classmark2; + } + if (src->classmark3_len) { + dst->classmark3_len = src->classmark3_len; + memcpy(dst->classmark3, src->classmark3, OSMO_MIN(sizeof(dst->classmark3), src->classmark3_len)); + } +} + + +/*! Determine if the given Classmark (1/2/3) value permits a given A5/n cipher. + * \param[in] cm Classmarks. + * \param[in] a5 The N in A5/N for which to query whether support is indicated. + * \return 1 when the given A5/n is permitted, 0 when not (or a5 > 7), and negative if the respective MS Classmark is + * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not available. The + * idea is that when e.g. A5/3 is requested and the corresponding Classmark 3 is not available, that the caller + * can react by obtaining Classmark 3 and calling again once it is available. + */ +int osmo_gsm48_classmark_supports_a5(const struct osmo_gsm48_classmark *cm, uint8_t a5) +{ + switch (a5) { + case 0: + /* all phones must implement A5/0, see 3GPP TS 43.020 4.9 */ + return 1; + case 1: + /* 3GPP TS 43.020 4.9 requires A5/1 to be suppored by all phones and actually states: + * "The network shall not provide service to an MS which indicates that it does not + * support the ciphering algorithm A5/1.". However, let's be more tolerant based + * on policy here */ + /* See 3GPP TS 24.008 10.5.1.7 */ + if (!cm->classmark1_set) + return -1; + /* Inverted logic for this bit! */ + return cm->classmark1.a5_1 ? 0 : 1; + case 2: + /* See 3GPP TS 24.008 10.5.1.6 */ + if (cm->classmark2_len < 3) + return -2; + return cm->classmark2.a5_2 ? 1 : 0; + case 3: + if (cm->classmark2_len < 3) + return -2; + return cm->classmark2.a5_3 ? 1 : 0; + case 4: + case 5: + case 6: + case 7: + /* See 3GPP TS 24.008 10.5.1.7 */ + if (!cm->classmark3_len) + return -3; + return (cm->classmark3[0] & (1 << (a5-4))) ? 1 : 0; + default: + return 0; + } +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index ea8c9be..3cfe6a7 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -580,5 +580,12 @@ osmo_lu_type_names; osmo_cm_service_type_names; +osmo_classmark_is_r99; +osmo_classmark1_is_r99; +osmo_classmark2_is_r99; +osmo_classmark_supports_a5; +osmo_classmark_a5_name; +osmo_classmark_update; + local: *; }; -- To view, visit https://gerrit.osmocom.org/12659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifd27bab0380f7ad0c44c719aa6c8bd62cf7b034c Gerrit-Change-Number: 12659 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:01:33 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:01:33 +0000 Subject: Change in libosmocore[master]: add osmo_hexdump_b(), osmo_hexdump_nospc_b() In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/12671 ) Change subject: add osmo_hexdump_b(), osmo_hexdump_nospc_b() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia48fc6b984f06b972a6846b173b8cf8d30737460 Gerrit-Change-Number: 12671 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:05:42 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 00:05:42 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/1/src/mncc.c at 427 PS1, Line 427: if (data->emergency) { > Is there some standard way how to express emergency calls in SIP? There is rfc6443 and maybe https://tools.ietf.org/html/rfc5031#section-4.1 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 00:05:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:15 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 00:12:15 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 1: > (1 comment) Maybe see https://www.emergency-services-coordination.info/2008Oct/slides/esw5-tutorial.ppt, slide 8 that and the RFCs are suggesting to me it should be urn:service:sos This latest patch would not override the osmo-msc where we to set the CALLED flag on the msc side, at the same time, for the moment, it maintain compatability with what the LCR does. i.e. uses the string "emergency" in the SIP INVITE. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 00:12:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:12:48 +0000 Subject: Change in libosmocore[master]: jenkins distcheck: enable external tests In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12713 ) Change subject: jenkins distcheck: enable external tests ...................................................................... jenkins distcheck: enable external tests It was recently discovered that logging_vty_test.vty was missing from EXTRA_DIST. To make sure we don't forget similar files in the future, add python tests to 'make distcheck', by means of DISTCHECK_CONFIGURE_FLAGS. Related: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af --- M contrib/jenkins_amd64.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/12713/3 -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:12:48 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... logging sanity: initialize osmo_log_info = NULL logging.c assert_loginfo() wants to make sure that an osmo_log_info was set by asserting non-NULL. Hence we should make sure it is initialized as NULL in the first place. Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e --- M src/logging.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/12714/3 -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:12:48 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12715 to look at the new patch set (#3). Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout ...................................................................... osmo_fsm_inst_state_chg(): set T also for zero timeout Before this patch, if timeout_secs == 0 was passed to osmo_fsm_inst_state_chg(), the previous T value remained set in the osmo_fsm_inst->T. For example: osmo_fsm_inst_state_chg(fi, ST_X, 23, 42); // timer == 23 seconds; fi->T == 42 osmo_fsm_inst_state_chg(fi, ST_Y, 0, 0); // no timer; fi->T == 42! Instead, always set to the T value passed to osmo_fsm_inst_state_chg(). Adjust osmo_fsm_inst_state_chg() API doc; need to rephrase to accurately describe the otherwise unchanged behaviour independently from T. Verify in fsm_test.c. Rationale: it is confusing to have a T number remaining from some past state, especially since the user explicitly passed a T number to osmo_fsm_inst_state_chg(). (Usually we are passing timeout_secs=0, T=0). I first thought this behavior was introduced with osmo_fsm_inst_state_chg_keep_timer(), but in fact osmo_fsm_inst_state_chg() behaved this way from the start. This shows up in the C test for the upcoming tdef API, where the test result printout was showing some past T value sticking around after FSM state transitions. After this patch, there will be no such confusion. Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c --- M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err M tests/fsm/fsm_test.ok 4 files changed, 71 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/12715/3 -- To view, visit https://gerrit.osmocom.org/12715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c Gerrit-Change-Number: 12715 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:12:48 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12716 ) Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years During testing of the upcoming tdef API, it became apparent that passing very large timeout values to osmo_fsm_inst_state_chg() wraps back in the number range, and might actually result in effectively very short timeouts instead. Since time_t's range is not well defined across platforms, use a reasonable maximum value of signed 64 bit integer. Hence this will be safe at least on systems with an int64_t for struct timeval.tv_sec and larger. Clamp the osmo_fsm_inst_state_chg() timeout_secs argument to a maximum of 0x7fffffff, which amounts to just above 68 years: float(0x7fffffff) / (60. * 60 * 24 * 365.25) = 68.04965038532715 (In upcoming patch Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5, this can be verified to work by invoking tdef_test manually with a cmdline argument passed to enable the range check.) Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a --- M src/fsm.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/12716/3 -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:12:48 +0000 Subject: Change in libosmocore[master]: add osmo_tdef API, moved from osmo-bsc T_def In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12717 ) Change subject: add osmo_tdef API, moved from osmo-bsc T_def ...................................................................... add osmo_tdef API, moved from osmo-bsc T_def Move T_def from osmo-bsc to libosmocore as osmo_tdef. Adjust naming to be more consistent. Upgrade to first class API: add mising API doc, add both a C test and a VTY transcript test. >From osmo_fsm_inst_state_chg() API doc, cross reference to osmo_tdef API. The root reason for moving to libosmocore is that I want to use the mgw_endpoint_fsm in osmo-msc for inter-MSC handover, and hence want to move the FSM to libosmo-mgcp-client. This FSM uses the T_def from osmo-bsc. Though the mgw_endpoint_fsm's use of T_def is minimal, I intend to use the osmo_tdef API in osmo-msc (and probably elsewhere) as well. libosmocore is the most sensible place for this. osmo_tdef provides: - a list of Tnnnn (GSM) timers with description, unit and default value. - vty UI to allow users to configure non-default timeouts. - API to tie T timers to osmo_fsm states and set them on state transitions. - a few standard units (minute, second, millisecond) as well as a custom unit (which relies on the timer's human readable description to indicate the meaning of the value). - conversion for standard units: for example, some GSM timers are defined in minutes, while our FSM definitions need timeouts in seconds. Conversion is for convenience only and can be easily avoided via the custom unit. T_def was introduced during the recent osmo-bsc refactoring for inter-BSC handover, and has proven useful: - without osmo_tdef, each invocation of osmo_fsm_inst_state_chg() needs to be programmed with the right timeout value, for all code paths that invoke this state change. It is a likely source of errors to get one of them wrong. By defining a T timer exactly for an FSM state, the caller can merely invoke the state change and trust on the original state definition to apply the correct timeout. - it is helpful to have a standardized config file UI to provide user configurable timeouts, instead of inventing new VTY commands for each separate application of T timer numbers. Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 --- M include/Makefile.am A include/osmocom/core/tdef.h A include/osmocom/vty/tdef.h M src/Makefile.am M src/fsm.c A src/tdef.c M src/vty/Makefile.am A src/vty/tdef_vty.c M tests/Makefile.am A tests/tdef/tdef_test.c A tests/tdef/tdef_test.ok A tests/tdef/tdef_vty_test.c A tests/tdef/tdef_vty_test.vty M tests/testsuite.at 14 files changed, 1,540 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12717/3 -- To view, visit https://gerrit.osmocom.org/12717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 Gerrit-Change-Number: 12717 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:23:43 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:23:43 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 8: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: osmo_strlcpy((char *)data->called.number, "emergency", sizeof(data->called.number)); The original author made data const on purpose: the buffer passed into this function must not be modified. You need to create a local copy to modify it. https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 430 PS8, Line 430: } else { use } else if ((data->fields....) { -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 00:23:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:30:05 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:30:05 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 3: Code-Review+1 (1 comment) I guess it's ok this way, but if you are a friend of C paranoia like I am: https://gerrit.osmocom.org/#/c/12706/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/3/src/mncc.c at 783 PS3, Line 783: if (call->source[0] == '+') { before this patch, osmo_strlcpy() made sure that we don't access a call->source == NULL. If it is 110% sure that call->source is always a char * != NULL, this should add an OSMO_ASSERT(call->source); above. Otherwise make it if (call->source && call->source[0] == '+') { That way we are keeping an unchanged level of paranoia :) -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max Gerrit-Comment-Date: Tue, 29 Jan 2019 00:30:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:45:11 2019 From: gerrit-no-reply at lists.osmocom.org (Rafael Diniz) Date: Tue, 29 Jan 2019 00:45:11 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. Message-ID: Rafael Diniz has uploaded this change for review. ( https://gerrit.osmocom.org/12718 Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Added support for daemonize to osmo-pcu. Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 --- M src/pcu_main.cpp 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/12718/1 diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 7480842..f421e93 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -60,6 +60,7 @@ extern void *bv_tall_ctx; static int quit = 0; static int rt_prio = -1; +static int daemonize = 0; static const char *gsmtap_addr = "localhost"; // FIXME: use gengetopt's default value instead static void print_help() @@ -75,6 +76,7 @@ " -V --version print version\n" " -r --realtime PRIO Use SCHED_RR with the specified " "priority\n" + " -D --daemonize Fork the process into a background daemon\n" " -i --gsmtap-ip The destination IP used for GSMTAP.\n" ); } @@ -91,12 +93,13 @@ { "mnc", 1, 0, 'n' }, { "version", 0, 0, 'V' }, { "realtime", 1, 0, 'r' }, + {"daemonize", 0, 0, 'D'}, { "exit", 0, 0, 'e' }, { "gsmtap-ip", 1, 0, 'i' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hc:m:n:Vr:e:i:", + c = getopt_long(argc, argv, "hc:m:n:Vr:De:i:", long_options, &option_idx); if (c == -1) break; @@ -130,6 +133,9 @@ case 'r': rt_prio = atoi(optarg); break; + case 'D': + daemonize = 1; + break; case 'e': fprintf(stderr, "Warning: Option '-e' is deprecated!\n"); break; @@ -329,6 +335,14 @@ } } + if (daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + while (!quit) { osmo_gsm_timers_check(); osmo_gsm_timers_prepare(); -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:53:32 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:53:32 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: osmo_strlcpy((char *)data->called.number, "emergency", sizeof(data->called.number)); > The original author made data const on purpose: the buffer passed into this function must not be mod [?] Also, most of the emergency number's fields are now possibly random bytes, since the MNCC_F_CALLED flag indicated that no called number field was present at all. Also the if cascade is a bit weird. To make your life a bit simpler, let me suggest a way to do it in a new patch set. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 00:53:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:54:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:54:02 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#9) to the change originally created by Keith Whyte. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/9 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 9 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:57:46 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:57:46 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#10) to the change originally created by Keith Whyte. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/10 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 10 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 00:58:31 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 00:58:31 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#11) to the change originally created by Keith Whyte. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Support Emergency Calling LCR supports emergency calling by sending the string 'emergency' as callee to the SIP side. This does the same Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 --- M src/mncc.c 1 file changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/82/12682/11 -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 11 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 04:51:58 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 04:51:58 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 79 PS1, Line 79: Please use tab here, thanks! -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 04:51:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 05:07:25 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 05:07:25 +0000 Subject: Change in libosmocore[master]: build: add missing logging_vty_test.vty to EXTRA_DIST In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12712 ) Change subject: build: add missing logging_vty_test.vty to EXTRA_DIST ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Gerrit-Change-Number: 12712 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 05:07:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 05:07:53 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 05:07:53 +0000 Subject: Change in libosmocore[master]: jenkins distcheck: enable external tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12713 ) Change subject: jenkins distcheck: enable external tests ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 05:07:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 05:09:35 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 05:09:35 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 05:09:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 05:12:44 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 05:12:44 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12715 ) Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c Gerrit-Change-Number: 12715 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 05:12:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 05:13:51 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 05:13:51 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12716 ) Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 05:13:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 09:42:02 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 09:42:02 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12719 Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Add liboping dependency for osmo-sysmon Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/12719/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 1429e37..dfea926 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -42,6 +42,8 @@ # by gsm-manuals - python-nwdiag - python-pychart + # by osmo-sysmon + - liboping-dev # by gapk - libasound-dev - libopencore-amrnb-dev -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 09:44:55 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 09:44:55 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12719 ) Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Patch Set 1: I'm not quite sure how to propagate this to existing jenkins slaves though. Do we have to run the same playbook commands as described in https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_Node_Setup_ansible ? -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 09:44:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:09:49 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:09:49 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:09:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:12:54 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:12:54 +0000 Subject: Change in libosmocore[master]: jenkins distcheck: enable external tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12713 ) Change subject: jenkins distcheck: enable external tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:12:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:20:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:20:31 +0000 Subject: Change in libosmocore[master]: build: add missing logging_vty_test.vty to EXTRA_DIST In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12712 ) Change subject: build: add missing logging_vty_test.vty to EXTRA_DIST ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Gerrit-Change-Number: 12712 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:20:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:20:32 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:20:32 +0000 Subject: Change in libosmocore[master]: build: add missing logging_vty_test.vty to EXTRA_DIST In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12712 ) Change subject: build: add missing logging_vty_test.vty to EXTRA_DIST ...................................................................... build: add missing logging_vty_test.vty to EXTRA_DIST It was introduced and forgotten to add to EXTRA_DIST in: "logging vty: add VTY transcript test" commit 3a9ff11e574fa7ee19b1062b2c90151dbf7f0e27 change-Id I948e832a33131f8eab98651d6010ceb0ccbc9a9c Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e --- M tests/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 028abc2..a307886 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -246,6 +246,7 @@ gprs/gprs_test.ok kasumi/kasumi_test.ok \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ logging/logging_test.ok logging/logging_test.err \ + logging/logging_vty_test.vty \ fr/fr_test.ok loggingrb/logging_test.ok \ loggingrb/logging_test.err strrb/strrb_test.ok \ codec/codec_test.ok \ -- To view, visit https://gerrit.osmocom.org/12712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Gerrit-Change-Number: 12712 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:20:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:20:56 +0000 Subject: Change in libosmocore[master]: jenkins distcheck: enable external tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12713 ) Change subject: jenkins distcheck: enable external tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:20:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:20:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:20:58 +0000 Subject: Change in libosmocore[master]: jenkins distcheck: enable external tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12713 ) Change subject: jenkins distcheck: enable external tests ...................................................................... jenkins distcheck: enable external tests It was recently discovered that logging_vty_test.vty was missing from EXTRA_DIST. To make sure we don't forget similar files in the future, add python tests to 'make distcheck', by means of DISTCHECK_CONFIGURE_FLAGS. Related: I1bcedf3097f02b2adc679560d1cbceb27dbc345e Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af --- M contrib/jenkins_amd64.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Max: Looks good to me, approved Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh index cd7b666..9b83793 100755 --- a/contrib/jenkins_amd64.sh +++ b/contrib/jenkins_amd64.sh @@ -28,7 +28,8 @@ # do distcheck only once, which is fine from built source tree, since distcheck # is well separated from the source tree state. -$MAKE distcheck \ +DISTCHECK_CONFIGURE_FLAGS=--enable-external-tests \ + $MAKE distcheck \ || cat-testlogs.sh osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id569b2a932c1428cabb4d7ff17822cff8eee02af Gerrit-Change-Number: 12713 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:23:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:23:47 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12714/3/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12714/3/src/logging.c at 60 PS3, Line 60: log_info *osmo_log_info = NULL to my knowledge this is not required at all. https://en.wikipedia.org/wiki/.bss "Unix-like systems and Windows initialize the bss section to zero, allowing C and C++ statically-allocated variables initialized to values represented with all bits zero to be put in the bss segment" Also, from the C specification: In C code, any variable with static storage duration is defined to be initialized to 0 by the spec (Section 6.7.8 Initialization, paragraph 10): If an object that has static storage duration is not initialized explicitly, then: * if it has pointer type, it is initialized to a null pointer; * if it has arithmetic type, it is initialized to (positive or unsigned) zero; * if it is an aggregate, every member is initialized (recursively) according to these rules; * if it is a union, the first named member is initialized (recursively) according to these rules. -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:23:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:25:08 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:25:08 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12715 ) Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c Gerrit-Change-Number: 12715 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:25:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:25:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:25:18 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Patch Set 3: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:25:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:29:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:29:52 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12716 ) Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12716/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12716/3//COMMIT_MSG at 13 PS3, Line 13: use a reasonable : maximum value of signed 64 bit integer I think the actual value used is that of a signed 32bit integer? -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 10:29:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 29 10:31:55 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 Jan 2019 10:31:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_oct?= =?UTF-8?Q?,master,0,default,osmocom-master-debian9_#1739?= Message-ID: <1530283359.109.1548757915792.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 66.18 KB...] make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC command.lo CC buffer.lo CC vector.lo CC vty.lo CC utils.lo CC telnet_interface.lo CC logging_vty.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 6:0:2 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.2.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.2.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.2.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.2.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm660.lo CC gsm610.lo CC gsm690.lo CC ecu_fr.lo CC gsm620.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC comp128.lo CC tlv_parser.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo gsm_utils.c:116:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:453:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsup_sms.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 11:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.11.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.11.0.0 libosmogsm.so.11 || { rm -f libosmogsm.so.11 && ln -s libosmogsm.so.11.0.0 libosmogsm.so.11; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.11.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.11.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_mapping.lo CC gsm0503_coding.lo CC gsm0503_parity.lo /bin/bash: line 2: 10500 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I"../../include" -I"../../include" -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm0503_mapping.lo -MD -MP -MF $depbase.Tpo -c -o gsm0503_mapping.lo gsm0503_mapping.c Makefile:492: recipe for target 'gsm0503_mapping.lo' failed make[2]: *** [gsm0503_mapping.lo] Error 132 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:41:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 10:41:47 +0000 Subject: Change in libosmocore[master]: add osmo_tdef API, moved from osmo-bsc T_def In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12717 ) Change subject: add osmo_tdef API, moved from osmo-bsc T_def ...................................................................... Patch Set 3: Code-Review-1 (2 comments) If this is moved to a generic libosmocore sub-system, I'm starting to think how this would work in detail. It seems that there's no concept of a "timer group" or something that is a sub-node under the vty "tdef" node. The timer numbers in GSM are not globally unique, but they are locally scoped to each protocol or network element. Even more, we deal with other protocols like SCCP. So let's assume that both SCCP and BSSAP define a timer called "3", and both sub-sytems wanted to make use of this sub-system, how would this work? I'm sorry if I missed something. Putting a -1 as a precaution. I like the idea, let's just make sure if we move it to libosmocore we get it right the first time it is merged. https://gerrit.osmocom.org/#/c/12717/3/src/vty/tdef_vty.c File src/vty/tdef_vty.c: https://gerrit.osmocom.org/#/c/12717/3/src/vty/tdef_vty.c at 119 PS3, Line 119: whitespace https://gerrit.osmocom.org/#/c/12717/3/tests/tdef/tdef_vty_test.vty File tests/tdef/tdef_vty_test.vty: https://gerrit.osmocom.org/#/c/12717/3/tests/tdef/tdef_vty_test.vty at 4 PS3, Line 4: tdef I would appreciate a somewhat more human-readable name like "timer-definitons" instead of just "tdef". I believe we could use "timer-definitions" as the primary name and add "tdef" as an alias for compatibility, as desired/required? -- To view, visit https://gerrit.osmocom.org/12717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 Gerrit-Change-Number: 12717 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 29 Jan 2019 10:41:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:43:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:43:15 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: Code-Review-1 (1 comment) I'm curious about use-case: I thought nowadays most setups use systemd service file to take care of daemonization. Where do you plan to use it? https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 63 PS1, Line 63: static int daemonize = 0; If it's only used as true/false than please use bool for type to reflect that. -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 10:43:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:44:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 10:44:57 +0000 Subject: Change in docker-playground[master]: osmo-msc-latest: install libdbd-sqlite3 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12720 Change subject: osmo-msc-latest: install libdbd-sqlite3 ...................................................................... osmo-msc-latest: install libdbd-sqlite3 Fix osmo-msc crash at start up: <0009> db.c:621 Failed to create database connection to sqlite3 db 'sms.db'; Is the sqlite3 database driver for libdbi installed on this system? DB: Failed to init database: sms.db It would be better if the Debian package pulled in this dependency automatically, see OS#3771. Related: OS#3767 Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 --- M osmo-msc-latest/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/20/12720/1 diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile index a8cc3ba..928c93a 100644 --- a/osmo-msc-latest/Dockerfile +++ b/osmo-msc-latest/Dockerfile @@ -14,11 +14,13 @@ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +# libdbd-sqlite3: workaround for OS#3771 ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ osmo-msc \ - telnet && \ + telnet \ + libdbd-sqlite3 && \ apt-get clean WORKDIR /tmp -- To view, visit https://gerrit.osmocom.org/12720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 Gerrit-Change-Number: 12720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:47:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:47:45 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: return close_connection(conn); > The original author made data const on purpose: the buffer passed into this function must not be modified. Curious, how did you came up with this conclusion? I don't see why modifying the buffer would be bad. Could you elaborate? -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 11 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 10:47:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:52:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:52:38 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 29 Jan 2019 10:52:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 10:56:48 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 10:56:48 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon In-Reply-To: References: Message-ID: Hello lynxis lazus, Harald Welte, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12719 to look at the new patch set (#2). Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Add liboping dependency for osmo-sysmon Related: SYS#2655 Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/12719/2 -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 11:01:35 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/#/c/12682/11/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/11/src/mncc.c at 414 PS11, Line 414: .plan = GSM48_NPI_UNKNOWN, /*< TODO: correct?? */ .plan is never looked at again. We only check if .type == GSM340_TYPE_INTERNATIONAL in order to prefix '+' to the number for SIP invite. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 11 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 11:01:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:17:28 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 11:17:28 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 6: Both items should be addressed now. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 29 Jan 2019 11:17:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:24:09 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 11:24:09 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 63 PS1, Line 63: static int daemonize = 0; > If it's only used as true/false than please use bool for type to reflect that. Hmm. I did the same (int) recently for a true/false vty option.. It passed. but then.. maybe in the future it could be something other than true/false.. -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 11:24:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:24:21 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 11:24:21 +0000 Subject: Change in docker-playground[master]: osmo-msc-latest: install libdbd-sqlite3 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12720 ) Change subject: osmo-msc-latest: install libdbd-sqlite3 ...................................................................... Patch Set 1: Code-Review+1 Yep, this problem has been migrated from OpenBSC. I think we should also check this in configure.ac. -- To view, visit https://gerrit.osmocom.org/12720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 Gerrit-Change-Number: 12720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 29 Jan 2019 11:24:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:26:55 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 11:26:55 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12706 to look at the new patch set (#4). Change subject: Support International Caller ID ...................................................................... Support International Caller ID When the SIP call source contains + as first character, set the TON to International so that the MS displays caller ID correctly Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe --- M src/mncc.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/06/12706/4 -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 11:29:35 2019 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 29 Jan 2019 11:29:35 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 4: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12706/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/3/src/mncc.c at 783 PS3, Line 783: if (call->source && call->source[0] == '+') { > before this patch, osmo_strlcpy() made sure that we don't access a call->source == NULL. [?] Done -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 29 Jan 2019 11:29:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:03:02 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:03:02 +0000 Subject: Change in osmo-ci[master]: ttcn3: block latest jobs while master is running In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12709 ) Change subject: ttcn3: block latest jobs while master is running ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 Gerrit-Change-Number: 12709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:03:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:03:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:03:06 +0000 Subject: Change in osmo-ci[master]: ttcn3: block latest jobs while master is running In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12709 ) Change subject: ttcn3: block latest jobs while master is running ...................................................................... ttcn3: block latest jobs while master is running Jenkins job builder does not support string replacing in variables, so the only way to make each ttcn3-foo-test-latest job get blocked by their ttcn3-foo-test counterpart was specifying them each time. Related: OS#3767 Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 --- M jobs/ttcn3-testsuites.yml 1 file changed, 25 insertions(+), 12 deletions(-) Approvals: Max: Looks good to me, but someone else must approve daniel: Looks good to me, approved osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index cd7aaa9..b7a3fd0 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -4,6 +4,8 @@ concurrent: false disabled: false timer: "@midnight" + # Block *-latest for all master jobs (without suffix) + blocking: "^{job-name}.*" jobs: - "{job-name}" # Folders from docker-playground.git @@ -33,17 +35,28 @@ timer: 00 07 * * * # latest stable - - nplab-m3ua-test-latest - - nplab-sua-test-latest - - ttcn3-bsc-test-latest - - ttcn3-bsc-test-sccplite-latest - - ttcn3-bts-test-latest - - ttcn3-ggsn-test-latest - - ttcn3-hlr-test-latest - - ttcn3-mgw-test-latest - - ttcn3-msc-test-latest - - ttcn3-sgsn-test-latest - - ttcn3-sip-test-latest + - nplab-m3ua-test-latest: + blocking: "^nplab-m3ua-test.*" + - nplab-sua-test-latest: + blocking: "^nplab-sua-test.*" + - ttcn3-bsc-test-latest: + blocking: "^ttcn3-bsc-test.*" + - ttcn3-bsc-test-sccplite-latest: + blocking: "^ttcn3-bsc-test-sccplite.*" + - ttcn3-bts-test-latest: + blocking: "^ttcn3-bts-test.*" + - ttcn3-ggsn-test-latest: + blocking: "^ttcn3-ggsn-test.*" + - ttcn3-hlr-test-latest: + blocking: "^ttcn3-hlr-test.*" + - ttcn3-mgw-test-latest: + blocking: "^ttcn3-mgw-test.*" + - ttcn3-msc-test-latest: + blocking: "^ttcn3-msc-test.*" + - ttcn3-sgsn-test-latest: + blocking: "^ttcn3-sgsn-test.*" + - ttcn3-sip-test-latest: + blocking: "^ttcn3-sip-test.*" - job-template: name: '{job-name}' project-type: freestyle @@ -107,7 +120,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - "^{job-name}.*" + - "{obj:blocking}" - build-discarder: days-to-keep: 30 num-to-keep: 120 -- To view, visit https://gerrit.osmocom.org/12709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5 Gerrit-Change-Number: 12709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:21:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:21:44 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12721 Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... osmo-msc.cfg: remove auth policy, LU reject cause Delete legacy config lines. They have been deleted in osmo-msc.git's example config files in [1] and [2] almost a year ago. When running locally, osmo-msc even refuses to start with these lines and it is currently a mistery to me why it doesn't abort here in the ttcn3 tests run by jenkins. $ osmo-msc There is no such command. Error occurred during reading the below line: auth policy closed <0006> msc_main.c:573 Failed to parse the config file: 'osmo-msc.cfg' [1]: change-id I825e659da529257e5edec94d9d59f0e10c1b4c63 [2]: change-id Ie1f39e706477aaf42051877b52d4b3ae1c5f138e Related: OS#3767 Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 --- M osmo-msc-latest/osmo-msc.cfg M osmo-msc-master/osmo-msc.cfg 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/12721/1 diff --git a/osmo-msc-latest/osmo-msc.cfg b/osmo-msc-latest/osmo-msc.cfg index 1261160..91c9eee 100644 --- a/osmo-msc-latest/osmo-msc.cfg +++ b/osmo-msc-latest/osmo-msc.cfg @@ -9,8 +9,6 @@ mobile network code 1 short name OsmoMSC long name OsmoMSC - auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 diff --git a/osmo-msc-master/osmo-msc.cfg b/osmo-msc-master/osmo-msc.cfg index 1261160..91c9eee 100644 --- a/osmo-msc-master/osmo-msc.cfg +++ b/osmo-msc-master/osmo-msc.cfg @@ -9,8 +9,6 @@ mobile network code 1 short name OsmoMSC long name OsmoMSC - auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:23:49 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 12:23:49 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:23:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:24:37 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 12:24:37 +0000 Subject: Change in docker-playground[master]: osmo-msc-latest: install libdbd-sqlite3 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12720 ) Change subject: osmo-msc-latest: install libdbd-sqlite3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 Gerrit-Change-Number: 12720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 29 Jan 2019 12:24:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:25:10 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:25:10 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:25:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:25:12 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:25:12 +0000 Subject: Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/ In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ ...................................................................... ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/ paths from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Related: OS#3767 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 6 files changed, 8 insertions(+), 8 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 0287097..df45b0a 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -23,7 +23,7 @@ --network $NET_NAME --ip 172.18.11.20 \ -v $VOL_BASE_DIR/bscnat:/data \ --name ${BUILD_TAG}-bscnat -d \ - $REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg + $REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c /data/osmo-bsc-nat.cfg echo Starting container with BSCNAT testsuite docker run --rm \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 96616d9..b287a78 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -34,7 +34,7 @@ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg + osmo-bsc -c /data/osmo-bsc.cfg echo Starting container with BTS docker run --rm \ @@ -43,7 +43,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-bts -d \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 + /usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 echo Starting container with fake_trx docker run --rm \ @@ -63,7 +63,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ $REPO_USER/osmocom-bb-host-master \ - /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 + trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 echo Starting container with BTS testsuite diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 89669eb..fcb51b6 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -22,7 +22,7 @@ -v $VOL_BASE_DIR/hlr:/data \ --name ${BUILD_TAG}-hlr -d \ $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-hlr + osmo-hlr echo Starting container with HLR testsuite docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 82ec483..3289a67 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -38,7 +38,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-msc + osmo-msc echo Starting container with MSC testsuite docker run --rm \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9243e2b..e4611bc 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -24,7 +24,7 @@ -v $VOL_BASE_DIR/sgsn:/data \ --name ${BUILD_TAG}-sgsn -d \ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-sgsn + osmo-sgsn echo Starting container with SGSN testsuite docker run --rm \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 2dfd281..f70943c 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -27,7 +27,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-sip-connector -M /data/unix/mncc + osmo-sip-connector -M /data/unix/mncc echo Starting container with SIP testsuite docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:26:15 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:26:15 +0000 Subject: Change in docker-playground[master]: osmo-msc-latest: install libdbd-sqlite3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12720 ) Change subject: osmo-msc-latest: install libdbd-sqlite3 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 Gerrit-Change-Number: 12720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:26:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:26:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:26:19 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg ...................................................................... ttcn3-sip-test/jenkins.sh: remove invalid -M arg osmo-sip-connector does not have a -M argument, it was probably confused with osmo-msc's -M, --mncc-sock-path argument. osmo-sip-connector printed out the following when started with -M, but otherwise functioned normally. Because it was started with Docker in background, the message did not get written to the build log. osmo-sip-connector: invalid option -- 'M' Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved osmith: Verified diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index f70943c..a918269 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -27,7 +27,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ - osmo-sip-connector -M /data/unix/mncc + osmo-sip-connector echo Starting container with SIP testsuite docker run --rm \ -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:26:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:26:21 +0000 Subject: Change in docker-playground[master]: osmo-msc-latest: install libdbd-sqlite3 In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12720 ) Change subject: osmo-msc-latest: install libdbd-sqlite3 ...................................................................... osmo-msc-latest: install libdbd-sqlite3 Fix osmo-msc crash at start up: <0009> db.c:621 Failed to create database connection to sqlite3 db 'sms.db'; Is the sqlite3 database driver for libdbi installed on this system? DB: Failed to init database: sms.db It would be better if the Debian package pulled in this dependency automatically, see OS#3771. Related: OS#3767 Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 --- M osmo-msc-latest/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile index a8cc3ba..928c93a 100644 --- a/osmo-msc-latest/Dockerfile +++ b/osmo-msc-latest/Dockerfile @@ -14,11 +14,13 @@ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +# libdbd-sqlite3: workaround for OS#3771 ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ osmo-msc \ - telnet && \ + telnet \ + libdbd-sqlite3 && \ apt-get clean WORKDIR /tmp -- To view, visit https://gerrit.osmocom.org/12720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia816aed8dd3b86f44f4454af89cec6f0b9d55dd1 Gerrit-Change-Number: 12720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:26:47 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 12:26:47 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12719 ) Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Patch Set 2: Ok, the way to execute this task is to run 'ansible-playbook -i hosts setup-jenkins-slave.yml' from osmo-ci which requires IPv6 connectivity towards build slaves. -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:26:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:27:18 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 12:27:18 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... Patch Set 1: Code-Review+1 these are only the default config files for latest/master images. The ttcn3-msc-test docker has its own osmo-msc.cfg file it uses to run the tests. -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 29 Jan 2019 12:27:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:29:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:29:42 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... Patch Set 1: (1 comment) see my in-line comment. I think one might even consdier removing those config files here altogether. The intention of the files here is for users of the docker containers *outside* of the TTCN3 tests. https://gerrit.osmocom.org/#/c/12721/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12721/1//COMMIT_MSG at 13 PS1, Line 13: t is currently a mistery to me why it doesn't abort here because those config files are not used. The config files used in the tests are those included in osmo-ttcn3-tests/msc -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:29:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:31:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:31:09 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, Max, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12721 to look at the new patch set (#2). Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... osmo-msc.cfg: remove auth policy, LU reject cause Delete legacy config lines. They have been deleted in osmo-msc.git's example config files in [1] and [2] almost a year ago. When running locally, osmo-msc refuses to start with these lines. The ttcn3-msc-test dir has its own osmo-msc.cfg file, so it works there without this patch. $ osmo-msc There is no such command. Error occurred during reading the below line: auth policy closed <0006> msc_main.c:573 Failed to parse the config file: 'osmo-msc.cfg' [1]: change-id I825e659da529257e5edec94d9d59f0e10c1b4c63 [2]: change-id Ie1f39e706477aaf42051877b52d4b3ae1c5f138e Related: OS#3767 Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 --- M osmo-msc-latest/osmo-msc.cfg M osmo-msc-master/osmo-msc.cfg 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/12721/2 -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:31:31 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:31:31 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... Patch Set 1: > these are only the default config files for latest/master images. The ttcn3-msc-test docker has its own osmo-msc.cfg file it uses to run the tests. Ah thanks, now it makes sense! -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:31:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:35:25 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:35:25 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12719 ) Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:35:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:35:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:35:27 +0000 Subject: Change in osmo-ci[master]: Add liboping dependency for osmo-sysmon In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12719 ) Change subject: Add liboping dependency for osmo-sysmon ...................................................................... Add liboping dependency for osmo-sysmon Related: SYS#2655 Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified 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 1429e37..1a53b57 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -71,6 +71,8 @@ - libgps-dev - libgsm1-dev - libmnl-dev + # by osmo-sysmon + - liboping-dev - libncurses5-dev - libortp-dev - libpcap-dev -- To view, visit https://gerrit.osmocom.org/12719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6198cd14ff86c5d8203d57674a17aa388f21c19d Gerrit-Change-Number: 12719 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:38:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:38:43 +0000 Subject: Change in osmo-sip-connector[master]: Support International Caller ID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12706 ) Change subject: Support International Caller ID ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/12706/5/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12706/5/src/mncc.c at 795 PS5, Line 795: osmo_strlcpy OSMO_STRLCPY_ARRAY(mncc.calling.number, call->source +1) https://gerrit.osmocom.org/#/c/12706/5/src/mncc.c at 798 PS5, Line 798: osmo_strlcpy(mncc.calling.number, call->source, sizeof(mncc.calling.number)); same here. avoids the sizeof, the macro takes care of it. -- To view, visit https://gerrit.osmocom.org/12706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfa31aff90e04dd0aa3583957f288889b1bbefe Gerrit-Change-Number: 12706 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:38:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:39:40 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:39:40 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 29 Jan 2019 12:39:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:39:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:39:57 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: osmo_strlcpy((char *)data->called.number, "emergency", sizeof(data->called.number)); > > The original author made data const on purpose: the buffer passed into this function must not be m [?] it's a matter of API design. Please stop debating the obvious. Const is used exactly for this reasion. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:39:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:40:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:40:40 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: osmo_strlcpy Use OSMO_STRLCPY_ARRAY() please. Apart from that I'm fine to merge this. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:40:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:42:06 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:42:06 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 96 PS1, Line 96: {"daemonize", 0, 0, 'D'}, please align your coding style with the existing code. All the lines above and below have spaces inside the '{}'. Thanks for your attention. -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:42:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:43:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:43:27 +0000 Subject: Change in libusrp[master]: Add config for git-review In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:43:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:43:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:43:28 +0000 Subject: Change in libusrp[master]: Add config for git-review In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review ...................................................................... Add config for git-review Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..7f120b8 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=libusrp -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:47:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:47:48 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... Patch Set 1: > see my in-line comment. I think one might even consdier removing those config files here altogether. The intention of the files here is for users of the docker containers *outside* of the TTCN3 tests. Thanks for explaining. I've updated the commit message. Is it good to go now, or would you prefer if I test if it works out of the box with the TTCN3 config and remove the other osmo-msc.cfg configs? (maybe use a symlink instead) For consistency I could check the other configs too if that is desired. -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:47:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 29 12:48:42 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 Jan 2019 12:48:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#846?= Message-ID: <1251713519.113.1548766122839.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 107.98 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /usr/bin/install -c -m 644 usrp_guide.html /bin/mkdir -p ' cp -r html /usr/bin/install -c -m 644 ../README ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:48:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:48:59 +0000 Subject: Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12571/1//COMMIT_MSG at 9 PS1, Line 9: This simplifies tests refactoring by showing exact byte where mismatch > > that's technically not allowed [?] Max, I'm really not happy about you repeatedly trying to change how things are done. In osmocom, we never have had any multiline logging. This ispart of the log file format. Whether or not it's not technically posibble, you should have concluded from the fact that it's not done anywhere that it's not desired/intended. I'm actually going to open a bug report about this now. How do you expect any automatic log post-processing to work when suddenly there are log lines that don't follow the usual formatting? Have you validated/verified that e.g. the GSMTAP based logging still works with this multi-line approach? Have you verified that the rendering e.g. in the GSMTAP log dissector for wireshark works? And there are more questions like this - whihc I all find rather rhethorically because it simply shouldn't be done in the first place. I believe the PCU did that at some point in the past or maybe still using multi-line log strings. If so, they should equally be resolved/reoved. -- To view, visit https://gerrit.osmocom.org/12571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:48:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:49:47 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:49:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: Add tests to check channel allocator In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12620 ) Change subject: BSC_Tests: Add tests to check channel allocator ...................................................................... BSC_Tests: Add tests to check channel allocator When a channel is assigned via the assignment request throught the A interface, the MSC may offer either FR, HR or both. When FR and HR are permitted, a preference is set on one of the two. At the moment we do not check how the bsc is reacting to those preferences and its also not checked how the behavior is when the preferred rate is not available because all lchan of that type are already in use. Lets add a set of tests to verify this. Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Depends: osmo-bsc I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 304 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 77da306..a6f9f7d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2053,6 +2053,289 @@ vc_conn.done; } +private function f_disable_all_tch_f() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 disable"); +} + +private function f_disable_all_tch_h() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 disable"); +} + +private function f_enable_all_tch() runs on test_CT { + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 enable"); +} + +/* Allow HR only */ +private function f_TC_assignment_codec_xr_exhausted_req_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '09'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR only */ +private function f_TC_assignment_codec_xr_exhausted_req_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '08'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow HR only (expect assignment failure) */ +private function f_TC_assignment_codec_xr_exhausted_req_hr_fail(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '09'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); + f_establish_fully(ass_cmd, exp_fail); +} + +/* Allow FR only (expect assignment failure) */ +private function f_TC_assignment_codec_xr_exhausted_req_fr_fail(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '08'O; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + f_establish_fully(ass_cmd, exp_fail); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_fr_exhausted_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_fr_exhausted_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_hr_exhausted_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_hr_exhausted_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Request a HR channel while all FR channels are exhausted, this is expected + * to work without conflicts */ +testcase TC_assignment_codec_fr_exhausted_req_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a FR channel while all FR channels are exhausted, this is expected + * to fail. */ +testcase TC_assignment_codec_fr_exhausted_req_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr_fail)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel while all FR channels + * are exhausted, this is expected to be resolved by selecting a HR channel. */ +testcase TC_assignment_codec_fr_exhausted_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_fr_hr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a HR (prefered) or alternatively a FR channel while all FR channels + * are exhausted, this is expected to work without conflicts. */ +testcase TC_assignment_codec_fr_exhausted_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_f(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_hr_fr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a FR channel while all HR channels are exhausted, this is expected + * to work without conflicts */ +testcase TC_assignment_codec_hr_exhausted_req_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a HR channel while all HR channels are exhausted, this is expected + * to fail. */ +testcase TC_assignment_codec_hr_exhausted_req_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr_fail)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a HR (prefered) or alternatively a FR channel while all HR channels + * are exhausted, this is expected to be resolved by selecting a FR channel. */ +testcase TC_assignment_codec_hr_exhausted_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_hr_fr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel while all HR channels + * are exhausted, this is expected to work without conflicts. */ +testcase TC_assignment_codec_hr_exhausted_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + f_disable_all_tch_h(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_fr_hr)); + vc_conn.done; + f_enable_all_tch(); + setverdict(pass); +} + +/* Allow FR and HR, but prefer HR */ +private function f_TC_assignment_codec_req_hr_fr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0B'O; /* Prefer HR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8501'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Allow FR and HR, but prefer FR */ +private function f_TC_assignment_codec_req_fr_hr(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.channelType.channelRateAndType := '0A'O; /* Prefer FR */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '8105'O; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); + exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ + f_establish_fully(ass_cmd, exp_compl); +} + +/* Request a HR (prefered) or alternatively a FR channel, it is expected that + * HR, which is the prefered type, is selected. */ +testcase TC_assignment_codec_req_hr_fr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_hr_fr)); + vc_conn.done; + setverdict(pass); +} + +/* Request a FR (prefered) or alternatively a HR channel, it is expected that + * FR, which is the prefered type, is selected. */ +testcase TC_assignment_codec_req_fr_hr() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(1, true); + f_sleep(1.0); + f_enable_all_tch(); + vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_fr_hr)); + vc_conn.done; + setverdict(pass); +} + /* test the procedure of the MSC requesting a Classmark Update: * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ @@ -3444,6 +3727,17 @@ execute( TC_assignment_codec_amr_f() ); execute( TC_assignment_codec_amr_h() ); + execute( TC_assignment_codec_fr_exhausted_req_hr() ); + execute( TC_assignment_codec_fr_exhausted_req_fr() ); + execute( TC_assignment_codec_fr_exhausted_req_fr_hr() ); + execute( TC_assignment_codec_fr_exhausted_req_hr_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_hr() ); + execute( TC_assignment_codec_hr_exhausted_req_hr_fr() ); + execute( TC_assignment_codec_hr_exhausted_req_fr_hr() ); + execute( TC_assignment_codec_req_hr_fr() ); + execute( TC_assignment_codec_req_fr_hr() ); + /* RLL Establish Indication on inactive DCHAN / SAPI */ execute( TC_rll_est_ind_inact_lchan() ); execute( TC_rll_est_ind_inval_sapi1() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index ccd2928..dadb349 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -35,6 +35,16 @@ + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/12620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I109d986dd7ece1a56422a669ca64353ed46f7ed6 Gerrit-Change-Number: 12620 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:53:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 12:53:47 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 4: Code-Review+1 I've read through the discussion in this issue, and the current patch looks good to me. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 12:53:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:55:37 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:55:37 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:55:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:55:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:55:38 +0000 Subject: Change in docker-playground[master]: osmo-msc.cfg: remove auth policy, LU reject cause In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12721 ) Change subject: osmo-msc.cfg: remove auth policy, LU reject cause ...................................................................... osmo-msc.cfg: remove auth policy, LU reject cause Delete legacy config lines. They have been deleted in osmo-msc.git's example config files in [1] and [2] almost a year ago. When running locally, osmo-msc refuses to start with these lines. The ttcn3-msc-test dir has its own osmo-msc.cfg file, so it works there without this patch. $ osmo-msc There is no such command. Error occurred during reading the below line: auth policy closed <0006> msc_main.c:573 Failed to parse the config file: 'osmo-msc.cfg' [1]: change-id I825e659da529257e5edec94d9d59f0e10c1b4c63 [2]: change-id Ie1f39e706477aaf42051877b52d4b3ae1c5f138e Related: OS#3767 Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 --- M osmo-msc-latest/osmo-msc.cfg M osmo-msc-master/osmo-msc.cfg 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-msc-latest/osmo-msc.cfg b/osmo-msc-latest/osmo-msc.cfg index 1261160..91c9eee 100644 --- a/osmo-msc-latest/osmo-msc.cfg +++ b/osmo-msc-latest/osmo-msc.cfg @@ -9,8 +9,6 @@ mobile network code 1 short name OsmoMSC long name OsmoMSC - auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 diff --git a/osmo-msc-master/osmo-msc.cfg b/osmo-msc-master/osmo-msc.cfg index 1261160..91c9eee 100644 --- a/osmo-msc-master/osmo-msc.cfg +++ b/osmo-msc-master/osmo-msc.cfg @@ -9,8 +9,6 @@ mobile network code 1 short name OsmoMSC long name OsmoMSC - auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 -- To view, visit https://gerrit.osmocom.org/12721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I101b69c5c25252cac346259d8d88f3e02bc943d6 Gerrit-Change-Number: 12721 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:56:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:56:30 +0000 Subject: Change in osmo-msc[master]: Use transaction-specific debug macro In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro ...................................................................... Patch Set 3: I would like to get neels' feedback here, as he's working mostly on the osmo-msc -- To view, visit https://gerrit.osmocom.org/12579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 12:56:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:58:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:58:29 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 12:58:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 12:58:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 12:58:30 +0000 Subject: Change in osmo-bsc[master]: LCLS: use libosmocore function to add status In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status ...................................................................... LCLS: use libosmocore function to add status * use gsm0808_create_ass_compl2() to add BSS Status IE to Assignment Complete message * drop local helpers Depends-on: (libosmocore) I547c6b8707123aa8c1ef636db88908df112d90a4 Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Related: OS#2487 --- M include/osmocom/bsc/osmo_bsc_lcls.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 3 files changed, 4 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h index c8b0ebd..d98fe98 100644 --- a/include/osmocom/bsc/osmo_bsc_lcls.h +++ b/include/osmocom/bsc/osmo_bsc_lcls.h @@ -37,5 +37,3 @@ void lcls_apply_config(struct gsm_subscriber_connection *conn); extern struct osmo_fsm lcls_fsm; - -void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a24f7f9..2ad3959 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -175,10 +175,10 @@ } } - resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, - chosen_channel, - lchan->encr.alg_id, perm_spch, - addr_local_p, sc_ptr, NULL); + resp = gsm0808_create_ass_compl2(lchan->abis_ip.ass_compl.rr_cause, + chosen_channel, + lchan->encr.alg_id, perm_spch, + addr_local_p, sc_ptr, NULL, lcls_get_status(conn)); if (!resp) { assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, @@ -186,9 +186,6 @@ return; } - /* Add LCLS BSS-Status IE in case there is any LCLS status for this connection */ - bssmap_add_lcls_status_if_needed(conn, resp); - rc = gscon_sigtran_send(conn, resp); if (rc) { assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index e4459da..f7b84e1 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -864,35 +864,3 @@ .log_subsys = DLCLS, .event_names = lcls_event_names, }; - -/* Add the LCLS BSS Status IE to a BSSMAP message. We assume this is - * called on a msgb that was returned by gsm0808_create_ass_compl() */ -static void bssmap_add_lcls_status(struct msgb *msg, enum gsm0808_lcls_status status) -{ - OSMO_ASSERT(msg->l3h[0] == BSSAP_MSG_BSS_MANAGEMENT); - OSMO_ASSERT(msg->l3h[2] == BSS_MAP_MSG_ASSIGMENT_COMPLETE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_COMPLETE || - msg->l3h[2] == BSS_MAP_MSG_HANDOVER_PERFORMED); - OSMO_ASSERT(msgb_tailroom(msg) >= 2); - - /* append IE to end of message */ - msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); - /* increment the "length" byte in the BSSAP header */ - msg->l3h[1] += 2; -} - -/* Add (append) the LCLS BSS Status IE to a BSSMAP message, if there is any LCLS - * active on the given \a conn */ -void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - enum gsm0808_lcls_status status = lcls_get_status(conn); - if (status != GSM0808_LCLS_STS_NA) { - LOGPFSM(conn->fi, "Adding LCLS BSS-Status (%s) to %s\n", - gsm0808_lcls_status_name(status), - gsm0808_bssmap_name(msg->l3h[2])); - bssmap_add_lcls_status(msg, status); - } -} - - -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:20:07 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 13:20:07 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: Clarify transaction ID assignment ...................................................................... Removed Code-Review-2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:25:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 13:25:24 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 4: Hmm, > We can add another patch on top of latest revision which drops > this parameter - should be trivial merge of wrapper into function. since we I've decided to get rid of this flag, I don't see any benefits of clarifying its meaning and adding additional wrappers, TBH. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 13:25:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:27:01 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 13:27:01 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12519/4/include/osmocom/msc/transaction.h File include/osmocom/msc/transaction.h: https://gerrit.osmocom.org/#/c/12519/4/include/osmocom/msc/transaction.h at 12 PS4, Line 12: TRAN_SKIP I also don't like this naming. Why 'tran'? The existing code is using 'trans'. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 13:27:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:41:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 13:41:28 +0000 Subject: Change in osmo-msc[master]: ciph command: return more meaningful cause values In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/7059 ) Change subject: ciph command: return more meaningful cause values ...................................................................... Abandoned I've tried to rebase this, but the relevant code has completely changed (it is from March of last year after all). There's a new "ran_conn_geran_set_cipher_mode()" function for example. If this is still necessary, it should be better done from scratch. -- To view, visit https://gerrit.osmocom.org/7059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4db77fea1a4bcd161218582126a5d83ca171f7cb Gerrit-Change-Number: 7059 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:50:54 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 13:50:54 +0000 Subject: Change in osmo-msc[master]: Clarify transaction ID assignment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12519 ) Change subject: Clarify transaction ID assignment ...................................................................... Patch Set 4: > since we I've decided to get rid of this flag When? I don't recall such decision. I've proposed to remove it since it was neither used nor documented so it only added confusion. However, as it's part of the spec with clearly defined meaning than I don't mind keeping it if it's properly documented. I also don't mind removing it. The former already have a patch ready to be merged. And it doesn't prevent us from removing it if we'll actually settle on this decision. -- To view, visit https://gerrit.osmocom.org/12519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0 Gerrit-Change-Number: 12519 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 29 Jan 2019 13:50:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 13:53:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 29 Jan 2019 13:53:17 +0000 Subject: Change in osmo-bsc[master]: make MSC Release (MSCR) configurable In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11884 ) Change subject: make MSC Release (MSCR) configurable ...................................................................... Abandoned Not useful, see the discussion here: https://osmocom.org/issues/3697 -- To view, visit https://gerrit.osmocom.org/11884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7c3c64c876e2d8e08291ca4be7bd3249979430cb Gerrit-Change-Number: 11884 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:19:04 2019 From: gerrit-no-reply at lists.osmocom.org (Rafael Diniz) Date: Tue, 29 Jan 2019 14:19:04 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Rafael Diniz has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: > (1 comment) > > I'm curious about use-case: I thought nowadays most setups use > systemd service file to take care of daemonization. Where do you > plan to use it? Hi Max. I'm migrating all my systems to BSD init style (Slackware distribution), as systemd is getting worse and worse every day. -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 14:19:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:20:27 2019 From: gerrit-no-reply at lists.osmocom.org (Rafael Diniz) Date: Tue, 29 Jan 2019 14:20:27 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Rafael Diniz has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 14:20:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 29 14:22:37 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 Jan 2019 14:22:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#847?= In-Reply-To: <1251713519.113.1548766122839.JavaMail.jenkins@jenkins.osmocom.org> References: <1251713519.113.1548766122839.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1402094322.114.1548771757208.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:23:49 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 14:23:49 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: Code-Review-1 > Patch Set 1: Code-Review+2 Wait, wait, I don't see that all comments were addressed. Why CR+2? -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 14:23:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:27:39 2019 From: gerrit-no-reply at lists.osmocom.org (Rafael Diniz) Date: Tue, 29 Jan 2019 14:27:39 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Rafael Diniz has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: (1 comment) > > Patch Set 1: Code-Review+2 > > Wait, wait, I don't see that all comments were addressed. Why CR+2? Sorry, never used this before. Bumped a button by accident. https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 63 PS1, Line 63: static int daemonize = 0; > If it's only used as true/false than please use bool for type to reflect that. I just copied the way osmo-mgw does, and in there it uses int. Can I use C99 bool? -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 14:27:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:32:43 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 14:32:43 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/12718/1/src/pcu_main.cpp at 63 PS1, Line 63: static int daemonize = 0; > I just copied the way osmo-mgw does, and in there it uses int. [?] Sure, if you do 'git grep -n bool' you'll see that it's actively used already in many places. -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 1 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 14:32:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 14:34:12 2019 From: gerrit-no-reply at lists.osmocom.org (Rafael Diniz) Date: Tue, 29 Jan 2019 14:34:12 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12718 to look at the new patch set (#2). Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Added support for daemonize to osmo-pcu. Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 --- M src/pcu_main.cpp 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/12718/2 -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 2 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 15:03:32 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 Jan 2019 15:03:32 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 2 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 15:03:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 29 15:10:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 Jan 2019 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#385?= In-Reply-To: <1898799632.98.1548688206847.JavaMail.jenkins@jenkins.osmocom.org> References: <1898799632.98.1548688206847.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1071721360.116.1548774606979.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Jan 29 15:51:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 15:51:41 +0000 Subject: Change in osmo-sysmon[master]: Update Makefile.am In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12711 ) Change subject: Update Makefile.am ...................................................................... Patch Set 4: (1 comment) This change is ready for review. https://gerrit.osmocom.org/#/c/12711/2/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/12711/2/.gitignore at 62 PS2, Line 62: libintern.la > let's please keep the 'simlpe_ctrl' in the name. Another patch (WIP) will add OpenVPN probe which will use generic tcp client which might be reused by simple_ctrl and end-up in convenience library as well. Maybe call it libinternal as in latest revision to keep it more generic? -- To view, visit https://gerrit.osmocom.org/12711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 Gerrit-Change-Number: 12711 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 15:51:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 15:54:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 15:54:06 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 8: (1 comment) N. B: we should double-check yocto recipe to make sure it reflects this new dependency. https://gerrit.osmocom.org/#/c/12710/1/src/osysmon_main.c File src/osysmon_main.c: https://gerrit.osmocom.org/#/c/12710/1/src/osysmon_main.c at 211 PS1, Line 211: osysmon_file_init(); > I guess it's down to personal preference, but I'd like to avoid if(n)def for this if possible. [?] Latest revision just use liboping unconditionally which should address this. -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 29 Jan 2019 15:54:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 16:26:44 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 29 Jan 2019 16:26:44 +0000 Subject: Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12446/2/include/osmocom/msc/neighbor_ident.h File include/osmocom/msc/neighbor_ident.h: https://gerrit.osmocom.org/#/c/12446/2/include/osmocom/msc/neighbor_ident.h at 24 PS2, Line 24: int point_code; /* BSC */ should probably be struct osmo_sccp_addr -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 29 Jan 2019 16:26:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 17:20:59 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 17:20:59 +0000 Subject: Change in libosmo-netif[master]: Stream examples: filter internal logging Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12722 Change subject: Stream examples: filter internal logging ...................................................................... Stream examples: filter internal logging Set category filter to make sure internal library logging won't interfere with example's own logging. It's also nice example illustrating log_set_category_filter() usage. Change-Id: I17d7878d302f011d8ff0d86708d677f5b559299e --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/22/12722/1 diff --git a/examples/stream-client.c b/examples/stream-client.c index 92f6fd3..3c3416f 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -100,6 +100,7 @@ msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_cli_test_log_info); log_set_log_level(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLINP, 0, LOGL_INFO); /* * initialize stream cli. diff --git a/examples/stream-server.c b/examples/stream-server.c index 0c5e351..08c3d2a 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -125,6 +125,7 @@ msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_srv_test_log_info); log_set_log_level(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLINP, 0, LOGL_INFO); /* * initialize stream srv. -- To view, visit https://gerrit.osmocom.org/12722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I17d7878d302f011d8ff0d86708d677f5b559299e Gerrit-Change-Number: 12722 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 17:21:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 17:21:00 +0000 Subject: Change in libosmo-netif[master]: Stream examples: log sent/received bytes Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12723 Change subject: Stream examples: log sent/received bytes ...................................................................... Stream examples: log sent/received bytes Make client and server examples more verbose by logging actual bytes sent/received. Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/12723/1 diff --git a/examples/stream-client.c b/examples/stream-client.c index 3c3416f..6178dcd 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -45,19 +45,26 @@ static int read_cb(struct osmo_stream_cli *conn) { + int bytes; struct msgb *msg; - LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n"); + LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... "); msg = msgb_alloc(1024, "STREAMCLIENT/test"); if (msg == NULL) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); return 0; } - if (osmo_stream_cli_recv(conn, msg) < 0) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); + + bytes = osmo_stream_cli_recv(conn, msg); + + if (bytes < 0) { + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); return 0; } + + LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); + msgb_free(msg); return 0; } @@ -86,7 +93,7 @@ osmo_stream_cli_send(conn, msg); - LOGP(DSTREAMTEST, LOGL_NOTICE, "message of %d bytes sent\n", msg->len); + LOGP(DSTREAMTEST, LOGL_NOTICE, "sent %d bytes message: %s\n", msg->len, msgb_hexdump(msg)); return 0; } diff --git a/examples/stream-server.c b/examples/stream-server.c index 08c3d2a..cd6dc57 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -43,19 +43,25 @@ int read_cb(struct osmo_stream_srv *conn) { + int bytes; struct msgb *msg; - LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n"); + LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... "); msg = msgb_alloc(1024, "STREAMSERVER/test"); if (msg == NULL) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); return 0; } - if (osmo_stream_srv_recv(conn, msg) < 0) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); + + bytes = osmo_stream_srv_recv(conn, msg); + + if (bytes < 0) { + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); return 0; - } + } else + LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); + msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/12723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a Gerrit-Change-Number: 12723 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 17:21:00 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 17:21:00 +0000 Subject: Change in libosmo-netif[master]: Stream examples: fix server's endless loop Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12724 Change subject: Stream examples: fix server's endless loop ...................................................................... Stream examples: fix server's endless loop Stream server example had an error which resulted in infinite loop on client disconnect. Fix this by properly handling client closing connection to allow it to reconnect multiple times. Change-Id: Icfc2cf7f971b9e3a4abc34cc18d8a44c811c5617 --- M examples/stream-server.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/12724/1 diff --git a/examples/stream-server.c b/examples/stream-server.c index cd6dc57..31487a0 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -56,9 +56,12 @@ bytes = osmo_stream_srv_recv(conn, msg); - if (bytes < 0) { - LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); - return 0; + if (bytes <= 0) { + if (bytes < 0) + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); + else + LOGPC(DSTREAMTEST, LOGL_ERROR, "client closed connection\n"); + osmo_stream_srv_destroy(conn); } else LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); -- To view, visit https://gerrit.osmocom.org/12724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icfc2cf7f971b9e3a4abc34cc18d8a44c811c5617 Gerrit-Change-Number: 12724 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 17:37:51 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 29 Jan 2019 17:37:51 +0000 Subject: Change in osmo-sip-connector[master]: Support Emergency Calling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12682 ) Change subject: Support Emergency Calling ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/12682/8/src/mncc.c at 429 PS8, Line 429: return close_connection(conn); > Please stop debating the obvious. I'm not debating anything. I'm asking questions to a person with different understanding of the code to, hopefully, improve my own understanding of it. -- To view, visit https://gerrit.osmocom.org/12682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 Gerrit-Change-Number: 12682 Gerrit-PatchSet: 11 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 Jan 2019 17:37:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 20:16:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 29 Jan 2019 20:16:21 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Patch Set 3: Code-Review-2 Agree with Harald. -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 29 Jan 2019 20:16:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 20:31:41 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 29 Jan 2019 20:31:41 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 2 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Tue, 29 Jan 2019 20:31:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 29 21:54:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 Jan 2019 21:54:52 +0000 Subject: Change in osmo-ci[master]: ansible/install-poky-sdk: Use "-y" command line argument Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12725 Change subject: ansible/install-poky-sdk: Use "-y" command line argument ...................................................................... ansible/install-poky-sdk: Use "-y" command line argument At least with current ansible, this patch is required to avoid the poky SDK installer waiting indefinitely to somebody answering his prompts on stdin. Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 --- M ansible/roles/install-poky-sdk/tasks/main.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/12725/1 diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml b/ansible/roles/install-poky-sdk/tasks/main.yml index dda60c5..9d64347 100644 --- a/ansible/roles/install-poky-sdk/tasks/main.yml +++ b/ansible/roles/install-poky-sdk/tasks/main.yml @@ -19,7 +19,7 @@ tags: [poky] - name: execute poky installer - command: "/tmp/{{ poky_installer_file }}" + command: "/tmp/{{ poky_installer_file }} -y" args: creates: "/opt/poky/{{ poky_version }}" when: poky_copy.failed == false -- To view, visit https://gerrit.osmocom.org/12725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 Gerrit-Change-Number: 12725 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jan 29 23:20:45 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 Jan 2019 23:20:45 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_?= =?UTF-8?Q?=C2=BB_oct,master,0,default,osmocom-master-debian9_#1740?= In-Reply-To: <1530283359.109.1548757915792.JavaMail.jenkins@jenkins.osmocom.org> References: <1530283359.109.1548757915792.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2088059406.118.1548804045186.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:24:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 09:24:34 +0000 Subject: Change in osmo-ci[master]: ansible/install-poky-sdk: Use "-y" command line argument In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12725 ) Change subject: ansible/install-poky-sdk: Use "-y" command line argument ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 Gerrit-Change-Number: 12725 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 30 Jan 2019 09:24:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:34:18 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 Jan 2019 09:34:18 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12679 to look at the new patch set (#2). Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/12679/2 -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:34:18 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 Jan 2019 09:34:18 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#6). Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... bsc_vty: add features to disable specific lchans via vty In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us sen lchans from LCHAN_ST_UNUSED to LCHAN_ST_BORKEN and vice versa. Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/6 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:34:18 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 Jan 2019 09:34:18 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12625 to look at the new patch set (#5). Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... assignment_fsm: fix channel allocator preferences When the MSC allocates a channel through the ASSIGNMENT REQUEST, it may ask for a TCH/H and a TCH/F at the same time and tell which of the two types it prefers. The process of channel allocation currently selects, based on the BTS, MSC and MS capabilites exactly one apropriate codec/rate (e.g. TCH/H) and then tries to allocate it. If that allocation fails, there is no way to try the second choice and the assignment fails. For example: The MSC asks for TCH/F and TCH/H, prefering TCH/F, then the channel allocator will try TCH/F and if it fails (all TCH/F are currently in use), then TCH/H is never tried. Since the BSC currently only trys the first best codec/rate that is supported it also ignores the preference. Lets fix those problems by including the preference information and both possible codec/rate settings into the channel allocation decision. Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Related: OS#3503 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 7 files changed, 366 insertions(+), 119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/12625/5 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:36:25 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 30 Jan 2019 09:36:25 +0000 Subject: Change in osmo-bts[master]: systemd: Install OC2G service files with autotools Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12726 Change subject: systemd: Install OC2G service files with autotools ...................................................................... systemd: Install OC2G service files with autotools Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 --- M contrib/systemd/Makefile.am 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/12726/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index b07299d..f34437c 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -24,5 +24,9 @@ SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service endif +if ENABLE_OC2GBTS +SYSTEMD_SERVICES += osmo-bts-oc2g.service oc2gbts-mgr.service +endif + systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 Gerrit-Change-Number: 12726 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:36:25 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 30 Jan 2019 09:36:25 +0000 Subject: Change in osmo-bts[master]: doc/examples: Install OC2G config files with autotools Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12727 Change subject: doc/examples: Install OC2G config files with autotools ...................................................................... doc/examples: Install OC2G config files with autotools Change-Id: I2fd587e91b5e0e4cd1b8ffa781f65dbfd4484f19 --- M doc/examples/Makefile.am 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/27/12727/1 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 04f8279..3799069 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -42,5 +42,14 @@ OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif +if ENABLE_OC2GBTS +doc_oc2gdir = $(docdir)/examples/osmo-bts-oc2g +doc_oc2g_DATA = \ + oc2g/osmo-bts-oc2g.cfg \ + oc2g/oc2gbts-mgr.cfg +EXTRA_DIST += $(doc_oc2g_DATA) +OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg +endif + osmoconfdir = $(sysconfdir)/osmocom osmoconf_DATA = $(OSMOCONF_FILES) -- To view, visit https://gerrit.osmocom.org/12727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2fd587e91b5e0e4cd1b8ffa781f65dbfd4484f19 Gerrit-Change-Number: 12727 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 09:38:12 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 Jan 2019 09:38:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix vty interface for channel allocator tests Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12728 Change subject: BSC_Tests: fix vty interface for channel allocator tests ...................................................................... BSC_Tests: fix vty interface for channel allocator tests The tests presented in Change I109d986dd7ece1a56422a669ca64353ed46f7ed6, are using a slightly outdated vty syntax and fail because of that. Lets update the VTY syntax. Change-Id: I302e8872dbdc8e65d51902a881f777863de22915 Related: OS#3503 --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/12728/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a6f9f7d..af32b8c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2054,24 +2054,24 @@ } private function f_disable_all_tch_f() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 borken"); } private function f_disable_all_tch_h() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 borken"); } private function f_enable_all_tch() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 unused"); } /* Allow HR only */ -- To view, visit https://gerrit.osmocom.org/12728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I302e8872dbdc8e65d51902a881f777863de22915 Gerrit-Change-Number: 12728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 10:48:30 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 10:48:30 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 10:48:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 10:48:38 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 Jan 2019 10:48:38 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11642 to look at the new patch set (#35). Change subject: Add SGs Interface ...................................................................... Add SGs Interface Add an SGs interface (3GPP TS 29.118) to osmo-msc in order to support SMS tunneling and Circuit Switched Fallback (CSFB) Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/ran_conn.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_server.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/ran_conn.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_server.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c A tests/msc_vlr/stubs.h M tests/sms_queue/sms_queue_test.c M tests/test_nodes.vty 48 files changed, 2,936 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/35 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 35 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 10:48:58 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 10:48:58 +0000 Subject: Change in osmo-bts[master]: systemd: Install OC2G service files with autotools In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12726 ) Change subject: systemd: Install OC2G service files with autotools ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 Gerrit-Change-Number: 12726 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 30 Jan 2019 10:48:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:20:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:20:30 +0000 Subject: Change in osmo-bts[master]: systemd: Install OC2G service files with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12726 ) Change subject: systemd: Install OC2G service files with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 Gerrit-Change-Number: 12726 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 12:20:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:20:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:20:38 +0000 Subject: Change in osmo-bts[master]: doc/examples: Install OC2G config files with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12727 ) Change subject: doc/examples: Install OC2G config files with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2fd587e91b5e0e4cd1b8ffa781f65dbfd4484f19 Gerrit-Change-Number: 12727 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 12:20:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:20:42 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:20:42 +0000 Subject: Change in osmo-bts[master]: systemd: Install OC2G service files with autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12726 ) Change subject: systemd: Install OC2G service files with autotools ...................................................................... systemd: Install OC2G service files with autotools Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 --- M contrib/systemd/Makefile.am 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index b07299d..f34437c 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -24,5 +24,9 @@ SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service endif +if ENABLE_OC2GBTS +SYSTEMD_SERVICES += osmo-bts-oc2g.service oc2gbts-mgr.service +endif + systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifd37b6a01ad9007a9e887fe3dd208dc74047b4d8 Gerrit-Change-Number: 12726 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:20:43 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:20:43 +0000 Subject: Change in osmo-bts[master]: doc/examples: Install OC2G config files with autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12727 ) Change subject: doc/examples: Install OC2G config files with autotools ...................................................................... doc/examples: Install OC2G config files with autotools Change-Id: I2fd587e91b5e0e4cd1b8ffa781f65dbfd4484f19 --- M doc/examples/Makefile.am 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 04f8279..3799069 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -42,5 +42,14 @@ OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif +if ENABLE_OC2GBTS +doc_oc2gdir = $(docdir)/examples/osmo-bts-oc2g +doc_oc2g_DATA = \ + oc2g/osmo-bts-oc2g.cfg \ + oc2g/oc2gbts-mgr.cfg +EXTRA_DIST += $(doc_oc2g_DATA) +OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg +endif + osmoconfdir = $(sysconfdir)/osmocom osmoconf_DATA = $(OSMOCONF_FILES) -- To view, visit https://gerrit.osmocom.org/12727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2fd587e91b5e0e4cd1b8ffa781f65dbfd4484f19 Gerrit-Change-Number: 12727 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:22:28 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:22:28 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 12:22:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:22:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:22:54 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 8: Code-Review+1 pelase make sure to submit a related patch to meta-telephony for the liboping dependency -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 12:22:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:23:23 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:23:23 +0000 Subject: Change in osmo-sysmon[master]: Update Makefile.am In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12711 ) Change subject: Update Makefile.am ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 Gerrit-Change-Number: 12711 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 30 Jan 2019 12:23:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:23:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:23:52 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 35: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 35 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 30 Jan 2019 12:23:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:24:09 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:24:09 +0000 Subject: Change in osmo-msc[master]: Add SGs Interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11642 ) Change subject: Add SGs Interface ...................................................................... Patch Set 35: fine with me, but let's give Neels the final say as he's doing loads of MSC work at the moment. -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 35 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 30 Jan 2019 12:24:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:25:16 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:25:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix vty interface for channel allocator tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12728 ) Change subject: BSC_Tests: fix vty interface for channel allocator tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I302e8872dbdc8e65d51902a881f777863de22915 Gerrit-Change-Number: 12728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 30 Jan 2019 12:25:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:25:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:25:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix vty interface for channel allocator tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12728 ) Change subject: BSC_Tests: fix vty interface for channel allocator tests ...................................................................... BSC_Tests: fix vty interface for channel allocator tests The tests presented in Change I109d986dd7ece1a56422a669ca64353ed46f7ed6, are using a slightly outdated vty syntax and fail because of that. Lets update the VTY syntax. Change-Id: I302e8872dbdc8e65d51902a881f777863de22915 Related: OS#3503 --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a6f9f7d..af32b8c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2054,24 +2054,24 @@ } private function f_disable_all_tch_f() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 borken"); } private function f_disable_all_tch_h() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 disable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 disable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 borken"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 borken"); } private function f_enable_all_tch() runs on test_CT { - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 enable"); - f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 enable"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 1 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 2 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 3 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 4 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 0 unused"); + f_vty_transceive(BSCVTY, "bts 0 trx 0 timeslot 5 sub-slot 1 unused"); } /* Allow HR only */ -- To view, visit https://gerrit.osmocom.org/12728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I302e8872dbdc8e65d51902a881f777863de22915 Gerrit-Change-Number: 12728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:25:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:25:52 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 Jan 2019 12:25:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:26:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:26:03 +0000 Subject: Change in osmo-ci[master]: ansible/install-poky-sdk: Use "-y" command line argument In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12725 ) Change subject: ansible/install-poky-sdk: Use "-y" command line argument ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 Gerrit-Change-Number: 12725 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 30 Jan 2019 12:26:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:26:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:26:04 +0000 Subject: Change in osmo-ci[master]: ansible/install-poky-sdk: Use "-y" command line argument In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12725 ) Change subject: ansible/install-poky-sdk: Use "-y" command line argument ...................................................................... ansible/install-poky-sdk: Use "-y" command line argument At least with current ansible, this patch is required to avoid the poky SDK installer waiting indefinitely to somebody answering his prompts on stdin. Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 --- M ansible/roles/install-poky-sdk/tasks/main.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml b/ansible/roles/install-poky-sdk/tasks/main.yml index dda60c5..9d64347 100644 --- a/ansible/roles/install-poky-sdk/tasks/main.yml +++ b/ansible/roles/install-poky-sdk/tasks/main.yml @@ -19,7 +19,7 @@ tags: [poky] - name: execute poky installer - command: "/tmp/{{ poky_installer_file }}" + command: "/tmp/{{ poky_installer_file }} -y" args: creates: "/opt/poky/{{ poky_version }}" when: poky_copy.failed == false -- To view, visit https://gerrit.osmocom.org/12725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I084a5a152f00bbd484f5616d417fa1486cb79413 Gerrit-Change-Number: 12725 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:26:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:26:18 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 2 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Wed, 30 Jan 2019 12:26:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:26:20 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 12:26:20 +0000 Subject: Change in osmo-pcu[master]: Added support for daemonize to osmo-pcu. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12718 ) Change subject: Added support for daemonize to osmo-pcu. ...................................................................... Added support for daemonize to osmo-pcu. Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 --- M src/pcu_main.cpp 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 7480842..fe85160 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -60,6 +60,7 @@ extern void *bv_tall_ctx; static int quit = 0; static int rt_prio = -1; +static bool daemonize = false; static const char *gsmtap_addr = "localhost"; // FIXME: use gengetopt's default value instead static void print_help() @@ -75,6 +76,8 @@ " -V --version print version\n" " -r --realtime PRIO Use SCHED_RR with the specified " "priority\n" + " -D --daemonize Fork the process into a background" + "daemon\n" " -i --gsmtap-ip The destination IP used for GSMTAP.\n" ); } @@ -91,12 +94,13 @@ { "mnc", 1, 0, 'n' }, { "version", 0, 0, 'V' }, { "realtime", 1, 0, 'r' }, + { "daemonize", 0, 0, 'D' }, { "exit", 0, 0, 'e' }, { "gsmtap-ip", 1, 0, 'i' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hc:m:n:Vr:e:i:", + c = getopt_long(argc, argv, "hc:m:n:Vr:De:i:", long_options, &option_idx); if (c == -1) break; @@ -130,6 +134,9 @@ case 'r': rt_prio = atoi(optarg); break; + case 'D': + daemonize = true; + break; case 'e': fprintf(stderr, "Warning: Option '-e' is deprecated!\n"); break; @@ -329,6 +336,14 @@ } } + if (daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + while (!quit) { osmo_gsm_timers_check(); osmo_gsm_timers_prepare(); -- To view, visit https://gerrit.osmocom.org/12718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia889544e0a350b6bab55da4e4201a617e0241ea2 Gerrit-Change-Number: 12718 Gerrit-PatchSet: 2 Gerrit-Owner: Rafael Diniz Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Rafael Diniz Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 12:28:17 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 12:28:17 +0000 Subject: Change in osmo-sysmon[master]: Update Makefile.am In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12711 ) Change subject: Update Makefile.am ...................................................................... Update Makefile.am The simple_ctrl.c is used by 2 independent binaries. Let's build it as a convenience libtool library [1] to make it easier to add further external dependencies in future. While at it, also move osmo-sysmon dependencies to program-specific _CFLAGS from generic one. [1] https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 --- M .gitignore M src/Makefile.am 2 files changed, 8 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index c89e9b0..db2ef01 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ tests/testsuite.log writtenconfig/ +libintern.la diff --git a/src/Makefile.am b/src/Makefile.am index 412337b..cb85da2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +LDADD = libintern.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) AM_CPPFLAGS = \ $(all_includes) \ @@ -9,8 +9,6 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBMNL_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -22,6 +20,12 @@ osmo-ctrl-client \ $(NULL) +noinst_LTLIBRARIES = libintern.la +libintern_la_SOURCES = simple_ctrl.c +libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + +osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(AM_CFLAGS) + osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ @@ -29,7 +33,6 @@ osmo_sysmon_SOURCES = \ value_node.c \ - simple_ctrl.c \ osysmon_ctrl.c \ osysmon_sysinfo.c \ osysmon_rtnl.c \ @@ -37,11 +40,6 @@ osysmon_main.c \ $(NULL) -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - noinst_HEADERS = \ osysmon.h \ simple_ctrl.h \ -- To view, visit https://gerrit.osmocom.org/12711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 Gerrit-Change-Number: 12711 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 14:03:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 14:03:03 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12679/2/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12679/2/src/osmo-bsc/bsc_vty.c at 1568 PS2, Line 1568: "Short summary (in use lchans)\n" i notice only now, bit of weird english: "lchans in use" or "used lchans" -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 14:03:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 14:06:41 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 14:06:41 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 6: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12624/6/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12624/6/src/osmo-bsc/bsc_vty.c at 4794 PS6, Line 4794: "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (borken|unused)", heh you're adopting my weird spelling in the UI :) https://gerrit.osmocom.org/#/c/12624/6/src/osmo-bsc/bsc_vty.c at 4811 PS6, Line 4811: lchan->fi->state = LCHAN_ST_BORKEN; whoa. please use osmo_fsm_inst_state_chg() https://gerrit.osmocom.org/#/c/12624/6/src/osmo-bsc/bsc_vty.c at 4822 PS6, Line 4822: lchan->fi->state = LCHAN_ST_UNUSED; same -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 Jan 2019 14:06:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 14:37:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 14:37:17 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: fix spaces/tabs in mgcp_requests[] Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12729 Change subject: Cosmetic: fix spaces/tabs in mgcp_requests[] ...................................................................... Cosmetic: fix spaces/tabs in mgcp_requests[] Change-Id: I2e8ef83b231b7d7b71e533d0699afea433d635aa --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/29/12729/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index eaf0e5a..f141485 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -177,13 +177,13 @@ * for performance reasons. */ static const struct mgcp_request mgcp_requests[] = { MGCP_REQUEST("AUEP", handle_audit_endpoint, "AuditEndpoint") - MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection") - MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection") - MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection") - MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest") + MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection") + MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection") + MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection") + MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest") - /* SPEC extension */ - MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress") + /* SPEC extension */ + MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress") }; /* Helper function to allocate some memory for responses and retransmissions */ -- To view, visit https://gerrit.osmocom.org/12729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2e8ef83b231b7d7b71e533d0699afea433d635aa Gerrit-Change-Number: 12729 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 14:37:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 14:37:18 +0000 Subject: Change in osmo-mgw[master]: Auto-cleanup inactive connections Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12730 Change subject: Auto-cleanup inactive connections ...................................................................... Auto-cleanup inactive connections Add a three minutes watchdog timer to connections, and close these connections when the watchdog timer expires. Kick the watchdog whenever RTP messages or MGCP messages (only makes sense for MDCX) arrive. Related: OS#3429 Change-Id: I18886052e090466f73829133c24f011806cc1fe0 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c 4 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index f75ae8b..656b929 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -37,6 +37,9 @@ #define CONN_ID_BTS "0" #define CONN_ID_NET "1" +/* Kill connections without any RTP or MGCP (MDCX) messages after 3 minutes */ +#define MGCP_CONN_TIMEOUT 180 + enum mgcp_trunk_type { MGCP_TRUNK_VIRTUAL, MGCP_TRUNK_E1, @@ -231,6 +234,9 @@ /*! human readable name (vty, logging) */ char name[256]; + /*! activity tracker (for cleaning up inactive connections) */ + struct osmo_timer_list watchdog; + /*! union with connection description */ union { struct mgcp_conn_rtp rtp; @@ -328,3 +334,4 @@ #define PTYPE_UNDEFINED (-1) void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); +void mgcp_conn_watchdog_kick(struct mgcp_conn *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index fce8a78..63306d5 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -29,6 +29,7 @@ #include #include #include +#include #include const static struct rate_ctr_group_desc rate_ctr_group_desc = { @@ -125,6 +126,19 @@ rate_ctr_group_free(conn_rtp->rate_ctr_group); } +void mgcp_conn_watchdog_cb(void *data) +{ + struct mgcp_conn *conn = data; + LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x CI:%s connection timed out!\n", ENDPOINT_NUMBER(conn->endp), conn->id); + mgcp_conn_free(conn->endp, conn->id); +} + +void mgcp_conn_watchdog_kick(struct mgcp_conn *conn) +{ + LOGP(DLMGCP, LOGL_DEBUG, "endpoint:0x%x CI:%s watchdog kicked\n", ENDPOINT_NUMBER(conn->endp), conn->id); + osmo_timer_schedule(&conn->watchdog, MGCP_CONN_TIMEOUT, 0); +} + /*! allocate a new connection list entry. * \param[in] ctx talloc context * \param[in] endp associated endpoint @@ -167,6 +181,9 @@ OSMO_ASSERT(false); } + /* Initialize watchdog */ + osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn); + mgcp_conn_watchdog_kick(conn); llist_add(&conn->entry, &endp->conns); return conn; @@ -274,6 +291,7 @@ OSMO_ASSERT(false); } + osmo_timer_del(&conn->watchdog); llist_del(&conn->entry); talloc_free(conn); } diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 7af8e71..2c86f8f 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1246,6 +1246,8 @@ if (len < 0) return -1; + mgcp_conn_watchdog_kick(conn_src->conn); + /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ if (conn_src->conn->mode == MGCP_CONN_LOOPBACK) { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index f141485..9f95ea4 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1141,6 +1141,8 @@ return create_err_response(endp, 400, "MDCX", p->trans); } + mgcp_conn_watchdog_kick(conn->conn); + if (mode) { if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]); -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Jan 30 15:10:06 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 30 Jan 2019 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#386?= In-Reply-To: <1071721360.116.1548774606979.JavaMail.jenkins@jenkins.osmocom.org> References: <1071721360.116.1548774606979.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2053183778.132.1548861006672.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:14:49 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 15:14:49 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 9: Code-Review-1 (2 comments) It seems like config.h is not needed, otherwise everything looks fine to me. https://gerrit.osmocom.org/#/c/12710/9//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12710/9//COMMIT_MSG at 29 PS9, Line 29: nitpick: empty line here https://gerrit.osmocom.org/#/c/12710/9/src/osysmon.h File src/osysmon.h: https://gerrit.osmocom.org/#/c/12710/9/src/osysmon.h at 9 PS9, Line 9: #include "config.h" Why is config.h needed? -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 15:14:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:50:53 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Wed, 30 Jan 2019 15:50:53 +0000 Subject: Change in osmo-sim-auth[master]: Check return code of u.authenticate() In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12684 ) Change subject: Check return code of u.authenticate() ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sim-auth Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Gerrit-Change-Number: 12684 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Max Gerrit-Comment-Date: Wed, 30 Jan 2019 15:50:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:55:10 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 15:55:10 +0000 Subject: Change in osmo-dev[master]: net: enable saving IMEI in HLR by default Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12731 Change subject: net: enable saving IMEI in HLR by default ...................................................................... net: enable saving IMEI in HLR by default Related: OS#2541 Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a --- M net/tmpl_std/osmo-hlr.cfg M net/tmpl_std/osmo-msc.cfg 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/31/12731/1 diff --git a/net/tmpl_std/osmo-hlr.cfg b/net/tmpl_std/osmo-hlr.cfg index d9b4e6b..4f8a14a 100644 --- a/net/tmpl_std/osmo-hlr.cfg +++ b/net/tmpl_std/osmo-hlr.cfg @@ -3,4 +3,5 @@ ussd route prefix *2# internal own-imsi ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi + store-imei ${include(../common_logging)} diff --git a/net/tmpl_std/osmo-msc.cfg b/net/tmpl_std/osmo-msc.cfg index 9f8fea1..6d235ba 100644 --- a/net/tmpl_std/osmo-msc.cfg +++ b/net/tmpl_std/osmo-msc.cfg @@ -9,6 +9,8 @@ # For nano3G: iu rab-assign-addr-enc x213 + check-imei-rqd 1 + ${include(../common_logging)} logging level ref debug logging level vlr debug -- To view, visit https://gerrit.osmocom.org/12731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a Gerrit-Change-Number: 12731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:55:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 15:55:11 +0000 Subject: Change in osmo-dev[master]: net/tmpl_std: add Makefile for 'make regen' Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12732 Change subject: net/tmpl_std: add Makefile for 'make regen' ...................................................................... net/tmpl_std: add Makefile for 'make regen' Allow using "make regen" in the net dir to regenerate the configs, just like it is possible to type "make regen" in the make dir. This is a minor usability improvement, so one does not need to remember to type ../fill_config.py in the net dir. Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 --- A net/tmpl_std/Makefile 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/32/12732/1 diff --git a/net/tmpl_std/Makefile b/net/tmpl_std/Makefile new file mode 100644 index 0000000..62ae7a7 --- /dev/null +++ b/net/tmpl_std/Makefile @@ -0,0 +1,5 @@ +# Do nothing by default +all: + +regen: + ../fill_config.py -- To view, visit https://gerrit.osmocom.org/12732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 Gerrit-Change-Number: 12732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:55:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 15:55:11 +0000 Subject: Change in osmo-dev[master]: More userfriendly "stale configs" message Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12733 Change subject: More userfriendly "stale configs" message ...................................................................... More userfriendly "stale configs" message Make the message easy to understand at first glance, print what needs to be done to regenerate the configs. Add an empty line before listing the stale file that has been found, so it stands out from the (at this point) less relevant path listings. It now looks like the following: $ ./run.sh using config file '/home/user/code/osmo-dev/net/config_2g3g_osmith' on templates '/home/user/code/osmo-dev/net/tmpl_std' with NET_DIR '/home/user/code/osmo-dev/net/osmith' Stale: '/home/user/code/osmo-dev/net/tmpl_std/run.sh' is newer than 'run.sh' WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on! * Hit enter to continue * Hit ^C and run 'make regen' to regenerate your configs Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c --- M net/fill_config.py M net/tmpl_std/run.sh 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/12733/1 diff --git a/net/fill_config.py b/net/fill_config.py index e97dab7..5374d62 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -96,6 +96,7 @@ def check_stale(src_path, target_path): if file_newer(src_path, target_path): + print() print('Stale: %r is newer than %r' % (src_path, target_path)) exit(1) diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index f31330b..2bc7308 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash -../fill_config.py --check-stale || ( echo "STALE CONFIGS. Hit enter to continue anyway."; read enter_to_continue ) + +if ! ../fill_config.py --check-stale; then + echo + echo "WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on!" + echo " * Hit enter to continue" + echo " * Hit ^C and run 'make regen' to regenerate your configs" + read enter_to_continue +fi dev="${ETH_DEV}" ip2="${PUBLIC_IP2}" -- To view, visit https://gerrit.osmocom.org/12733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c Gerrit-Change-Number: 12733 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:56:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 15:56:07 +0000 Subject: Change in osmo-dev[master]: run.sh: more userfriendly "stale configs" message In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12733 ) Change subject: run.sh: more userfriendly "stale configs" message ...................................................................... run.sh: more userfriendly "stale configs" message Make the message easy to understand at first glance, print what needs to be done to regenerate the configs. Add an empty line before listing the stale file that has been found, so it stands out from the (at this point) less relevant path listings. It now looks like the following: $ ./run.sh using config file '/home/user/code/osmo-dev/net/config_2g3g_osmith' on templates '/home/user/code/osmo-dev/net/tmpl_std' with NET_DIR '/home/user/code/osmo-dev/net/osmith' Stale: '/home/user/code/osmo-dev/net/tmpl_std/run.sh' is newer than 'run.sh' WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on! * Hit enter to continue * Hit ^C and run 'make regen' to regenerate your configs Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c --- M net/fill_config.py M net/tmpl_std/run.sh 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/12733/2 -- To view, visit https://gerrit.osmocom.org/12733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c Gerrit-Change-Number: 12733 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 15:57:12 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 15:57:12 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: do not access conn->assignment.req, it may be outdated Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12734 Change subject: handover_fsm: do not access conn->assignment.req, it may be outdated ...................................................................... handover_fsm: do not access conn->assignment.req, it may be outdated handover_fsm.c accesses conn->assignment.req.s15_s0 to find out the current lchan's AMR configuration. However, conn->assignment.* values are only valid during an ongoing assignment. Those values may be overwritten by any failed Assignment attempt, at any time, and hence do not reflect the currently assigned conn->lchan. Those realms must be kept separate. The assignment.req.s15_s0 get passed to lchan_activate(), so it makes most sense to store these values in struct gsm_lchan once the lchan activation succeeded. Add gsm_lchan.s15_s0, store the s15_s0 received in lchan_activate_info during lchan_activate(). In handover_fsm.c, use conn->lchan->s15_s0 instead of conn->assignment.*. Change-Id: Id8018fd9d56421f2ab7be91703018f6d6f21c929 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c 3 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/12734/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 9f7ce8d..c3d8d64 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -575,6 +575,8 @@ /* AMR bits */ uint8_t mr_ms_lv[7]; uint8_t mr_bts_lv[7]; + /* AMR bits were based on these rate bits: */ + uint16_t s15_s0; /* Established data link layer services */ uint8_t sapis[8]; diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 35f2e55..578cff3 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -715,7 +715,7 @@ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ gsm0808_speech_codec_from_chan_type(&sc, ho_perf_params.speech_version_chosen); - sc.cfg = conn->assignment.req.s15_s0; + sc.cfg = conn->lchan->s15_s0; memcpy(&ho_perf_params.speech_codec_chosen, &sc, sizeof(sc)); ho_perf_params.speech_codec_chosen_present = true; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index f344cf9..70f7622 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -544,6 +544,7 @@ lchan_fail("Can not generate multirate configuration IE\n"); return; } + lchan->s15_s0 = info->s15_s0; } switch (info->chan_mode) { -- To view, visit https://gerrit.osmocom.org/12734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8018fd9d56421f2ab7be91703018f6d6f21c929 Gerrit-Change-Number: 12734 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:02:07 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:02:07 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12625 ) Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... Patch Set 5: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12625/5/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12625/5/src/osmo-bsc/assignment_fsm.c at 340 PS5, Line 340: return -EINVAL; before, I said "it doesn't make sense to fail the assignment if only one of the choices is not supported", but now I'm revising that: it is unlikely to get a GSM48_CMODE that we can't classify, so this is fine. https://gerrit.osmocom.org/#/c/12625/5/src/osmo-bsc/assignment_fsm.c at 497 PS5, Line 497: if (check_for_existing_lchan(conn)) { instead of spraying CR comments I pushed a suggestion instead. Can you please take a look whether that is acceptable to you, and actually test it for me? thanks! My changes to this patch set are a separate commit on branch neels/12625 http://git.osmocom.org/osmo-bsc/commit/?h=neels/12625 (If they are ok then squash into this one) The reasons: - code dup - missing counter - missing send_assignment_complete() error handling - the req struct is coming in during the assignment_start() and should then remain unchanged, i.e. moved req->chan_mode_rate to conn.assignment https://gerrit.osmocom.org/#/c/12625/5/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/12625/5/src/osmo-bsc/handover_fsm.c at 716 PS5, Line 716: sc.cfg = conn->assignment.req.ch_mode_rate.s15_s0; Noticing this problem that exists before this patch: This is reaching into the wrong place. The conn->assignment is only valid *during* an assignment. If you need the ch_mode_rate after assignment is done, it has to be copied out of conn->assignment. The idea is: - assignment_req data represents the request coming in. the request can be accepted or denied. If it is accepted, pass req to assignment_start(). From now on req is cast in stone and is only the input data. - during assignment, keep all state in and only in conn->assignment.*, leave conn->lchan and other conn->* unchanged. - when assignment was successful, copy all relevant data to conn->lchan or conn->foo, so that now conn->assignment is unused. - so that if we start another assignment (which might fail) we do not affect the conn->lchan state. - if assignment fails, leave conn->* unchanged, hence just continue as if no assignment happened at all. I am submitting a patch that puts the s15_s0 bits into struct gsm_lchan after activation, instead: https://gerrit.osmocom.org/#/c/osmo-bsc/+/12734 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 Jan 2019 16:02:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:14:03 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:14:03 +0000 Subject: Change in osmo-dev[master]: net: enable saving IMEI in HLR by default In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12731 ) Change subject: net: enable saving IMEI in HLR by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a Gerrit-Change-Number: 12731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 16:14:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:14:50 +0000 Subject: Change in osmo-dev[master]: net/tmpl_std: add Makefile for 'make regen' In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12732 ) Change subject: net/tmpl_std: add Makefile for 'make regen' ...................................................................... Patch Set 1: Code-Review+2 lol -- To view, visit https://gerrit.osmocom.org/12732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 Gerrit-Change-Number: 12732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 16:14:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:16:48 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:16:48 +0000 Subject: Change in osmo-dev[master]: run.sh: more userfriendly "stale configs" message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12733 ) Change subject: run.sh: more userfriendly "stale configs" message ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh at 6 PS2, Line 6: echo " * Hit enter to continue" "Hit enter to continue, and use the stale config files" https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh at 7 PS2, Line 7: echo " * Hit ^C and run 'make regen' to regenerate your configs" rather "and run 'fill_config.py'" -- To view, visit https://gerrit.osmocom.org/12733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c Gerrit-Change-Number: 12733 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 16:16:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:20:25 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:20:25 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: fix spaces/tabs in mgcp_requests[] In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12729 ) Change subject: Cosmetic: fix spaces/tabs in mgcp_requests[] ...................................................................... Patch Set 1: Code-Review+2 the entire MGCP_REQUEST macro is nonsense, but ok -- To view, visit https://gerrit.osmocom.org/12729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e8ef83b231b7d7b71e533d0699afea433d635aa Gerrit-Change-Number: 12729 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 Jan 2019 16:20:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:33:02 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:33:02 +0000 Subject: Change in osmo-mgw[master]: Auto-cleanup inactive connections In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Auto-cleanup inactive connections ...................................................................... Patch Set 1: Code-Review-1 (2 comments) either add VTY config right here or follow up with a patch to add it. Also allow switching off the timer (to still make legacy behavior possible). Hence call it MGCP_CONN_DEFAULT_TIMEOUT from the start. https://gerrit.osmocom.org/#/c/12730/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12730/1//COMMIT_MSG at 12 PS1, Line 12: arrive. elaborate why it makes sense only for MDCX: - CRCX creates the conn and timer - DLCX deletes the conn and timer - MDCX is the only remaining supported MGCP message that indicates a CI - can't easily generically parse a CI for all MGCP messages, parsing is done in handle_modify_con(). https://gerrit.osmocom.org/#/c/12730/1/include/osmocom/mgcp/mgcp_internal.h File include/osmocom/mgcp/mgcp_internal.h: https://gerrit.osmocom.org/#/c/12730/1/include/osmocom/mgcp/mgcp_internal.h at 41 PS1, Line 41: #define MGCP_CONN_TIMEOUT 180 MGCP_CONN_DEFAULT_TIMEOUT and make it configurable in VTY -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 Jan 2019 16:33:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:38:08 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:38:08 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12716 ) Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12716/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12716/3//COMMIT_MSG at 13 PS3, Line 13: use a reasonable : maximum value of signed 64 bit integer > I think the actual value used is that of a signed 32bit integer? oof! gosh, how did I get that wrong. I guess 32 bit is sufficient then and also gets us to be safe on 32bit time_t systems. -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 30 Jan 2019 16:38:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 Jan 2019 16:46:43 +0000 Subject: Change in libosmocore[master]: add osmo_tdef API, moved from osmo-bsc T_def In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12717 ) Change subject: add osmo_tdef API, moved from osmo-bsc T_def ...................................................................... Patch Set 3: (1 comment) Though the node at which to locate T timer vty config is kept generic, there is no way to define more than one such set of timer definitions per main(). IIUC there might be a foo/T3 and a bar/T3 within the same program? In that case I need to use generic timer definitions handles instead of singleton globals. https://gerrit.osmocom.org/#/c/12717/3/tests/tdef/tdef_vty_test.vty File tests/tdef/tdef_vty_test.vty: https://gerrit.osmocom.org/#/c/12717/3/tests/tdef/tdef_vty_test.vty at 4 PS3, Line 4: tdef > I would appreciate a somewhat more human-readable name like "timer-definitons" instead of just "tdef [?] 'tdef' is just a node created by tdef_vty_test.c, to clarify I'll make it "tdef-vty-test" -- To view, visit https://gerrit.osmocom.org/12717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 Gerrit-Change-Number: 12717 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 16:46:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:52:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:52:48 +0000 Subject: Change in osmo-dev[master]: net: enable saving IMEI in HLR by default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12731 ) Change subject: net: enable saving IMEI in HLR by default ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a Gerrit-Change-Number: 12731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 16:52:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:52:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:52:51 +0000 Subject: Change in osmo-dev[master]: net: enable saving IMEI in HLR by default In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12731 ) Change subject: net: enable saving IMEI in HLR by default ...................................................................... net: enable saving IMEI in HLR by default Related: OS#2541 Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a --- M net/tmpl_std/osmo-hlr.cfg M net/tmpl_std/osmo-msc.cfg 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/net/tmpl_std/osmo-hlr.cfg b/net/tmpl_std/osmo-hlr.cfg index d9b4e6b..4f8a14a 100644 --- a/net/tmpl_std/osmo-hlr.cfg +++ b/net/tmpl_std/osmo-hlr.cfg @@ -3,4 +3,5 @@ ussd route prefix *2# internal own-imsi ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi + store-imei ${include(../common_logging)} diff --git a/net/tmpl_std/osmo-msc.cfg b/net/tmpl_std/osmo-msc.cfg index 9f8fea1..6d235ba 100644 --- a/net/tmpl_std/osmo-msc.cfg +++ b/net/tmpl_std/osmo-msc.cfg @@ -9,6 +9,8 @@ # For nano3G: iu rab-assign-addr-enc x213 + check-imei-rqd 1 + ${include(../common_logging)} logging level ref debug logging level vlr debug -- To view, visit https://gerrit.osmocom.org/12731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I12ab66b5ff2147918e2cb4e9beab8d6a730fdc5a Gerrit-Change-Number: 12731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:52:54 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:52:54 +0000 Subject: Change in osmo-dev[master]: net/tmpl_std: add Makefile for 'make regen' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12732 ) Change subject: net/tmpl_std: add Makefile for 'make regen' ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 Gerrit-Change-Number: 12732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 16:52:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:52:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:52:58 +0000 Subject: Change in osmo-dev[master]: net/tmpl_std: add Makefile for 'make regen' In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12732 ) Change subject: net/tmpl_std: add Makefile for 'make regen' ...................................................................... net/tmpl_std: add Makefile for 'make regen' Allow using "make regen" in the net dir to regenerate the configs, just like it is possible to type "make regen" in the make dir. This is a minor usability improvement, so one does not need to remember to type ../fill_config.py in the net dir. Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 --- A net/tmpl_std/Makefile 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/net/tmpl_std/Makefile b/net/tmpl_std/Makefile new file mode 100644 index 0000000..62ae7a7 --- /dev/null +++ b/net/tmpl_std/Makefile @@ -0,0 +1,5 @@ +# Do nothing by default +all: + +regen: + ../fill_config.py -- To view, visit https://gerrit.osmocom.org/12732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8b23f8ae1f1d6ade597a30a222dfc82ea890d207 Gerrit-Change-Number: 12732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:56:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:56:58 +0000 Subject: Change in osmo-dev[master]: run.sh: more userfriendly "stale configs" message In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12733 to look at the new patch set (#3). Change subject: run.sh: more userfriendly "stale configs" message ...................................................................... run.sh: more userfriendly "stale configs" message Make the message easy to understand at first glance, print what needs to be done to regenerate the configs. Add an empty line before listing the stale file that has been found, so it stands out from the (at this point) less relevant path listings. It looks like the following now: $ ./run.sh using config file '/home/user/code/osmo-dev/net/config_2g3g_osmith' on templates '/home/user/code/osmo-dev/net/tmpl_std' with NET_DIR '/home/user/code/osmo-dev/net/osmith' Stale: '/home/user/code/osmo-dev/net/tmpl_std/run.sh' is newer than 'run.sh' WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on! * Hit enter to continue, and use the stale config files * Hit ^C and run 'make regen' to regenerate your configs Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c --- M net/fill_config.py M net/tmpl_std/run.sh 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/12733/3 -- To view, visit https://gerrit.osmocom.org/12733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c Gerrit-Change-Number: 12733 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:57:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:57:11 +0000 Subject: Change in osmo-dev[master]: run.sh: more userfriendly "stale configs" message In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12733 ) Change subject: run.sh: more userfriendly "stale configs" message ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh at 6 PS2, Line 6: echo " * Hit enter to continue" > "Hit enter to continue, and use the stale config files" Done https://gerrit.osmocom.org/#/c/12733/2/net/tmpl_std/run.sh at 7 PS2, Line 7: echo " * Hit ^C and run 'make regen' to regenerate your configs" > rather "and run 'fill_config. [?] Even with the Makefile in place? The idea was, that the user only needs to remember "make regen" for both the build dir and the net dir. -- To view, visit https://gerrit.osmocom.org/12733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If225e094619a07a228e0e2f337153ee18cdb420c Gerrit-Change-Number: 12733 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 30 Jan 2019 16:57:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 16:59:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 30 Jan 2019 16:59:04 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: fix spaces/tabs in mgcp_requests[] In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12729 ) Change subject: Cosmetic: fix spaces/tabs in mgcp_requests[] ...................................................................... Cosmetic: fix spaces/tabs in mgcp_requests[] Change-Id: I2e8ef83b231b7d7b71e533d0699afea433d635aa --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index eaf0e5a..f141485 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -177,13 +177,13 @@ * for performance reasons. */ static const struct mgcp_request mgcp_requests[] = { MGCP_REQUEST("AUEP", handle_audit_endpoint, "AuditEndpoint") - MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection") - MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection") - MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection") - MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest") + MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection") + MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection") + MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection") + MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest") - /* SPEC extension */ - MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress") + /* SPEC extension */ + MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress") }; /* Helper function to allocate some memory for responses and retransmissions */ -- To view, visit https://gerrit.osmocom.org/12729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e8ef83b231b7d7b71e533d0699afea433d635aa Gerrit-Change-Number: 12729 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 17:05:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 17:05:52 +0000 Subject: Change in libosmocore[master]: add osmo_tdef API, moved from osmo-bsc T_def In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12717 ) Change subject: add osmo_tdef API, moved from osmo-bsc T_def ...................................................................... Patch Set 3: > (1 comment) > > Though the node at which to locate T timer vty config is kept > generic, there is no way to define more than one such set of timer > definitions per main(). > IIUC there might be a foo/T3 and a bar/T3 > within the same program? In that case I need to use generic timer > definitions handles instead of singleton globals. there's two way to approach this: 1) have one "timer-definitons" root node and then per-subsystem nodes underneath it, so you have something like timer-definitions -> bsc 2) offer infrastructure to subsystems so that they can "instantiate" a timer node underneath their VTY node so you end up having something like network -> bcs -> bts -> timer-definitions Given that there are objects of which we have multiple instances (like multiple BTSs in a BSC), it would actually make sense to go for approach number 2. But yes, any of those will be moving away from the idea of having one global namespace of timers. -- To view, visit https://gerrit.osmocom.org/12717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 Gerrit-Change-Number: 12717 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 30 Jan 2019 17:05:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 20:01:17 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 20:01:17 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E120-9981_=E2=86=92_1=2E2=2E0?= Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12735 Change subject: Bump version: 1.1.0.120-9981 ? 1.2.0 ...................................................................... Bump version: 1.1.0.120-9981 ? 1.2.0 Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c --- M debian/changelog 1 file changed, 145 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/12735/1 diff --git a/debian/changelog b/debian/changelog index a157b2e..20ffc81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,148 @@ +openbsc (1.2.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * acc_ramp: Increase log level of some messages + * bsc_nat.c: Return correct err code to avoid heap-user-after-free + * chan_alloc: Print bts nr on chan alloc failure + * abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else + * gitignore: Filter m4 files + * bsc-nat: Avoid sending reset ack twice in a row + * bsc-nat: bsc_nat_filter_ipa: Improve documentation + * bsc-nat: forward_sccp_to_msc: Remove unneeded goto + * bsc-nat: forward_sccp_to_msc: Remove unneeded exit3 section + * bsc-nat: forward_sccp_to_msc: Fix memleak on receive from non authenticated bsc + * bsc-nat: ipaccess_auth_bsc: Close bsc conn immediately on bad format received + * bsc-nat: Avoid heap-use-after-free on bsc auth failure + * chan_alloc: Fix crash when failing to allocate channel + * gsm0408_dispatch: Fix uninitialized var warning + * bsc-nat: Fix missing help description for -T timestamp cmdline option + * bsc-nat: Add -V param to print version + * bsc-sccplite: Add -V param to print version + * bsc-nat: show running-config now prints bsc nodes + * bsc-nat: Avoid heap-use-after-free on USSD conn lost + * configure.ac: Add --enable-sanitize flag + * bsc-nat: Replace '.' in counter names with ':' + * bsc-nat: Allocate each ctr group with a different idx + * bsc-nat: Add more complete VTY command to show BSC related info + * Init access_lists before passing it as a parameter + * Rename bsc_msg_acc_lst_vty_init to have more uniform prefix + * bsc_vty: Write access list entries when storing bsc config + * filter: vty: Print policy list in cmd show access-list + * bsc-nat: find_paging: Check return code of tlv_parse + * bsc-nat: forward paging to all BSC when CELL_IDENT_BSS is received + * nat: Add VTY cmd paging-bss-forward to nat node + * nat: ctrl: Use ctrl_cmd_parse2 to obtain detailed error + * bsc: ctrl: Use ctrl_cmd_parse2 to obtain detailed error + * nat: ctrl: use strtol instead of atoi as it has explicit error documentation + * nat: ctrl: Avoid sending back received ERROR msgs + * bsc: ctrl: Avoid sending back received ERROR msgs + * vty: Fix typo writing bts-jitter-buffer-delay-{min,max} + * examples: osmo-bsc_mgcp: Update cfg file + * mgcp_test: tweak test failure output + * osmo-bsc-mgcp: Add debian package + * configure: Find correct libgsm's gsm.h header + * gsm_data.h: Replace '.' in counter names with ':' + * abis_nm_ipaccess_rsl_connect: Log bts and trx nr + * Fix heap-use-after-free due to OML link destruction + * Add osmo-bsc-nat systemd service and install it with debian + * debian: Install all service files from contrib/systemd + * systemd: describe osmo-bsc-sccplite service as legacy + * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * cosmetic: Remove duplicate semicolon and whitespace + * nat: Remove misleading comment + * nat: Remove misleading comment + * nat: return -EBADF in read wqueue cb on fd closed + * debian/rules: Don't overwrite .tarball-version + * mgcp: Fix osmux_cid_bitmap static array size calculation + * bsc_filter: Move whitelisted info log to debug + * mgcp: Fix (again) osmux_cid_bitmap static array size calculation + * mgcp_osmux: Use define to calculate rtp_ssrc_winlen + * examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 + * mgcp: Avoid initing output without enabling osmux + * mgcp: Log endpoint nr consistently as hex + * nat: Log endpoint nr consistently as hex + * nat: Log state of pending transaction + * mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled + * mgcp: osmux: Don't process regular osmux frames if disabled by cfg + * mgcp: osmux: Move parse_cid of legacy dummy frames to own function + * mgcp: osmux: Make func handling dummy frames independent of endp type + * mgcp: osmux: allow enabling osmux only on correct activating state + * mgcp: osmux: Improve checks around activating and using enabled osmux + * osmux.h: Document enum osmux_state + * mgcp: osmux_send_dummy: Fix return without value + * bsc-nat: Enable octet-aligned when ensuring mode set + * smpp.adoc: describe VTY cmd 'local-tcp-ip' instead of 'local-tcp-port' + * Allow easily disabling GFDL references + + [ Daniel Willmann ] + * git-version-gen: Don't check for .git directory + + [ Neels Hofmeyr ] + * cosmetic: make osmo-python-tests dependency more accurate + * legacy_mgcp: mgcp_test: sanitize: free msgb_ctx + * Importing history from osmo-gsm-manuals + * make clean: also remove generated image files + * add 'make check' target + * OsmoBSC+NITB/running: fix title levels, one too deep + * OsmoNITB: include abis.adoc from common/chapters/ + * fix 'make clean': shell glob, ignore failure + * move mncc.adoc to common chapters + * tweak common/mncc.adoc: use variable for program name + * move smpp.adoc to common chapters, generalize + * OsmoNITB: update vty reference + * refactor Makefile build rules, don't use the FORCE + * author info: add "former" to Holger's job title + + [ Philipp Maier ] + * mgcp: add VTY Option to force-realloc endpoints + * osmo-nitb: Update VTY command reference + + [ Harald Welte ] + * Debian: Include the osmo-bsc-mgcp systemd service in Debian package + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * OsmoNITB HLR: expand on how to create subscribers + * Add chapter on Cell Broadcast Support in Osmocom (to BSC+NITB manual) + * SMPP: Document Osmocom extensions + * vty-ref: Update URI of docbook 5.0 schema + + [ Max ] + * Fix build with latest libosmocore + * Add OsmoNITB control interface description + * Remove ipaccess utils + * fix build: apply msgb_wrap_with_TL() rename + * Remove meas_* utils + * Remove openbsc-dev package + * Remove osmocom-ipaccess-utils-dbg package + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Ivaylo Kostov ] + * Typo in Chapter 14.2 + + [ Philipp ] + * Describe how to run multiple instances of osmo-nitb and osmo-bts + + [ Oliver Smith ] + * vty/bsc_vty_additions.xml: copy from osmo-bsc + * build manuals moved here from osmo-gsm-manuals.git + * manuals/OsmoNITB: integrate into this repository + * OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git + * manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib: fix makedistcheck with disabled systemd + * contrib/jenkins.sh: build and publish manuals + + [ Keith ] + * Don't send SMS STATUS REPORT locally if the ESME accepted it. + * Make alert notifications vty configurable per ESME + * Cosmetic: Fix spelling in smpp vty + + -- Pau Espin Pedrol Wed, 30 Jan 2019 16:07:36 +0100 + openbsc (1.1.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/12735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c Gerrit-Change-Number: 12735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 20:08:55 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 20:08:55 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E120-9981_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12735 ) Change subject: Bump version: 1.1.0.120-9981 ? 1.2.0 ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c Gerrit-Change-Number: 12735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 20:08:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 20:27:33 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 20:27:33 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E120-9981_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12735 to look at the new patch set (#2). Change subject: Bump version: 1.1.0.120-9981 ? 1.2.0 ...................................................................... Bump version: 1.1.0.120-9981 ? 1.2.0 Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c --- M debian/changelog M openbsc/configure.ac 2 files changed, 154 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/12735/2 -- To view, visit https://gerrit.osmocom.org/12735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c Gerrit-Change-Number: 12735 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 21:03:54 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 21:03:54 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E120-9981_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12735 ) Change subject: Bump version: 1.1.0.120-9981 ? 1.2.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c Gerrit-Change-Number: 12735 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 21:03:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 21:04:34 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 21:04:34 +0000 Subject: Change in libosmo-netif[master]: Stream examples: fix server's endless loop In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12724 ) Change subject: Stream examples: fix server's endless loop ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfc2cf7f971b9e3a4abc34cc18d8a44c811c5617 Gerrit-Change-Number: 12724 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Comment-Date: Wed, 30 Jan 2019 21:04:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 21:04:37 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 21:04:37 +0000 Subject: Change in libosmo-netif[master]: Stream examples: log sent/received bytes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12723 ) Change subject: Stream examples: log sent/received bytes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a Gerrit-Change-Number: 12723 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Comment-Date: Wed, 30 Jan 2019 21:04:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 21:04:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 Jan 2019 21:04:40 +0000 Subject: Change in libosmo-netif[master]: Stream examples: filter internal logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12722 ) Change subject: Stream examples: filter internal logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17d7878d302f011d8ff0d86708d677f5b559299e Gerrit-Change-Number: 12722 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Comment-Date: Wed, 30 Jan 2019 21:04:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 21:14:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 21:14:21 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E120-9981_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12735 ) Change subject: Bump version: 1.1.0.120-9981 ? 1.2.0 ...................................................................... Bump version: 1.1.0.120-9981 ? 1.2.0 Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c --- M debian/changelog M openbsc/configure.ac 2 files changed, 154 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index a157b2e..20ffc81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,148 @@ +openbsc (1.2.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * acc_ramp: Increase log level of some messages + * bsc_nat.c: Return correct err code to avoid heap-user-after-free + * chan_alloc: Print bts nr on chan alloc failure + * abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else + * gitignore: Filter m4 files + * bsc-nat: Avoid sending reset ack twice in a row + * bsc-nat: bsc_nat_filter_ipa: Improve documentation + * bsc-nat: forward_sccp_to_msc: Remove unneeded goto + * bsc-nat: forward_sccp_to_msc: Remove unneeded exit3 section + * bsc-nat: forward_sccp_to_msc: Fix memleak on receive from non authenticated bsc + * bsc-nat: ipaccess_auth_bsc: Close bsc conn immediately on bad format received + * bsc-nat: Avoid heap-use-after-free on bsc auth failure + * chan_alloc: Fix crash when failing to allocate channel + * gsm0408_dispatch: Fix uninitialized var warning + * bsc-nat: Fix missing help description for -T timestamp cmdline option + * bsc-nat: Add -V param to print version + * bsc-sccplite: Add -V param to print version + * bsc-nat: show running-config now prints bsc nodes + * bsc-nat: Avoid heap-use-after-free on USSD conn lost + * configure.ac: Add --enable-sanitize flag + * bsc-nat: Replace '.' in counter names with ':' + * bsc-nat: Allocate each ctr group with a different idx + * bsc-nat: Add more complete VTY command to show BSC related info + * Init access_lists before passing it as a parameter + * Rename bsc_msg_acc_lst_vty_init to have more uniform prefix + * bsc_vty: Write access list entries when storing bsc config + * filter: vty: Print policy list in cmd show access-list + * bsc-nat: find_paging: Check return code of tlv_parse + * bsc-nat: forward paging to all BSC when CELL_IDENT_BSS is received + * nat: Add VTY cmd paging-bss-forward to nat node + * nat: ctrl: Use ctrl_cmd_parse2 to obtain detailed error + * bsc: ctrl: Use ctrl_cmd_parse2 to obtain detailed error + * nat: ctrl: use strtol instead of atoi as it has explicit error documentation + * nat: ctrl: Avoid sending back received ERROR msgs + * bsc: ctrl: Avoid sending back received ERROR msgs + * vty: Fix typo writing bts-jitter-buffer-delay-{min,max} + * examples: osmo-bsc_mgcp: Update cfg file + * mgcp_test: tweak test failure output + * osmo-bsc-mgcp: Add debian package + * configure: Find correct libgsm's gsm.h header + * gsm_data.h: Replace '.' in counter names with ':' + * abis_nm_ipaccess_rsl_connect: Log bts and trx nr + * Fix heap-use-after-free due to OML link destruction + * Add osmo-bsc-nat systemd service and install it with debian + * debian: Install all service files from contrib/systemd + * systemd: describe osmo-bsc-sccplite service as legacy + * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check + * Install systemd services with autotools + * Install sample cfg file to /etc/osmocom + * cosmetic: Remove duplicate semicolon and whitespace + * nat: Remove misleading comment + * nat: Remove misleading comment + * nat: return -EBADF in read wqueue cb on fd closed + * debian/rules: Don't overwrite .tarball-version + * mgcp: Fix osmux_cid_bitmap static array size calculation + * bsc_filter: Move whitelisted info log to debug + * mgcp: Fix (again) osmux_cid_bitmap static array size calculation + * mgcp_osmux: Use define to calculate rtp_ssrc_winlen + * examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 + * mgcp: Avoid initing output without enabling osmux + * mgcp: Log endpoint nr consistently as hex + * nat: Log endpoint nr consistently as hex + * nat: Log state of pending transaction + * mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled + * mgcp: osmux: Don't process regular osmux frames if disabled by cfg + * mgcp: osmux: Move parse_cid of legacy dummy frames to own function + * mgcp: osmux: Make func handling dummy frames independent of endp type + * mgcp: osmux: allow enabling osmux only on correct activating state + * mgcp: osmux: Improve checks around activating and using enabled osmux + * osmux.h: Document enum osmux_state + * mgcp: osmux_send_dummy: Fix return without value + * bsc-nat: Enable octet-aligned when ensuring mode set + * smpp.adoc: describe VTY cmd 'local-tcp-ip' instead of 'local-tcp-port' + * Allow easily disabling GFDL references + + [ Daniel Willmann ] + * git-version-gen: Don't check for .git directory + + [ Neels Hofmeyr ] + * cosmetic: make osmo-python-tests dependency more accurate + * legacy_mgcp: mgcp_test: sanitize: free msgb_ctx + * Importing history from osmo-gsm-manuals + * make clean: also remove generated image files + * add 'make check' target + * OsmoBSC+NITB/running: fix title levels, one too deep + * OsmoNITB: include abis.adoc from common/chapters/ + * fix 'make clean': shell glob, ignore failure + * move mncc.adoc to common chapters + * tweak common/mncc.adoc: use variable for program name + * move smpp.adoc to common chapters, generalize + * OsmoNITB: update vty reference + * refactor Makefile build rules, don't use the FORCE + * author info: add "former" to Holger's job title + + [ Philipp Maier ] + * mgcp: add VTY Option to force-realloc endpoints + * osmo-nitb: Update VTY command reference + + [ Harald Welte ] + * Debian: Include the osmo-bsc-mgcp systemd service in Debian package + * initial checkin of manuals to public repo + * Add link to Asciidoc source code of manual + * OsmoNITB HLR: expand on how to create subscribers + * Add chapter on Cell Broadcast Support in Osmocom (to BSC+NITB manual) + * SMPP: Document Osmocom extensions + * vty-ref: Update URI of docbook 5.0 schema + + [ Max ] + * Fix build with latest libosmocore + * Add OsmoNITB control interface description + * Remove ipaccess utils + * fix build: apply msgb_wrap_with_TL() rename + * Remove meas_* utils + * Remove openbsc-dev package + * Remove osmocom-ipaccess-utils-dbg package + + [ Jonathan Brielmaier ] + * fix various typos across all manuals + + [ Ivaylo Kostov ] + * Typo in Chapter 14.2 + + [ Philipp ] + * Describe how to run multiple instances of osmo-nitb and osmo-bts + + [ Oliver Smith ] + * vty/bsc_vty_additions.xml: copy from osmo-bsc + * build manuals moved here from osmo-gsm-manuals.git + * manuals/OsmoNITB: integrate into this repository + * OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git + * manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} + * Fix DISTCHECK_CONFIGURE_FLAGS override + * contrib: fix makedistcheck with disabled systemd + * contrib/jenkins.sh: build and publish manuals + + [ Keith ] + * Don't send SMS STATUS REPORT locally if the ESME accepted it. + * Make alert notifications vty configurable per ESME + * Cosmetic: Fix spelling in smpp vty + + -- Pau Espin Pedrol Wed, 30 Jan 2019 16:07:36 +0100 + openbsc (1.1.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 109bad8..4b432b1 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -39,19 +39,19 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.1) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.1) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.1) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.1) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.1) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) # Enabke/disable the NAT? AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"]) if test "$osmo_ac_build_nat" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) fi AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") AC_SUBST(osmo_ac_build_nat) @@ -60,7 +60,7 @@ AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"]) if test "$osmo_ac_build_bsc" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) fi AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") AC_SUBST(osmo_ac_build_bsc) -- To view, visit https://gerrit.osmocom.org/12735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I33e1c83a0000789f65acc0b7584d1629a50b384c Gerrit-Change-Number: 12735 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:19:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 22:19:56 +0000 Subject: Change in libosmo-netif[master]: Stream examples: filter internal logging In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12722 ) Change subject: Stream examples: filter internal logging ...................................................................... Stream examples: filter internal logging Set category filter to make sure internal library logging won't interfere with example's own logging. It's also nice example illustrating log_set_category_filter() usage. Change-Id: I17d7878d302f011d8ff0d86708d677f5b559299e --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/examples/stream-client.c b/examples/stream-client.c index 92f6fd3..3c3416f 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -100,6 +100,7 @@ msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_cli_test_log_info); log_set_log_level(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLINP, 0, LOGL_INFO); /* * initialize stream cli. diff --git a/examples/stream-server.c b/examples/stream-server.c index 0c5e351..08c3d2a 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -125,6 +125,7 @@ msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_srv_test_log_info); log_set_log_level(osmo_stderr_target, 1); + log_set_category_filter(osmo_stderr_target, DLINP, 0, LOGL_INFO); /* * initialize stream srv. -- To view, visit https://gerrit.osmocom.org/12722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I17d7878d302f011d8ff0d86708d677f5b559299e Gerrit-Change-Number: 12722 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:19:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 22:19:57 +0000 Subject: Change in libosmo-netif[master]: Stream examples: log sent/received bytes In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12723 ) Change subject: Stream examples: log sent/received bytes ...................................................................... Stream examples: log sent/received bytes Make client and server examples more verbose by logging actual bytes sent/received. Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 23 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/examples/stream-client.c b/examples/stream-client.c index 3c3416f..6178dcd 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -45,19 +45,26 @@ static int read_cb(struct osmo_stream_cli *conn) { + int bytes; struct msgb *msg; - LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n"); + LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... "); msg = msgb_alloc(1024, "STREAMCLIENT/test"); if (msg == NULL) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); return 0; } - if (osmo_stream_cli_recv(conn, msg) < 0) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); + + bytes = osmo_stream_cli_recv(conn, msg); + + if (bytes < 0) { + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); return 0; } + + LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); + msgb_free(msg); return 0; } @@ -86,7 +93,7 @@ osmo_stream_cli_send(conn, msg); - LOGP(DSTREAMTEST, LOGL_NOTICE, "message of %d bytes sent\n", msg->len); + LOGP(DSTREAMTEST, LOGL_NOTICE, "sent %d bytes message: %s\n", msg->len, msgb_hexdump(msg)); return 0; } diff --git a/examples/stream-server.c b/examples/stream-server.c index 08c3d2a..cd6dc57 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -43,19 +43,25 @@ int read_cb(struct osmo_stream_srv *conn) { + int bytes; struct msgb *msg; - LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n"); + LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... "); msg = msgb_alloc(1024, "STREAMSERVER/test"); if (msg == NULL) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); return 0; } - if (osmo_stream_srv_recv(conn, msg) < 0) { - LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n"); + + bytes = osmo_stream_srv_recv(conn, msg); + + if (bytes < 0) { + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); return 0; - } + } else + LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); + msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/12723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a Gerrit-Change-Number: 12723 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:19:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 30 Jan 2019 22:19:57 +0000 Subject: Change in libosmo-netif[master]: Stream examples: fix server's endless loop In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12724 ) Change subject: Stream examples: fix server's endless loop ...................................................................... Stream examples: fix server's endless loop Stream server example had an error which resulted in infinite loop on client disconnect. Fix this by properly handling client closing connection to allow it to reconnect multiple times. Change-Id: Icfc2cf7f971b9e3a4abc34cc18d8a44c811c5617 --- M examples/stream-server.c 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/examples/stream-server.c b/examples/stream-server.c index cd6dc57..31487a0 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -56,9 +56,12 @@ bytes = osmo_stream_srv_recv(conn, msg); - if (bytes < 0) { - LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); - return 0; + if (bytes <= 0) { + if (bytes < 0) + LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes)); + else + LOGPC(DSTREAMTEST, LOGL_ERROR, "client closed connection\n"); + osmo_stream_srv_destroy(conn); } else LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg)); -- To view, visit https://gerrit.osmocom.org/12724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icfc2cf7f971b9e3a4abc34cc18d8a44c811c5617 Gerrit-Change-Number: 12724 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:16 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:16 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12736 Change subject: Update osmocom recipes to latest tag releases ...................................................................... Update osmocom recipes to latest tag releases Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 --- 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-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 14 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/36/12736/1 diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 98e5192..3032d28 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 = "026ff4574daedcf91a474f9bc67e90e8537a9d86" +SRCREV = "176a1fbab6ae45eb1c60e3d8b263b0765759e1da" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.5.1+gitr${SRCPV}" +PV = "0.6.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 d71810f..73c6314 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 = "322dbbeaa29cb90c6917fa7e78a66b96b8ce3689" +SRCREV = "c775ffe1cc6cfd842566d30c96d287502d9d6218" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.3.0+gitr${SRCPV}" +PV = "0.4.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 751bf70..6bdea27 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 = "688f2304056029f47073a549d7e41043eab5a0fd" +SRCREV = "81c6a0a97980f9da76ef0e698ca6ab526b98c7c2" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "0.10.0+gitr${SRCPV}" +PV = "1.0.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 6d00c0d..8eca57f 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 = "b8a91625dd974f596214646da345d9d649f4dae3" +SRCREV = "d4c406a04eae0071da4fb7aecd3cb47acd0fdab6" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.12.1+gitr${SRCPV}" -PR = "r0" +PV = "1.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index e3af4bc..7dbb07a 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "cc69659217d19af5635638a0fbd4f0702f79bac4" +SRCREV = "ed8815e723b41e9800f14c67bccd34e51a06beb6" 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 e31dc59..56e7eb4 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 = "08d02dd5100cbff47922427e3beb31a3373bf75c" +SRCREV = "117fa9d92d0da3d94a51cbfc1cbeb0d5bdcd3767" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.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 5219c03..4cc65b0 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a" +SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " -PV = "1.2.2+gitr${SRCPV}" +PV = "1.3.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 d10d893..c072a52 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 = "78f430102516a970b9899f962d4562ebdb718670" +SRCREV = "e0c6fe5921b30b0e8de35c021be5226c1475c2f5" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "0.2.1+gitr${SRCPV}" +PV = "1.0.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 a983c4e..5eb6d50 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 = "ba941e553d60a06a45ad96f0ad4161383d4c0d30" +SRCREV = "92a88ee73f471a4ddb7b864ae9f487493307a175" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.3.0+gitr${SRCPV}" +PV = "0.4.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 c3e7582..3998c5d 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 = "304b3eb32876cf69b202ee5688e00905fdb336f9" +SRCREV = "e81c1176aa1254b0bb148385134186f6a55fd405" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.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 3e5e9d7..87de339 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 = "cb8c75bba030c7ab9f2e49b2f40292a1738f3220" +SRCREV = "41e7cf115d4148a9f34fcb863b68b2d5370e335d" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.1+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 f76ced5..2c1991e 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 = "39c67e2640fc34346dffe3cff9f9f8e905fe5ad9" +SRCREV = "319a52b577843f6eebb00d8039c2e2479adc8da5" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.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 b5a1627..0d74751 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 = "55faf3867540f5d42a69e17cdc02f0e522f42478" +SRCREV = "336add4990191011ec6b8f621593e24b2ad5e324" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.1.1+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index a9cd8d3..e23e807 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3b25774db5b584e926dab2534d93314f910f62b6" +SRCREV = "65d937c45c3362504b8900173b8256a5894adae9" SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:16 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:16 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12737 Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Since osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc those have been removed entirely from the repo and are only available trhough openbsc.git. Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 3 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/37/12737/1 diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index b083a9c..19e17ab 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -3,35 +3,22 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" +DEPENDS = "libosmocore libosmo-netif" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -EXTRA_OECONF += "--enable-mgcp-transcoding --with-g729" - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ " libosmo-legacy-mgcp libosmo-legacy-mgcp-dev libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev osmo-bsc-mgcp" +PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" - -FILES_libosmo-legacy-mgcp = "${libdir}/libosmo-legacy-mgcp${SOLIBS}" -FILES_libosmo-legacy-mgcp-dev = " \ - ${includedir}/osmocom/legacy_mgcp \ - ${libdir}/pkgconfig/libosmo-legacy-mgcp.pc \ - ${libdir}/libosmo-legacy-mgcp${SOLIBSDEV} \ - " FILES_libosmo-mgcp = "${libdir}/libosmo-mgcp${SOLIBS}" FILES_libosmo-mgcp-dev = " \ @@ -47,11 +34,4 @@ ${libdir}/libosmo-mgcp-client${SOLIBSDEV} \ " -FILES_osmo-bsc-mgcp = " \ - ${bindir}/osmo-bsc_mgcp \ - ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_unitdir}/system/osmo-bsc-mgcp.service \ - " -CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" - CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-mgw.cfg" -- To view, visit https://gerrit.osmocom.org/12737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 12737 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:17 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:17 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12738 Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... openbsc: Install osmo-bsc-sccplite.service from git repo Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service 2 files changed, 2 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/38/12738/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 9f23d52..66782fb 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -8,10 +8,9 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc-sccplite.init \ - file://osmo-bsc-sccplite.service \ " -INC_PR = "r1.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -32,7 +31,7 @@ # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service deleted file mode 100644 index 3edd35c..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenBSC BSC (legacy, with SCCPLite) -Wants=osmo-bsc-mgcp.service - -[Service] -Type=simple -Restart=always -ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s -RestartSec=2 - -[Install] -WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/12738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 12738 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:17 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:17 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12739 Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... openbsc: Install osmo-bsc-nat service from git repo Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/39/12739/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 66782fb..f76afb7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -20,7 +20,7 @@ install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -32,6 +32,7 @@ install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom @@ -65,6 +66,7 @@ CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " + ${bindir}/osmo-bsc_nat \ + ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ + ${systemd_system_unitdir}/osmo-bsc-nat.service \ + " -- To view, visit https://gerrit.osmocom.org/12739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 12739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:17 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:17 +0000 Subject: Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12740 Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... openbsc: Use systemd.bbclass correctly * Describe packages containing systemd services in SYSTEMD_PACKAGES. * Enable services by default, since now osmo-bsc-sccplite doesn't collide with osmo-bsc.git's osmo-bsc. * Add SYSTEMD_SERVICE_* to specify service file for each package. Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/40/12740/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f76afb7..ca9a6c6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -39,13 +39,11 @@ } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" - +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" -# Do not start any of the services by default -SYSTEMD_AUTO_ENABLE = "disable" - CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" +SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ @@ -55,16 +53,18 @@ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_unitdir}/system/osmo-nitb.service \ + ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service" FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ -- To view, visit https://gerrit.osmocom.org/12740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 12740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:17 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:17 +0000 Subject: Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12741 Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... openbsc: Package osmo-bsc-mgcp Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/41/12741/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca9a6c6..ec130db 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -10,7 +10,7 @@ file://osmo-bsc-sccplite.init \ " -INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -21,6 +21,7 @@ install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg + install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -33,13 +34,14 @@ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom } -PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" -SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" +PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" @@ -70,3 +72,11 @@ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ ${systemd_system_unitdir}/osmo-bsc-nat.service \ " + +CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" +SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" +FILES_osmo-bsc-mgcp = " \ + ${bindir}/osmo-bsc_mgcp \ + ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ + ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ + " -- To view, visit https://gerrit.osmocom.org/12741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 12741 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:18 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12742 Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... osmo-msc: Depend on osmo-hlr Since a while ago, osmo-msc depends on libosmo-gsup-client which is provided by osmo-hlr. Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/42/12742/1 diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 06f5b10..e5364cd 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" +DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:18 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12743 Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/43/12743/1 diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 6d8b748..946784b 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -24,6 +24,20 @@ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" + +FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" +FILES_libosmo-gsup-client-dev = " \ + ${includedir}/osmocom/gsupclient \ + ${libdir}/pkgconfig/libosmo-gsup-client.pc \ + ${libdir}/libosmo-gsup-client${SOLIBSDEV} \ + " + +FILES_osmo-hlr-utils = " \ + ${bindir}/osmo-hlr-db-tool \ + ${bindir}/osmo-euse-demo \ + " + SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-hlr = "\ ${sysconfdir}/osmocom/osmo-hlr.cfg \ -- To view, visit https://gerrit.osmocom.org/12743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 12743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:18 +0000 Subject: Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12744 Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... libosmo-sccp: handle systemd and cfg files through autotools Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 1 file changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/44/12744/1 diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 60793e3..78dd525 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,12 +3,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools pkgconfig systemd +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + # we require the tests to link to the static libosmo-sigtran library to # access symbols not starting with osmo_* EXTRA_OECONF_remove = "--disable-static" @@ -17,14 +22,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - FILES_osmo-stp = " \ ${bindir}/osmo-stp \ ${sysconfdir}/osmocom/osmo-stp.cfg \ -- To view, visit https://gerrit.osmocom.org/12744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 12744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:18 +0000 Subject: Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12745 Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... osmo-iuh: handle systemd and cfg files through autotools Change-Id: If879153a32ae21ad63284382a420da534f30e6eb --- M recipes-osmocom/osmo-iuh/osmo-iuh.inc 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/45/12745/1 diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 6dfb344..ab412ad 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hnbgw.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hnbgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" SYSTEMD_PACKAGES = "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/12745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 12745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:19 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:19 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12746 Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... osmo-hlr: handle systemd and cfg files through autotools Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/46/12746/1 diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 946784b..7fa415b 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -15,15 +15,15 @@ } do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ install -d ${D}${localstatedir}/lib/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hlr.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/12746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 12746 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:19 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:19 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12747 Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 2 insertions(+), 178 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/47/12747/1 diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..0000000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -# Mobile Switching Center, Home Location regster and all other -# components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - /sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - # esac - ;; - stop) - #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - #esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - #log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - #case "$?" in - # 0) log_end_msg 0 ;; - # 1) log_end_msg 1 ;; # Old process is still running - # *) log_end_msg 1 ;; # Failed to start - #esac - ;; - *) - # Failed to stop - #log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index 49dd1ee..fe0170f 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,30 +5,24 @@ DEPENDS = "libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools pkgconfig systemd do_install_append() { - install -d ${D}${sysconfdir}/init.d install -d ${D}${systemd_system_unitdir}/ install -d ${D}/${sysconfdir}/osmocom/ - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ } SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" FILES_libgtp = "${libdir}/*${SOLIBS}" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 4cc65b0..a88eb84 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -3,7 +3,6 @@ S = "${WORKDIR}/git" SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ - file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " PV = "1.3.0+gitr${SRCPV}" -- To view, visit https://gerrit.osmocom.org/12747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 12747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:19 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:19 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12748 Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... osmo-ggsn: handle systemd and cfg files through autotools Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a --- M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc 1 file changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/48/12748/1 diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index fe0170f..0aaf418 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,22 +5,19 @@ DEPENDS = "libosmocore" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools pkgconfig systemd - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" -- To view, visit https://gerrit.osmocom.org/12748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 12748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:20 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:20 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12749 Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... osmo-sgsn: handle systemd and cfg files through autotools At the same time systemd services were installed by autotools, osmo-gtphub service became available too. Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 8 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/12749/1 diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 4711a2c..45256a5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,29 +5,22 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gtphub/osmo-gtphub.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service ${D}${systemd_system_unitdir}/ -} - PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" +SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -- To view, visit https://gerrit.osmocom.org/12749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 12749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:20 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:20 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12750 Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... osmo-mgw: handle systemd and cfg files through autotools Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/50/12750/1 diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 19e17ab..c00f998 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg - install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -- To view, visit https://gerrit.osmocom.org/12750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 12750 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:21 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12751 Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... osmo-msc: handle systemd and cfg files through autotools Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/12751/1 diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index e5364cd..59280ce 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,23 +5,20 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + smpp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh," PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34," RDEPENDS_${PN} = "libdbd-sqlite3" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_system_unitdir}/ -} - SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg" -- To view, visit https://gerrit.osmocom.org/12751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 12751 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:21 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12752 Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... osmo-bsc: handle systemd and cfg files through autotools Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 --- M recipes-osmocom/osmo-bsc/osmo-bsc.inc 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/52/12752/1 diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d066a58..484a779 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,18 +5,14 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" -- To view, visit https://gerrit.osmocom.org/12752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 12752 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:21 +0000 Subject: Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12753 Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... osmo-sip-connector: handle systemd and cfg files through autotools Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 --- M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/53/12753/1 diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc index d7f22a3..96d3734 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc @@ -5,17 +5,15 @@ DEPENDS = "sofia-sip libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" - install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service ${D}${systemd_system_unitdir}/ -} SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg" -- To view, visit https://gerrit.osmocom.org/12753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 12753 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:21 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:21 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12754 Change subject: openbsc: Drop untested sysvinit support ...................................................................... openbsc: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. As update-rc.d was removed, it was noticied that systemd class inherit was missing, so this commit adds it. As a result, it's not required to define systemd service file paths in FILES_*. Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init D recipes-osmocom/openbsc/openbsc/osmo-nitb.init 3 files changed, 1 insertion(+), 118 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/54/12754/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ec130db..ca3b124 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,15 +6,11 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -SRC_URI = "file://osmo-nitb.init \ - file://osmo-bsc-sccplite.init \ - " - INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" -inherit autotools update-rc.d pkgconfig +inherit autotools systemd pkgconfig do_install_append() { install -d ${D}${sysconfdir}/osmocom @@ -23,12 +19,6 @@ install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - # Install sysv-init files - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d - install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb - install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init ${D}${sysconfdir}/init.d/osmo-bsc-sccplite - # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ @@ -42,27 +32,18 @@ PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" -INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" -INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \ - ${sysconfdir}/init.d/osmo-bsc-sccplite \ - ${systemd_system_unitdir}/osmo-bsc-sccplite.service \ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" -INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" -INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ - ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" @@ -70,7 +51,6 @@ FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - ${systemd_system_unitdir}/osmo-bsc-nat.service \ " CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" @@ -78,5 +58,4 @@ FILES_osmo-bsc-mgcp = " \ ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init deleted file mode 100755 index 3186f6d..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-bsc-sccplite -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Base Station Controller (legacy, with SCCPLite) -### END INIT INFO - -DAEMON=/usr/bin/osmo-bsc-sccplite -NAME=osmo-bsc-sccplite -DESC="Osmocom GSM Base Station Controller" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-sccplite.cfg -r /var/run/openbsc.ctl" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-bsc-sccplite || . /etc/default/osmo-bsc-sccplite -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init deleted file mode 100755 index bd74cc0..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-nitb -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Network in the Box -### END INIT INFO - -DAEMON=/usr/bin/osmo-nitb -NAME=osmo-nitb -DESC="Osmocom GSM Network in the Box" -NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 -- To view, visit https://gerrit.osmocom.org/12754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 12754 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:22 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:22 +0000 Subject: Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12755 Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... openbsc: handle systemd and cfg files through autotools Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/55/12755/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca3b124..71921b7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,30 +6,21 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r4.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools systemd pkgconfig do_install_append() { - install -d ${D}${sysconfdir}/osmocom - install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg - install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - - # Install systemd files and enable on sysinit - install -d ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -d ${D}/var/lib/osmocom - } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -- To view, visit https://gerrit.osmocom.org/12755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 12755 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:31:22 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:31:22 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12756 Change subject: osmo-sgsn: Depend on osmo-hlr ...................................................................... osmo-sgsn: Depend on osmo-hlr Since osmo-sgsn f4b2c4ca42cc530c38c9ac6f275e4d7da9315fa2, it depends on libosmo-gsup-client available in osmo-hlr. Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/56/12756/1 diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 45256a5..57ab845 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -3,7 +3,7 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" +DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn osmo-hlr" INC_PR="r1.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/12756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 Gerrit-Change-Number: 12756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:27 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:27 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12736 ) Change subject: Update osmocom recipes to latest tag releases ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:34 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:34 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12737 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 12737 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:38 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:38 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12738 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 12738 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:42 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:42 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12739 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 12739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:47 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:47 +0000 Subject: Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12740 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 12740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:51 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:51 +0000 Subject: Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12741 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 12741 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:38:55 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:38:55 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12742 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:38:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:00 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:00 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12743 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 12743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:05 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:05 +0000 Subject: Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12744 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 12744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:10 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:10 +0000 Subject: Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12745 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 12745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:13 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:13 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12746 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 12746 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:18 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:18 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12747 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 12747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:22 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:22 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12748 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 12748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:29 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:29 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12749 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 12749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:36 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:36 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12750 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 12750 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:43 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:43 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12751 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 12751 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:48 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:48 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12752 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 12752 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:54 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:54 +0000 Subject: Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12753 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 12753 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:39:58 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:39:58 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12754 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 12754 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:39:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:40:05 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:40:05 +0000 Subject: Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12755 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 12755 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:40:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 30 22:40:14 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 Jan 2019 22:40:14 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12756 ) Change subject: osmo-sgsn: Depend on osmo-hlr ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 Gerrit-Change-Number: 12756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 Jan 2019 22:40:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 07:24:06 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 31 Jan 2019 07:24:06 +0000 Subject: Change in libosmocore[master]: logging sanity: initialize osmo_log_info = NULL In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/12714 ) Change subject: logging sanity: initialize osmo_log_info = NULL ...................................................................... Abandoned interesting, didn't know that -- To view, visit https://gerrit.osmocom.org/12714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ifd97c945f63cfe9850f025db7e69370866ea133e Gerrit-Change-Number: 12714 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 08:14:10 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 08:14:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmo-sysmon_=C2=BB_a1=3Ddefault,a?= =?UTF-8?Q?2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#256?= Message-ID: <1403593605.0.1548922450210.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sysmon" build number 256 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-sysmon > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sysmon > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sysmon +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-sysmon # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-sysmon # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sysmon > git fetch --tags --progress git://git.osmocom.org/osmo-sysmon +refs/heads/*:refs/remotes/origin/* Checking out Revision 65d937c45c3362504b8900173b8256a5894adae9 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 65d937c45c3362504b8900173b8256a5894adae9 Commit message: "Update Makefile.am" > git rev-list --no-walk 65d937c45c3362504b8900173b8256a5894adae9 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins2628230196923283355.sh + ./contrib/jenkins.sh Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH ! Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Jan 31 08:31:50 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 08:31:50 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-mgw_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#2173?= Message-ID: <1858716019.1.1548923510541.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-mgw" build number 2173 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-mgw > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-mgw > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-mgw +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-mgw # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-mgw # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-mgw > git fetch --tags --progress git://git.osmocom.org/osmo-mgw +refs/heads/*:refs/remotes/origin/* Checking out Revision 622dd61764a454bc19a54de5ee1097bc3d3fa5d7 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 622dd61764a454bc19a54de5ee1097bc3d3fa5d7 Commit message: "Cosmetic: fix spaces/tabs in mgcp_requests[]" > git rev-list --no-walk 622dd61764a454bc19a54de5ee1097bc3d3fa5d7 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins7983789186100185283.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 16 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e WITH_MANUALS=1 -e PUBLISH=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh Unable to find image 'osmocom:amd64' locally docker: Error response from daemon: pull access denied for osmocom, repository does not exist or may require 'docker login'. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 08:55:28 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 Jan 2019 08:55:28 +0000 Subject: Change in osmo-sim-auth[master]: Check return code of u.authenticate() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12684 ) Change subject: Check return code of u.authenticate() ...................................................................... Check return code of u.authenticate() The method authenticate() of the class USIM may return None in some error cases. Lets check this fore passing the return code into len() Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Related: OS#1967 --- M osmo-sim-auth.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved K?vin Redon: Verified diff --git a/osmo-sim-auth.py b/osmo-sim-auth.py index 89deac4..6ba9557 100755 --- a/osmo-sim-auth.py +++ b/osmo-sim-auth.py @@ -41,6 +41,9 @@ print "\nUMTS Authentication" ret = u.authenticate(rand_bin, autn_bin, ctx='3G') + if ret == None: + print "UMTS Authentication failed" + exit(1) if len(ret) == 1: print "AUTS:\t%s" % b2a_hex(byteToString(ret[0])) else: -- To view, visit https://gerrit.osmocom.org/12684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sim-auth Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic22f37931c13e7ec8bd1fa7872cd2a24faeea0ba Gerrit-Change-Number: 12684 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 09:08:28 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 09:08:28 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmo-sysmon_=C2=BB_a1=3Ddefault,a?= =?UTF-8?Q?2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#257?= In-Reply-To: <1403593605.0.1548922450210.JavaMail.jenkins@jenkins.osmocom.org> References: <1403593605.0.1548922450210.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1911119710.3.1548925708379.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sysmon" build number 257 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sysmon # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sysmon > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sysmon +refs/heads/*:refs/remotes/origin/* Checking out Revision 65d937c45c3362504b8900173b8256a5894adae9 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 65d937c45c3362504b8900173b8256a5894adae9 Commit message: "Update Makefile.am" > git rev-list --no-walk 65d937c45c3362504b8900173b8256a5894adae9 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins4624025671047636051.sh + ./contrib/jenkins.sh Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH ! Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Jan 31 09:09:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 09:09:59 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-mgw_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2174?= In-Reply-To: <1858716019.1.1548923510541.JavaMail.jenkins@jenkins.osmocom.org> References: <1858716019.1.1548923510541.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <600952181.4.1548925799805.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 31 09:11:10 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 09:11:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#5037?= Message-ID: <898762842.5.1548925871087.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-bsc" build number 5037 originally caused by: Started by upstream project "master-osmo-mgw" build number 2174 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-bsc > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-bsc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-bsc +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-bsc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-bsc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-bsc > git fetch --tags --progress git://git.osmocom.org/osmo-bsc +refs/heads/*:refs/remotes/origin/* Checking out Revision d1bb0626c19b51e2acf75da43f437a5ee66c431b (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f d1bb0626c19b51e2acf75da43f437a5ee66c431b Commit message: "LCLS: use libosmocore function to add status" > git rev-list --no-walk d1bb0626c19b51e2acf75da43f437a5ee66c431b # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins1267378263403812827.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 16 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e WITH_MANUALS=1 -e PUBLISH=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh Unable to find image 'osmocom:amd64' locally docker: Error response from daemon: pull access denied for osmocom, repository does not exist or may require 'docker login'. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Jan 31 09:11:58 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 09:11:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8404?= Message-ID: <688983016.6.1548925918238.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-msc" build number 8404 originally caused by: Started by upstream project "master-osmo-mgw" build number 2174 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-msc > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* Checking out Revision ce9e1f664ed752dd99c83b4024ce81d685a79215 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f ce9e1f664ed752dd99c83b4024ce81d685a79215 Commit message: "libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces" > git rev-list --no-walk ce9e1f664ed752dd99c83b4024ce81d685a79215 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins1186142730668472074.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-osmo-msc/IU=--disable-iu,WITH_MANUALS=1,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 16 -e IU=--disable-iu -e WITH_MANUALS=1 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e PUBLISH=1 -w /build -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh Unable to find image 'osmocom:amd64' locally docker: Error response from daemon: pull access denied for osmocom, repository does not exist or may require 'docker login'. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:20:50 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:20:50 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12710 to look at the new patch set (#10). Change subject: Add ping probe support ...................................................................... Add ping probe support Use liboping (new dependency) to add 'ping XXX' entries support in .cfg file, where XXX can be either IP address or FQDN. Sample output: ... ping ya.ru IP: 2a02:6b8::2:242 dropped: 3/3 8.8.8.8 IP: 8.8.8.8 dropped: 0/3 latency: 20.4 ms TTL: 120 ... N. B: to gather actual ping statistic we have to be able to send ICMP requests (have enough privileges to work with RAW sockets). Related: SYS#2655 Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 --- M configure.ac M src/Makefile.am M src/osysmon.h M src/osysmon_main.c A src/osysmon_ping.c 5 files changed, 281 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/10/12710/10 -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:22:39 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:22:39 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12747 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 12747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 09:22:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:23:40 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:23:40 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12754 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 12754 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 09:23:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:24:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:24:38 +0000 Subject: Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12753 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 12753 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 09:24:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:30:36 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:30:36 +0000 Subject: Change in osmo-mgw[master]: Auto-cleanup inactive connections In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Auto-cleanup inactive connections ...................................................................... Patch Set 1: Code-Review-2 > Kick the watchdog whenever RTP messages or MGCP messages So if we use LCLS between BTS directly than during the call we can easily see neither RTP nor MGCP for 5 minutes. Once the LCLS loop is broken it's supposed to get back to initial RTP links through MGW which were already removed by watchdog at this point. I agree that there should be vty switch for that. Also I think it should be off by default. Would be nice to clarify in commit message what prompted this feature in more details besides ticket link. -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 31 Jan 2019 09:30:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:36:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:36:45 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12737 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 12737 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 09:36:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:39:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 09:39:46 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 09:39:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 09:40:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 09:40:57 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12736 ) Change subject: Update osmocom recipes to latest tag releases ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb File recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb: https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb at 6 PS1, Line 6: PV = "0.0.1+gitr${SRCPV}" I don't see any tags in the repository actually. Is this expected default of some sort? -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 09:40:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 09:41:59 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 09:41:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#850?= Message-ID: <130992772.7.1548927719249.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 105.29 KB...] Searching INPUT for files to process... Reading and parsing tag files Parsing files Building group list... Building directory list... Building namespace list... Building file list... Building class list... Associating documentation with classes... Computing nesting relations for classes... Building example list... Searching for enumerations... Searching for documented typedefs... Searching for members imported via using declarations... Searching for included using directives... Searching for documented variables... Building interface member list... Building member list... Searching for friends... Searching for documented defines... Computing class inheritance relations... Computing class usage relations... Flushing cached template relations that have become invalid... Computing class relations... Add enum values to enums... Searching for member function documentation... Creating members for template instances... Building page list... Search for main page... Computing page relations... Determining the scope of groups... Sorting lists... Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in lib make[3]: Entering directory ' sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c delay.c -o delay.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c fx2utils.c -o fx2utils.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c i2c.c -o i2c.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c isr.c -o isr.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c timer.c -o timer.rel sdcc -mmcs51 --no-xinit-opt -I../../firmware/include -c usb_common.c -o usb_common.rel usb_common.c:65: warning 196: pointer target lost const qualifier usb_common.c:66: warning 196: pointer target lost const qualifier usb_common.c:67: warning 196: pointer target lost const qualifier usb_common.c:68: warning 196: pointer target lost const qualifier usb_common.c:71: warning 196: pointer target lost const qualifier usb_common.c:72: warning 196: pointer target lost const qualifier usb_common.c:73: warning 196: pointer target lost const qualifier usb_common.c:74: warning 196: pointer target lost const qualifier timer.c:45: warning 158: overflow in implicit constant conversion isr.c:73: warning 94: comparison is always false due to limited range of data type -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'volatile-unsigned-char xdata' to type 'volatile-unsigned-char xdata* xdata' -:0: warning 154: converting integral to pointer without a cast from type 'int fixed' to type 'volatile-unsigned-char xdata* xdata' isr.c:100: warning 94: comparison is always false due to limited range of data type usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:216: warning 126: unreachable code usb_common.c:217: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:225: warning 126: unreachable code usb_common.c:226: warning 126: unreachable code usb_common.c:184: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG usb_common.c:315: warning 110: conditional flow changed by optimizer: so said EVELYN the modified DOG rm -f libfx2.lib touch libfx2.lib for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' Making install in common make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in usrp2 make[4]: Entering directory ' test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' . sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c test -f `basename '_startup.a51'` || ln -s '_startup.a51' . test -f `basename 'vectors.a51'` || ln -s 'vectors.a51' . srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_common.rel `test -f 'usrp_common.c' || echo './'`usrp_common.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o board_specific.rel `test -f 'board_specific.c' || echo './'`board_specific.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_load.rel `test -f 'fpga_load.c' || echo './'`fpga_load.c test -f ../common/`basename 'eeprom_boot.a51'` -o \ \! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \ || ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'` test -f ../common/`basename '_startup.a51'` -o \ \! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \ || ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'` test -f ../common/`basename 'vectors.a51'` -o \ \! -f `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` \ || ln -s `dirname 'vectors.a51'`/../common/`basename 'vectors.a51'` ../common/`basename 'vectors.a51'` sdas8051 -plosgff `basename '_startup.a51'` sdas8051 -plosgff `basename 'eeprom_boot.a51'` sdas8051 -plosgff `basename 'vectors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o fpga_rev2.rel `test -f 'fpga_rev2.c' || echo './'`fpga_rev2.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o init_gpif.rel `test -f 'init_gpif.c' || echo './'`init_gpif.c srcdir=. /usr/bin/python ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'bits' board_specific.c:65: warning 85: in function set_sleep_bits unreferenced function argument : 'mask' ../common/fpga_load.c:139: warning 85: in function clock_out_config_byte unreferenced function argument : 'bits' ../common/fpga_load.c:181: warning 126: unreachable code test -f `basename 'usb_descriptors.a51'` || ln -s 'usb_descriptors.a51' . test -f ../common/`basename 'usb_descriptors.a51'` -o \ \! -f `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` \ || ln -s `dirname 'usb_descriptors.a51'`/../common/`basename 'usb_descriptors.a51'` ../common/`basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o spi.rel `test -f 'spi.c' || echo './'`spi.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o eeprom_io.rel `test -f 'eeprom_io.c' || echo './'`eeprom_io.c sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o eeprom_boot.ihx eeprom_boot.rel eeprom_init.rel _startup.rel sdas8051 -plosgff `basename 'usb_descriptors.a51'` sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_main.rel `test -f 'usrp_main.c' || echo './'`usrp_main.c sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \ -c -o usrp_gpif.rel `test -f 'usrp_gpif.c' || echo './'`usrp_gpif.c usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:194: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion usrp_gpif.c:201: warning 158: overflow in implicit constant conversion /usr/bin/python ./../common/build_eeprom.py -p -r2 eeprom_boot.ihx > burn-usrp2-eeprom /usr/bin/python ./../common/build_eeprom.py -p -r4 eeprom_boot.ihx > burn-usrp4-eeprom chmod +x burn-usrp2-eeprom chmod +x burn-usrp4-eeprom usrp_main.c:223: warning 112: function 'setup_flowstate_common' implicit declaration usrp_main.c:260: warning 112: function 'setup_flowstate_write' implicit declaration usrp_main.c:282: warning 112: function 'setup_flowstate_read' implicit declaration usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization usrp_main.c:223: warning 84: 'auto' variable 'setup_flowstate_common' may be used before initialization usrp_main.c:260: warning 84: 'auto' variable 'setup_flowstate_write' may be used before initialization usrp_main.c:282: warning 84: 'auto' variable 'setup_flowstate_read' may be used before initialization sdcc -mmcs51 --no-xinit-opt --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 -Wl '-b USBDESCSEG = 0xE000' -L ../../lib libfx2.lib -o std.ihx vectors.rel usrp_main.rel usrp_common.rel board_specific.rel fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel usb_descriptors.rel spi.rel eeprom_io.rel _startup.rel ?ASlink-Warning-Undefined Global '_setup_flowstate_read' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_write' referenced by module 'usrp_main' ?ASlink-Warning-Undefined Global '_setup_flowstate_common' referenced by module 'usrp_main' Makefile:688: recipe for target 'std.ihx' failed make[4]: *** [std.ihx] Error 1 make[4]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory ' Makefile:404: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:628: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:925: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:22:20 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 10:22:20 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Patch Set 10: > pelase make sure to submit a related patch to meta-telephony for the liboping dependency I've double-checked and this dependency is already in branch 201705 recipe. -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 10:22:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:22:34 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 10:22:34 +0000 Subject: Change in osmo-sysmon[master]: Add ping probe support In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12710 ) Change subject: Add ping probe support ...................................................................... Add ping probe support Use liboping (new dependency) to add 'ping XXX' entries support in .cfg file, where XXX can be either IP address or FQDN. Sample output: ... ping ya.ru IP: 2a02:6b8::2:242 dropped: 3/3 8.8.8.8 IP: 8.8.8.8 dropped: 0/3 latency: 20.4 ms TTL: 120 ... N. B: to gather actual ping statistic we have to be able to send ICMP requests (have enough privileges to work with RAW sockets). Related: SYS#2655 Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 --- M configure.ac M src/Makefile.am M src/osysmon.h M src/osysmon_main.c A src/osysmon_ping.c 5 files changed, 281 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 734ac99..d98de89 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(LIBMNL, libmnl) +dnl FIXME: bump to 1.10.0 once it's available on build slaves and remove workaround from osysmon_ping.c +PKG_CHECK_MODULES(LIBOPING, liboping >= 1.9.0) dnl checks for header files AC_HEADER_STDC diff --git a/src/Makefile.am b/src/Makefile.am index cb85da2..d0d6a22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,11 +24,12 @@ libintern_la_SOURCES = simple_ctrl.c libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(AM_CFLAGS) +osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOPING_CFLAGS) $(AM_CFLAGS) osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ + $(LIBOPING_LIBS) \ $(NULL) osmo_sysmon_SOURCES = \ @@ -37,6 +38,7 @@ osysmon_sysinfo.c \ osysmon_rtnl.c \ osysmon_file.c \ + osysmon_ping.c \ osysmon_main.c \ $(NULL) diff --git a/src/osysmon.h b/src/osysmon.h index 735b11e..df8bf8d 100644 --- a/src/osysmon.h +++ b/src/osysmon.h @@ -9,6 +9,7 @@ #include "value_node.h" struct rtnl_client_state; +struct ping_state; struct osysmon_state { struct rtnl_client_state *rcs; @@ -18,6 +19,7 @@ struct llist_head netdevs; /* list of 'struct osysmon_file' */ struct llist_head files; + struct ping_state *pings; }; extern struct osysmon_state *g_oss; @@ -28,6 +30,7 @@ CTRL_CLIENT_NODE = _LAST_OSMOVTY_NODE + 1, CTRL_CLIENT_GETVAR_NODE, NETDEV_NODE, + PING_NODE, }; @@ -42,5 +45,8 @@ int osysmon_sysinfo_init(); int osysmon_sysinfo_poll(struct value_node *parent); +int osysmon_ping_init(); +int osysmon_ping_poll(struct value_node *parent); + int osysmon_file_init(); int osysmon_file_poll(struct value_node *parent); diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 82df61f..eb4f50b 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -193,7 +193,7 @@ int main(int argc, char **argv) { - int rc; + int rc, ping_init; osmo_init_logging2(NULL, &log_info); @@ -207,6 +207,7 @@ osysmon_sysinfo_init(); osysmon_ctrl_init(); osysmon_rtnl_init(); + ping_init = osysmon_ping_init(); osysmon_file_init(); rc = vty_read_config_file(cmdline_opts.config_file, NULL); @@ -233,6 +234,10 @@ osysmon_sysinfo_poll(root); osysmon_ctrl_poll(root); osysmon_rtnl_poll(root); + + if (ping_init == 0) + osysmon_ping_poll(root); + osysmon_file_poll(root); display_update(root); diff --git a/src/osysmon_ping.c b/src/osysmon_ping.c new file mode 100644 index 0000000..f736798 --- /dev/null +++ b/src/osysmon_ping.c @@ -0,0 +1,264 @@ +/* Simple Osmocom System Monitor (osysmon): Support for ping probe */ + +/* (C) 2018 by sysmocom - s.f.m.c. GmbH. + * Author: Max Suraev + * 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 +#include + +#include + +#include +#include +#include + +#include "osysmon.h" +#include "value_node.h" + +/*********************************************************************** + * Data model + ***********************************************************************/ + +#define BUFLEN 128 + +struct ping_state { + pingobj_t *ping_handle; +}; + +/* FIXME: replace with ping_iterator_count() once we bump requirements to liboping 1.10.0+ */ +static unsigned iterator_count(pingobj_t *p) +{ + unsigned count = 0; + pingobj_iter_t *iter; + for (iter = ping_iterator_get(p); iter; iter = ping_iterator_next(iter)) + count++; + return count; +} + +/* Workaround for liboping issue https://github.com/octo/liboping/issues/43 */ +static int add_host(pingobj_t *pinger, const char *host) +{ + int num_host = iterator_count(pinger), + rc = ping_host_add(pinger, host); + + if (rc < 0) { + if (num_host != iterator_count(pinger)) + ping_host_remove(pinger, host); + } + + return rc; +} + + +static bool add_drop(pingobj_iter_t *iter, struct value_node *vn_host) +{ + char *s = NULL; + uint32_t drop, seq; + size_t len = sizeof(drop); + int rc = ping_iterator_get_info(iter, PING_INFO_DROPPED, &drop, &len); + if (rc) + return false; + + len = sizeof(seq); + rc = ping_iterator_get_info(iter, PING_INFO_SEQUENCE, &seq, &len); + if (rc) + return false; + + osmo_talloc_asprintf(vn_host, s, "%u/%u", drop, seq); + value_node_add(vn_host, "dropped", s); + + return true; +} + +static bool add_ttl(pingobj_iter_t *iter, struct value_node *vn_host) +{ + int ttl, rc; + size_t len = sizeof(ttl); + + rc = ping_iterator_get_info(iter, PING_INFO_RECV_TTL, &ttl, &len); + if (rc) + return false; + + if (ttl > -1) { + char *s = NULL; + osmo_talloc_asprintf(vn_host, s, "%d", ttl); + value_node_add(vn_host, "TTL", s); + } + + return true; +} + +static bool add_latency(pingobj_iter_t *iter, struct value_node *vn_host) +{ + double latency; + size_t len = sizeof(latency); + int rc = ping_iterator_get_info(iter, PING_INFO_LATENCY, &latency, &len); + if (rc) + return false; + + if (latency > -1) { + char *s = NULL; + osmo_talloc_asprintf(vn_host, s, "%.1lf ms", latency); + value_node_add(vn_host, "latency", s); + } + + return true; +} + + +/*********************************************************************** + * VTY + ***********************************************************************/ + +static struct cmd_node ping_node = { + PING_NODE, + "%s(config-ping)# ", + 1, +}; + +int osysmon_ping_go_parent(struct vty *vty) +{ + switch (vty->node) { + case PING_NODE: + vty->node = CONFIG_NODE; + vty->index = NULL; + break; + default: + break; + } + return vty->node; +} + +#define PING_STR "Configure a host to be monitored/pinged\n" + +DEFUN(cfg_ping, cfg_ping_cmd, + "ping HOST", + PING_STR "Name of the host to ping\n") +{ + int rc = add_host(g_oss->pings->ping_handle, argv[0]); + if (rc < 0) { + vty_out(vty, "[%d] Couldn't add pinger for %s: %s%s", + iterator_count(g_oss->pings->ping_handle), argv[0], + ping_get_error(g_oss->pings->ping_handle), VTY_NEWLINE); + + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_ping, cfg_no_ping_cmd, + "no ping HOST", + NO_STR PING_STR "Name of the host to ping\n") +{ + int rc = ping_host_remove(g_oss->pings->ping_handle, argv[0]); + if (rc < 0) { + vty_out(vty, "[%d] Couldn't remove %s pinger: %s%s", + iterator_count(g_oss->pings->ping_handle), argv[0], + ping_get_error(g_oss->pings->ping_handle), VTY_NEWLINE); + + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +static int config_write_ping(struct vty *vty) +{ + char buf[BUFLEN]; + pingobj_iter_t *iter; + for (iter = ping_iterator_get(g_oss->pings->ping_handle); iter; iter = ping_iterator_next(iter)) { + size_t len = BUFLEN; + /* hostname as it was supplied via vty 'ping' entry */ + if (ping_iterator_get_info(iter, PING_INFO_USERNAME, buf, &len)) + return CMD_WARNING; + + vty_out(vty, "ping %s%s", buf, VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + + +/*********************************************************************** + * Runtime Code + ***********************************************************************/ + +/* called once on startup before config file parsing */ +int osysmon_ping_init() +{ + install_element(CONFIG_NODE, &cfg_ping_cmd); + install_element(CONFIG_NODE, &cfg_no_ping_cmd); + install_node(&ping_node, config_write_ping); + + g_oss->pings = talloc_zero(NULL, struct ping_state); + if (!g_oss->pings) + return -ENOMEM; + + g_oss->pings->ping_handle = ping_construct(); + + if (g_oss->pings->ping_handle) + return 0; + + return -EINVAL; +} + +/* called periodically */ +int osysmon_ping_poll(struct value_node *parent) +{ + char buf[BUFLEN]; + struct value_node *vn_host; + int num_host = iterator_count(g_oss->pings->ping_handle); + pingobj_iter_t *iter; + struct value_node *vn_ping = value_node_add(parent, "ping", NULL); + if (!vn_ping) + return -ENOMEM; + + for (iter = ping_iterator_get(g_oss->pings->ping_handle); iter; iter = ping_iterator_next(iter)) { + size_t len = BUFLEN; + int rc = ping_iterator_get_info(iter, PING_INFO_USERNAME, buf, &len); + if (rc) + return -EINVAL; + + vn_host = value_node_find_or_add(vn_ping, talloc_strdup(vn_ping, buf)); + if (!vn_host) + return -ENOMEM; + + len = BUFLEN; /* IP address is looked up on-call, even 40 bytes should be enough */ + rc = ping_iterator_get_info(iter, PING_INFO_ADDRESS, buf, &len); + if (rc) + return -EINVAL; + + value_node_add(vn_host, "IP", buf); + + add_drop(iter, vn_host); + + /* Parameters below might be absent from output depending on the host reachability: */ + add_latency(iter, vn_host); + add_ttl(iter, vn_host); + } + + if (num_host) + return ping_send(g_oss->pings->ping_handle); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/12710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ife32540b532fb54368f63c78fb7837b84d4e8c76 Gerrit-Change-Number: 12710 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 10:27:50 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 10:27:50 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-sysmon_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,a4=3Ddef?= =?UTF-8?Q?ault,osmocom-master-debian9_#258?= In-Reply-To: <1911119710.3.1548925708379.JavaMail.jenkins@jenkins.osmocom.org> References: <1911119710.3.1548925708379.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2080551454.8.1548930470189.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:28:51 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 10:28:51 +0000 Subject: Change in meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12757 Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Add libosmo-netif to osmo-sysmon dependencies This is in preparation for upcoming patch related to OpenVPN probe. Change-Id: I11dd06baf75f9bbb77642640280f6c624ce6d23d --- M recipes-osmocom/osmo-sysmon/osmo-sysmon.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/57/12757/1 diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc index 1469438..aab52bc 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libtalloc libosmocore libmnl liboping" +DEPENDS = "libtalloc libosmocore libosmo-netif libmnl liboping" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/12757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I11dd06baf75f9bbb77642640280f6c624ce6d23d Gerrit-Change-Number: 12757 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:40:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 Jan 2019 10:40:10 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12679 to look at the new patch set (#3). Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/12679/3 -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:40:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 Jan 2019 10:40:10 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12624 to look at the new patch set (#7). Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... bsc_vty: add features to disable specific lchans via vty In some test and debug situations it is useful to have the ability to lock certain lchans in a way that the BSC can not allocate them. One application might be to simulate an exhaustion of all TCH/H channels in order to force the BSC to take one of the available TCH/F. Lets add a command to the vty which alloes us sen lchans from LCHAN_ST_UNUSED to LCHAN_ST_BORKEN and vice versa. Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/12624/7 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:40:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 Jan 2019 10:40:10 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix channel allocator preferences In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12625 to look at the new patch set (#6). Change subject: assignment_fsm: fix channel allocator preferences ...................................................................... assignment_fsm: fix channel allocator preferences When the MSC allocates a channel through the ASSIGNMENT REQUEST, it may ask for a TCH/H and a TCH/F at the same time and tell which of the two types it prefers. The process of channel allocation currently selects, based on the BTS, MSC and MS capabilites exactly one apropriate codec/rate (e.g. TCH/H) and then tries to allocate it. If that allocation fails, there is no way to try the second choice and the assignment fails. For example: The MSC asks for TCH/F and TCH/H, prefering TCH/F, then the channel allocator will try TCH/F and if it fails (all TCH/F are currently in use), then TCH/H is never tried. Since the BSC currently only trys the first best codec/rate that is supported it also ignores the preference. Lets fix those problems by including the preference information and both possible codec/rate settings into the channel allocation decision. Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Related: OS#3503 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 7 files changed, 316 insertions(+), 113 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/12625/6 -- To view, visit https://gerrit.osmocom.org/12625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5239e05c1cfbcb8af28f43373a58fa6c2d216c51 Gerrit-Change-Number: 12625 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 10:48:35 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 10:48:35 +0000 Subject: Change in osmo-sysmon[master]: Install signal handlers before processing config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12758 Change subject: Install signal handlers before processing config ...................................................................... Install signal handlers before processing config It's easier to troubleshoot vty-related issues when we can send signals to obtain talloc report. Change-Id: I6dd1ad55a227db08595d844008be86f648fa92c1 --- M src/osysmon_main.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/58/12758/1 diff --git a/src/osysmon_main.c b/src/osysmon_main.c index eb4f50b..91d5039 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -210,6 +210,10 @@ ping_init = osysmon_ping_init(); osysmon_file_init(); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file %s\n", @@ -217,10 +221,6 @@ exit(2); } - signal(SIGUSR1, &signal_handler); - signal(SIGUSR2, &signal_handler); - osmo_init_ignore_signals(); - if (cmdline_opts.daemonize) { rc = osmo_daemonize(); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/12758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6dd1ad55a227db08595d844008be86f648fa92c1 Gerrit-Change-Number: 12758 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 11:03:43 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 11:03:43 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8405?= In-Reply-To: <688983016.6.1548925918238.JavaMail.jenkins@jenkins.osmocom.org> References: <688983016.6.1548925918238.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1423666408.9.1548932623784.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 11:21:15 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 11:21:15 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12730 to look at the new patch set (#2). Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Inactive connection cleanup (disabled by default) Add a watchdog timer to connections, and close these connections when the watchdog timer expires. Kick the watchdog whenever RTP messages or the relevant MGCP messages arrive. This feature is disabled by default, as it is incompatible with LCLS (connections in LCLS state appear to be inactive). Enable it with the new "conn-timeout" VTY setting. MDCX is the only relevant MGCP message: - CRCX creates the conn and timer - DLCX deletes the conn and timer - MDCX is the only remaining supported MGCP message that indicates a CI - Can't easily generically parse a CI for all MGCP messages, parsing is done in handle_modify_con(). Related: OS#3429 Change-Id: I18886052e090466f73829133c24f011806cc1fe0 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 7 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/2 -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 11:26:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 11:26:26 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12730 to look at the new patch set (#3). Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Inactive connection cleanup (disabled by default) Add a watchdog timer to connections, and close these connections when the watchdog timer expires. Kick the watchdog whenever RTP messages or the relevant MGCP messages arrive. This feature is disabled by default, as it is incompatible with LCLS (connections in LCLS state appear to be inactive). Enable it with the new "conn-timeout" VTY setting. In general, this feature can be used to work around interoperability problems causing connections to stay open forever, and slowly exhausting all available ports. This happened for various reasons already. MDCX is the only relevant MGCP message: - CRCX creates the conn and timer - DLCX deletes the conn and timer - MDCX is the only remaining supported MGCP message that indicates a CI - Can't easily generically parse a CI for all MGCP messages, parsing is done in handle_modify_con(). Related: OS#3429 Change-Id: I18886052e090466f73829133c24f011806cc1fe0 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 7 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/3 -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 11:28:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 11:28:32 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 1: (2 comments) Good point with LCLS! > I agree that there should be vty switch for that. Also I think it should be off by default. Done. > Would be nice to clarify in commit message what prompted this feature in more details besides ticket link. Done. https://gerrit.osmocom.org/#/c/12730/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12730/1//COMMIT_MSG at 12 PS1, Line 12: arrive. > elaborate why it makes sense only for MDCX: [?] Done https://gerrit.osmocom.org/#/c/12730/1/include/osmocom/mgcp/mgcp_internal.h File include/osmocom/mgcp/mgcp_internal.h: https://gerrit.osmocom.org/#/c/12730/1/include/osmocom/mgcp/mgcp_internal.h at 41 PS1, Line 41: #define MGCP_CONN_TIMEOUT 180 > MGCP_CONN_DEFAULT_TIMEOUT and make it configurable in VTY I've removed the variable, because it is disabled by default now. -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 11:28:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 11:30:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 11:30:46 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12730 to look at the new patch set (#4). Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Inactive connection cleanup (disabled by default) Add a watchdog timer to connections, and close these connections when the watchdog timer expires. Kick the watchdog whenever RTP messages or the relevant MGCP messages arrive. This feature is disabled by default, as it is incompatible with LCLS (connections in LCLS state appear to be inactive). Enable it with the new "conn-timeout" VTY setting. In general, this feature can be used to work around interoperability problems causing connections to stay open forever, and slowly exhausting all available ports. This happened for various reasons already. MDCX is the only relevant MGCP message: - CRCX creates the conn and timer - DLCX deletes the conn and timer - MDCX is the only remaining supported MGCP message that indicates a CI - Can't easily generically parse a CI for all MGCP messages, parsing is done in handle_modify_con(). Related: OS#3429 Change-Id: I18886052e090466f73829133c24f011806cc1fe0 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 7 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/4 -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 12:56:56 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 12:56:56 +0000 Subject: Change in libosmo-netif[master]: Ignore test binaries Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12759 Change subject: Ignore test binaries ...................................................................... Ignore test binaries Change-Id: Ice6f5aec2f22a97033a555a292a5648090fc5970 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/59/12759/1 diff --git a/.gitignore b/.gitignore index 31b7a15..672708d 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ /examples/udp-test-server .*.sw? +jibuf_test +jibuf_tool +osmux_test2 -- To view, visit https://gerrit.osmocom.org/12759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice6f5aec2f22a97033a555a292a5648090fc5970 Gerrit-Change-Number: 12759 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 12:56:57 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 12:56:57 +0000 Subject: Change in libosmo-netif[master]: Stream client: fix disconnection logic Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12760 Change subject: Stream client: fix disconnection logic ...................................................................... Stream client: fix disconnection logic Previously closing the client did not alter it's state so might end-up with a client without any file descriptors but in STREAM_CLI_STATE_CONNECTED. Fix this inconsistency by setting appropriate state. Related issue is that reconnect function which is always (at least in the library and examples) called when some problem with the connection is detected, closed the connection only after checking whether reconnection is enabled. This might result in another inconsistency fixed in this patch by moving the check below connection cleanup. Change-Id: If41ed60bd625488c283d1e8a2b078e640f04c78e --- M src/stream.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/12760/1 diff --git a/src/stream.c b/src/stream.c index 902e688..af457dd 100644 --- a/src/stream.c +++ b/src/stream.c @@ -159,12 +159,14 @@ * connection (if any) and schedule a re-connect timer */ void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli) { + LOGP(DLINP, LOGL_DEBUG, "connection closed\n"); + osmo_stream_cli_close(cli); + if (cli->reconnect_timeout < 0) { LOGP(DLINP, LOGL_DEBUG, "not reconnecting, disabled.\n"); return; } - LOGP(DLINP, LOGL_DEBUG, "connection closed\n"); - osmo_stream_cli_close(cli); + LOGP(DLINP, LOGL_DEBUG, "retrying in %d seconds...\n", cli->reconnect_timeout); osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); @@ -182,6 +184,7 @@ osmo_fd_unregister(&cli->ofd); close(cli->ofd.fd); cli->ofd.fd = -1; + cli->state = STREAM_CLI_STATE_NONE; } static void osmo_stream_cli_read(struct osmo_stream_cli *cli) -- To view, visit https://gerrit.osmocom.org/12760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If41ed60bd625488c283d1e8a2b078e640f04c78e Gerrit-Change-Number: 12760 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 14:22:37 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 14:22:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#851?= In-Reply-To: <130992772.7.1548927719249.JavaMail.jenkins@jenkins.osmocom.org> References: <130992772.7.1548927719249.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <909380983.10.1548944557120.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:23:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:23:46 +0000 Subject: Change in osmo-sysmon[master]: Install signal handlers before processing config In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12758 ) Change subject: Install signal handlers before processing config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dd1ad55a227db08595d844008be86f648fa92c1 Gerrit-Change-Number: 12758 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:23:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:25:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:25:04 +0000 Subject: Change in libosmo-netif[master]: Ignore test binaries In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12759 ) Change subject: Ignore test binaries ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice6f5aec2f22a97033a555a292a5648090fc5970 Gerrit-Change-Number: 12759 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:25:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:25:33 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:25:33 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 4: Code-Review-1 (2 comments) I think we should permit only non-zero timeouts to avoid ambiguity. https://gerrit.osmocom.org/#/c/12730/4/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/#/c/12730/4/src/libosmo-mgcp/mgcp_vty.c at 158 PS4, Line 158: if (g_cfg->conn_timeout) Here we treat 0 as "no timeout configured" indicator. https://gerrit.osmocom.org/#/c/12730/4/src/libosmo-mgcp/mgcp_vty.c at 1336 PS4, Line 1336: "conn-timeout <0-65534>", Here we allow timeout 0 to be configured by user. -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:25:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:31:27 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:31:27 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 31 Jan 2019 14:31:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:35:25 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:35:25 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: do not access conn->assignment.req, it may be outdated In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12734 ) Change subject: handover_fsm: do not access conn->assignment.req, it may be outdated ...................................................................... Patch Set 1: >conn->assignment.* values are only valid during an ongoing assignment Maybe add clarifying comment next to them to make sure this mistake won't happen again? -- To view, visit https://gerrit.osmocom.org/12734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8018fd9d56421f2ab7be91703018f6d6f21c929 Gerrit-Change-Number: 12734 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 14:35:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:41:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:41:28 +0000 Subject: Change in libosmo-netif[master]: Stream client: fix disconnection logic In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12760 ) Change subject: Stream client: fix disconnection logic ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12760/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12760/1//COMMIT_MSG at 9 PS1, Line 9: Previously closing the client did not alter it's state so might end-up : with a client without any file descriptors but in : STREAM_CLI_STATE_CONNECTED. Fix this inconsistency by setting : appropriate state. This sentence is a bit hard to read. How about: "Previously closing the client did not alter its state, so we might end-up with a client without any file descriptors, but being in state STREAM_CLI_STATE_CONNECTED." (it's -> its, added commas, inserted "we" and "being in state") https://gerrit.osmocom.org/#/c/12760/1//COMMIT_MSG at 14 PS1, Line 14: (missing comma) -- To view, visit https://gerrit.osmocom.org/12760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If41ed60bd625488c283d1e8a2b078e640f04c78e Gerrit-Change-Number: 12760 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:41:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:44:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:44:09 +0000 Subject: Change in meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12757 ) Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I11dd06baf75f9bbb77642640280f6c624ce6d23d Gerrit-Change-Number: 12757 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:44:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:54:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:54:44 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12730 to look at the new patch set (#5). Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Inactive connection cleanup (disabled by default) Add a watchdog timer to connections, and close these connections when the watchdog timer expires. Kick the watchdog whenever RTP messages or the relevant MGCP messages arrive. This feature is disabled by default, as it is incompatible with LCLS (connections in LCLS state appear to be inactive). Enable it with the new "conn-timeout" VTY setting. In general, this feature can be used to work around interoperability problems causing connections to stay open forever, and slowly exhausting all available ports. This happened for various reasons already. MDCX is the only relevant MGCP message: - CRCX creates the conn and timer - DLCX deletes the conn and timer - MDCX is the only remaining supported MGCP message that indicates a CI - Can't easily generically parse a CI for all MGCP messages, parsing is done in handle_modify_con(). Related: OS#3429 Change-Id: I18886052e090466f73829133c24f011806cc1fe0 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 7 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/5 -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:55:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 14:55:27 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12730/4/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/#/c/12730/4/src/libosmo-mgcp/mgcp_vty.c at 1336 PS4, Line 1336: "conn-timeout <0-65534>", > Here we allow timeout 0 to be configured by user. Fixed, now 0 is not allowed anymore. -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 14:55:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:59:54 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:59:54 +0000 Subject: Change in osmo-sysmon[master]: Add generic host config and related helpers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12761 Change subject: Add generic host config and related helpers ...................................................................... Add generic host config and related helpers This will be used in follow-up patches as a generic way to store remote host related configuration data by several TCP-based probes. Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb --- M src/Makefile.am A src/client.c A src/client.h 3 files changed, 130 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/61/12761/1 diff --git a/src/Makefile.am b/src/Makefile.am index d0d6a22..e38b70e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,7 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -21,8 +22,8 @@ $(NULL) noinst_LTLIBRARIES = libintern.la -libintern_la_SOURCES = simple_ctrl.c -libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +libintern_la_SOURCES = simple_ctrl.c client.c +libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOPING_CFLAGS) $(AM_CFLAGS) @@ -44,6 +45,7 @@ noinst_HEADERS = \ osysmon.h \ + client.h \ simple_ctrl.h \ value_node.h \ $(NULL) diff --git a/src/client.c b/src/client.c new file mode 100644 index 0000000..25db885 --- /dev/null +++ b/src/client.c @@ -0,0 +1,96 @@ +/* Generic client structure and related helpers */ + +/* (C) 2018 by Harald Welte + * (C) 2019 by sysmocom - s.f.m.c. GmbH. + * 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 +#include +#include + +#include +#include + +#include "client.h" + +#define MATCH(a, b) (strcmp(a, b) != 0) ? false : true + +bool match_config(const struct host_cfg *cfg, const char *match, enum match_kind k) +{ + bool m_name = MATCH(match, cfg->name), m_host = MATCH(match, cfg->remote_host); + + switch (k) { + case MATCH_NAME: + return m_name; + case MATCH_HOST: + return m_host; + case MATCH_EITHER: + return m_name | m_host; + case MATCH_BOTH: + return m_name & m_host; + default: + return false; + } + + return false; +} + +struct host_cfg *make_config(void *ctx, const char *name, const char *host, uint16_t port) +{ + struct host_cfg *cfg = talloc_zero(ctx, struct host_cfg); + if (!cfg) + return NULL; + + cfg->name = talloc_strdup(cfg, name); + cfg->remote_host = talloc_strdup(cfg, host); + cfg->remote_port = port; + + return cfg; +} + +void update_name(struct host_cfg *cfg, const char *new_name) +{ + osmo_talloc_replace_string(cfg, (char **)&cfg->name, new_name); +} + +void update_host(struct host_cfg *cfg, const char *new_host) +{ + osmo_talloc_replace_string(cfg, (char **)&cfg->remote_host, new_host); +} + +char *get_authority(void *ctx, const struct host_cfg *cfg) +{ + if (!cfg->remote_host) + return NULL; + + return talloc_asprintf(ctx, "%s:%u", cfg->remote_host, cfg->remote_port); +} + +struct osmo_stream_cli *make_tcp_client(struct host_cfg *cfg) +{ + struct osmo_stream_cli *cl = osmo_stream_cli_create(cfg); + if (cl) { + osmo_stream_cli_set_addr(cl, cfg->remote_host); + osmo_stream_cli_set_port(cl, cfg->remote_port); + } + + return cl; +} diff --git a/src/client.h b/src/client.h new file mode 100644 index 0000000..9e69fef --- /dev/null +++ b/src/client.h @@ -0,0 +1,30 @@ +#pragma once + +#include +#include + +enum match_kind { + MATCH_NAME, + MATCH_HOST, + MATCH_BOTH, + MATCH_EITHER, +}; + +/* a client config */ +struct host_cfg { + /* name of this client */ + const char *name; + /* remote host/IP */ + const char *remote_host; + /* remote port */ + uint16_t remote_port; +}; + +struct host_cfg *make_config(void *ctx, const char *name, const char *host, uint16_t port); +bool match_config(const struct host_cfg *cfg, const char *match, enum match_kind k); + +void update_name(struct host_cfg *cfg, const char *new_name); +void update_host(struct host_cfg *cfg, const char *new_host); + +struct osmo_stream_cli *make_tcp_client(struct host_cfg *cfg); +char *get_authority(void *ctx, const struct host_cfg *cfg); -- To view, visit https://gerrit.osmocom.org/12761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb Gerrit-Change-Number: 12761 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:59:54 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:59:54 +0000 Subject: Change in osmo-sysmon[master]: fi cli Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12762 Change subject: fi cli ...................................................................... fi cli Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/62/12762/1 diff --git a/configure.ac b/configure.ac index d98de89..44a040c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) PKG_CHECK_MODULES(LIBMNL, libmnl) dnl FIXME: bump to 1.10.0 once it's available on build slaves and remove workaround from osysmon_ping.c PKG_CHECK_MODULES(LIBOPING, liboping >= 1.9.0) -- To view, visit https://gerrit.osmocom.org/12762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d Gerrit-Change-Number: 12762 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 14:59:55 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 14:59:55 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN probe Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12763 Change subject: Add OpenVPN probe ...................................................................... Add OpenVPN probe This adds support for OpenVPN status probe which uses OpenVPN's management interface (configured via 'management 127.0.0.1 1234' in OpenVPN's config). The output looks as follows: ... OpenVPN 127.0.0.1:1234 status: CONNECTED tunnel: 10.8.0.15 remote: 144.76.43.77:1194 localhost:4242 status: management interface incompatible 127.0.0.1:4444 status: management interface unavailable ... We show tunnel's IP (if available) as well as remote (OpenVPN server itself) address/port in addition to general connection status. If management interface is unavailable it's reported as such. If we've managed to establish connection with a given management interface but are unable to obtain expected information than we report this incompatibility as well. Related: SYS#2655 Change-Id: I4493e19b9a09dcebd289457eacd1719f7f8cc31c --- M src/Makefile.am M src/osysmon.h M src/osysmon_main.c A src/osysmon_openvpn.c 4 files changed, 307 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/63/12763/1 diff --git a/src/Makefile.am b/src/Makefile.am index e38b70e..f9b79f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(LIBMNL_LIBS) \ $(LIBOPING_LIBS) \ $(NULL) @@ -40,6 +41,7 @@ osysmon_rtnl.c \ osysmon_file.c \ osysmon_ping.c \ + osysmon_openvpn.c \ osysmon_main.c \ $(NULL) diff --git a/src/osysmon.h b/src/osysmon.h index df8bf8d..2f82c47 100644 --- a/src/osysmon.h +++ b/src/osysmon.h @@ -15,6 +15,8 @@ struct rtnl_client_state *rcs; /* list of 'struct ctrl client' */ struct llist_head ctrl_clients; + /* list of 'struct openvpn_client' */ + struct llist_head openvpn_clients; /* list of 'struct netdev' */ struct llist_head netdevs; /* list of 'struct osysmon_file' */ @@ -30,6 +32,7 @@ CTRL_CLIENT_NODE = _LAST_OSMOVTY_NODE + 1, CTRL_CLIENT_GETVAR_NODE, NETDEV_NODE, + OPENVPN_NODE, PING_NODE, }; @@ -48,5 +51,8 @@ int osysmon_ping_init(); int osysmon_ping_poll(struct value_node *parent); +int osysmon_openvpn_init(); +int osysmon_openvpn_poll(struct value_node *parent); + int osysmon_file_init(); int osysmon_file_poll(struct value_node *parent); diff --git a/src/osysmon_main.c b/src/osysmon_main.c index eb4f50b..6d72786 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -199,6 +199,7 @@ g_oss = talloc_zero(NULL, struct osysmon_state); INIT_LLIST_HEAD(&g_oss->ctrl_clients); + INIT_LLIST_HEAD(&g_oss->openvpn_clients); INIT_LLIST_HEAD(&g_oss->netdevs); INIT_LLIST_HEAD(&g_oss->files); @@ -206,6 +207,7 @@ handle_options(argc, argv); osysmon_sysinfo_init(); osysmon_ctrl_init(); + osysmon_openvpn_init(); osysmon_rtnl_init(); ping_init = osysmon_ping_init(); osysmon_file_init(); @@ -239,9 +241,11 @@ osysmon_ping_poll(root); osysmon_file_poll(root); + osysmon_openvpn_poll(root); display_update(root); value_node_del(root); + osmo_select_main(0); sleep(1); } diff --git a/src/osysmon_openvpn.c b/src/osysmon_openvpn.c new file mode 100644 index 0000000..6edb143 --- /dev/null +++ b/src/osysmon_openvpn.c @@ -0,0 +1,295 @@ +/* Simple Osmocom System Monitor (osysmon): Support for OpenVPN monitoring */ + +/* (C) 2019 by sysmocom - s.f.m.c. GmbH. + * Author: Max Suraev + * 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 +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "osysmon.h" +#include "client.h" +#include "value_node.h" + +/*********************************************************************** + * Data model + ***********************************************************************/ + +/* max number of csv in response */ +#define MAX_RESP_COMPONENTS 6 + +/* a single OpenVPN management interface client */ +struct openvpn_client { + /* links to osysmon.openvpn_clients */ + struct llist_head list; + struct host_cfg *cfg; + struct osmo_stream_cli *mgmt; + /* fields below are parsed from response to 'state' command on mgmt interface */ + struct host_cfg *rem_cfg; + char *tun_ip; + bool connected; +}; + +static char *parse_state(const struct msgb *msg, struct openvpn_client *vpn) +{ + char tmp[128]; + char *tok; + unsigned int i = 0; + uint8_t *m = msgb_data(msg); + + if (msgb_length(msg) > 128) + fprintf(stderr, "[%s] received message too long (%d > %u), truncating...\n", + get_authority(NULL, vpn->cfg), msgb_length(msg), 128); + + if (msgb_length(msg) > 0) { + if (!isdigit(m[0])) /* skip OpenVPN greetings and alike */ + return NULL; + } else { + fprintf(stderr, "[%s] received message is empty, ignoring...\n", get_authority(NULL, vpn->cfg)); + return NULL; + } + + memcpy(tmp, m, OSMO_MIN(sizeof(tmp) - 1, msgb_length(msg))); + tmp[sizeof(tmp) - 1] = '\0'; + + for (tok = strtok(tmp, ","); tok && i < MAX_RESP_COMPONENTS; tok = strtok(NULL, ",")) { + if (tok) + switch (i++) { + case 1: + update_name(vpn->rem_cfg, tok); + break; + case 3: + osmo_talloc_replace_string(vpn->rem_cfg, &vpn->tun_ip, tok); + break; + case 4: + update_host(vpn->rem_cfg, tok); + break; + case 5: + vpn->rem_cfg->remote_port = atoi(tok); + break; + } + } + return NULL; +} + +static struct openvpn_client *openvpn_client_find(const struct osysmon_state *os, const char *host, uint16_t port) +{ + struct openvpn_client *vpn; + llist_for_each_entry(vpn, &os->openvpn_clients, list) { + if (match_config(vpn->cfg, host, MATCH_HOST) && vpn->cfg->remote_port == port) + return vpn; + } + + return NULL; +} + +static int connect_cb(struct osmo_stream_cli *conn) +{ + struct openvpn_client *vpn = osmo_stream_cli_get_data(conn); + + update_name(vpn->rem_cfg, "management interface incompatible"); + vpn->connected = true; /* FIXME: there's no callback for lost connection to drop this flag */ + + return 0; +} + +static int read_cb(struct osmo_stream_cli *conn) +{ + int bytes; + struct openvpn_client *vpn = osmo_stream_cli_get_data(conn); + struct msgb *msg = msgb_alloc(1024, "OpenVPN"); + if (msg == NULL) { + fprintf(stderr, "[%s] unable to allocate message in callback\n", get_authority(NULL, vpn->cfg)); + return 0; + } + + bytes = osmo_stream_cli_recv(conn, msg); + if (bytes < 0) { + fprintf(stderr, "[%s] unable to receive message in callback\n", get_authority(NULL, vpn->cfg)); + return 0; + } + + parse_state(msg, vpn); + + msgb_free(msg); + + return 0; +} + +static bool openvpn_client_create(struct osysmon_state *os, const char *name, const char *host, uint16_t port) +{ + struct openvpn_client *vpn = openvpn_client_find(os, host, port); + if (vpn) + return true; + + vpn = talloc_zero(os, struct openvpn_client); + if (!vpn) + return false; + + vpn->connected = false; + + vpn->cfg = make_config(vpn, name, host, port); + if (!vpn->cfg) { + talloc_free(vpn); + return false; + } + + vpn->rem_cfg = make_config(vpn, "management interface unavailable", NULL, 0); + if (!vpn->cfg) { + talloc_free(vpn); + return false; + } + + vpn->mgmt = make_tcp_client(vpn->cfg); + if (!vpn->mgmt) + {//FIXME: log error via same macro as ctrl client? + talloc_free(vpn); + fprintf(stderr, "OpenVPN: ERROR: failed to create TCP client for %s:%u\n", host, port); + return false; + } + + /* Wait for 1 minute before attempting to reconnect to management interface */ + osmo_stream_cli_set_reconnect_timeout(vpn->mgmt, 60); /* FIXME: this seems to be ignored by libosmo-netif */ + osmo_stream_cli_set_read_cb(vpn->mgmt, read_cb); + osmo_stream_cli_set_connect_cb(vpn->mgmt, connect_cb); + + if (osmo_stream_cli_open(vpn->mgmt) < 0) { + fprintf(stderr, "OpenVPN: ERROR: failed to connect to %s:%u\n", host, port); + talloc_free(vpn); + return false; + } + + osmo_stream_cli_set_data(vpn->mgmt, vpn); + llist_add_tail(&vpn->list, &os->openvpn_clients); + + return true; +} + +static void openvpn_client_destroy(struct openvpn_client *vpn) +{ + if (!vpn) + return; + + osmo_stream_cli_destroy(vpn->mgmt); + llist_del(&vpn->list); + talloc_free(vpn); +} + + +/*********************************************************************** + * VTY + ***********************************************************************/ + +#define OPENVPN_STR "Configure OpenVPN management interface address\n" + +DEFUN(cfg_openvpn, cfg_openvpn_cmd, + "openvpn HOST <1-65535>", + OPENVPN_STR "Name of the host to connect to\n" "Management interface port\n") +{ + uint16_t port = atoi(argv[1]); + + if (!openvpn_client_create(g_oss, "OpenVPN", argv[0], port)) { + vty_out(vty, "Failed to create OpenVPN client for %s:%u%s", argv[0], port, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_openvpn, cfg_no_openvpn_cmd, + "no openvpn HOST <1-65535>", + NO_STR OPENVPN_STR "Name of the host to connect to\n" "Management interface port\n") +{ + uint16_t port = atoi(argv[1]); + struct openvpn_client *vpn = openvpn_client_find(g_oss, argv[0], port); + if (!vpn) { + vty_out(vty, "OpenVPN client %s:%u doesn't exist%s", argv[0], port, VTY_NEWLINE); + return CMD_WARNING; + } + + openvpn_client_destroy(vpn); + + return CMD_SUCCESS; +} + + +/*********************************************************************** + * Runtime Code + ***********************************************************************/ + +static int openvpn_client_poll(struct openvpn_client *vpn, struct value_node *parent) +{ + char *remote = get_authority(parent, vpn->rem_cfg); + struct value_node *vn_host = value_node_find_or_add(parent, get_authority(parent, vpn->cfg)); + struct msgb *msg = msgb_alloc(128, "state"); + if (!msg) { + value_node_add(vn_host, "msgb", "memory allocation failure"); + return 0; + } + + if (vpn->rem_cfg->name) + value_node_add(vn_host, "status", vpn->rem_cfg->name); + + if (vpn->tun_ip) + value_node_add(vn_host, "tunnel", vpn->tun_ip); + + if (remote) + value_node_add(vn_host, "remote", remote); + + /* FIXME: there's no way to check client state so this might be triggered even while it's reconnecting */ + if (vpn->connected) { /* re-trigger state command */ + msgb_printf(msg, "state\n"); + osmo_stream_cli_send(vpn->mgmt, msg); + } + + return 0; +} + +/* called once on startup before config file parsing */ +int osysmon_openvpn_init() +{ + install_element(CONFIG_NODE, &cfg_openvpn_cmd); + install_element(CONFIG_NODE, &cfg_no_openvpn_cmd); + + return 0; +} + +/* called periodically */ +int osysmon_openvpn_poll(struct value_node *parent) +{ + struct value_node *vn_vpn; + if (llist_count(&g_oss->openvpn_clients)) { + struct openvpn_client *vpn; + vn_vpn = value_node_add(parent, "OpenVPN", NULL); + llist_for_each_entry(vpn, &g_oss->openvpn_clients, list) + openvpn_client_poll(vpn, vn_vpn); + } + + return 0; +} -- To view, visit https://gerrit.osmocom.org/12763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4493e19b9a09dcebd289457eacd1719f7f8cc31c Gerrit-Change-Number: 12763 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:01:03 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:01:03 +0000 Subject: Change in osmo-sysmon[master]: Add generic host config and related helpers In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12761 to look at the new patch set (#2). Change subject: Add generic host config and related helpers ...................................................................... Add generic host config and related helpers This will be used in follow-up patches as a generic way to store remote host related configuration data by several TCP-based probes. Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb --- M configure.ac M src/Makefile.am A src/client.c A src/client.h 4 files changed, 131 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/61/12761/2 -- To view, visit https://gerrit.osmocom.org/12761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb Gerrit-Change-Number: 12761 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:01:15 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:01:15 +0000 Subject: Change in osmo-sysmon[master]: fi cli In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12762 ) Change subject: fi cli ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d Gerrit-Change-Number: 12762 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:08:41 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:08:41 +0000 Subject: Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12764 Change subject: jenkins.sh: remove obsolete comments ...................................................................... jenkins.sh: remove obsolete comments Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/64/12764/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dc2f734..b1529c4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# jenkins build helper: this is how we build on jenkins.osmocom.org if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -37,8 +37,7 @@ autoreconf --install --force ./configure --enable-sanitize --enable-external-tests --enable-werror $MAKE $PARALLEL_MAKE -#LD_LIBRARY_PATH="$inst/lib" $MAKE check \ -# || cat-testlogs.sh + LD_LIBRARY_PATH="$inst/lib" \ DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \ $MAKE distcheck \ -- To view, visit https://gerrit.osmocom.org/12764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12 Gerrit-Change-Number: 12764 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 15:13:53 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 15:13:53 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#387?= In-Reply-To: <2053183778.132.1548861006672.JavaMail.jenkins@jenkins.osmocom.org> References: <2053183778.132.1548861006672.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1566135941.11.1548947633813.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:21:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:21:45 +0000 Subject: Change in libosmo-netif[master]: Add missing include Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12765 Change subject: Add missing include ...................................................................... Add missing include stream.h uses msgb from libosmocore without corresponding #include It's odd that we haven't hit this issue earlier. Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 --- M include/osmocom/netif/stream.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/65/12765/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 166ede2..529d4d7 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -4,6 +4,8 @@ #include #include +#include + /*! \addtogroup stream * @{ */ -- To view, visit https://gerrit.osmocom.org/12765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 Gerrit-Change-Number: 12765 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:21:45 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:21:45 +0000 Subject: Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12766 Change subject: Cosmetic: use #pragma once as include guard ...................................................................... Cosmetic: use #pragma once as include guard Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd --- M include/osmocom/netif/stream.h 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/66/12766/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 529d4d7..969d42f 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -1,5 +1,4 @@ -#ifndef _OSMO_STREAM_H_ -#define _OSMO_STREAM_H_ +#pragma once #include #include @@ -77,5 +76,3 @@ int osmo_stream_cli_recv(struct osmo_stream_cli *conn, struct msgb *msg); /*! @} */ - -#endif -- To view, visit https://gerrit.osmocom.org/12766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd Gerrit-Change-Number: 12766 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:31:49 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:31:49 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 5: (1 comment) Looks good except for odd test change which does not result in any changes to output. Could you clarify why it's necessary? https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c at 981 PS5, Line 981: endp.cfg = &cfg; Why adding watchdog requires this change? And how was it working before? -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:31:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:33:30 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:33:30 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12743 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 12743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 15:33:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:34:30 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:34:30 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12742 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Is this affected by https://gerrit.osmocom.org/c/meta-telephony/+/12743 ? -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 15:34:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:37:16 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 15:37:16 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c at 981 PS5, Line 981: endp.cfg = &cfg; > Why adding watchdog requires this change? And how was it working before? This is needed, because mgcp_conn_watchdog_kick() looks up the timeout value in: conn->endp->cfg->conn_timeout These tests used to have no cfg in endp, which means dereferencing a NULL pointer at this point. It was working before, because nothing called by this test had accessed endp->cfg. -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:37:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:38:52 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 15:38:52 +0000 Subject: Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 ) Change subject: Inactive connection cleanup (disabled by default) ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 Gerrit-Change-Number: 12730 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:38:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:41:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 15:41:51 +0000 Subject: Change in libosmo-netif[master]: Add missing include In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12765 ) Change subject: Add missing include ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12765/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12765/1//COMMIT_MSG at 7 PS1, Line 7: Add missing include Very generic title. How about: "stream.h: add missing msgb.h libosmocore include" (This also makes the first line of the next paragraph redundant.) -- To view, visit https://gerrit.osmocom.org/12765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 Gerrit-Change-Number: 12765 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:41:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:45:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 31 Jan 2019 15:45:20 +0000 Subject: Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12766 ) Change subject: Cosmetic: use #pragma once as include guard ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12766/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12766/1//COMMIT_MSG at 7 PS1, Line 7: Cosmetic: use #pragma once as include guard It would be better to mention the file that was modified IMHO. How about: "Cosmetic: stream.h: use #pragma once" -- To view, visit https://gerrit.osmocom.org/12766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd Gerrit-Change-Number: 12766 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:45:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 15:52:24 2019 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 31 Jan 2019 15:52:24 +0000 Subject: Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12766 ) Change subject: Cosmetic: use #pragma once as include guard ...................................................................... Patch Set 1: > It would be better to mention the file that was modified IMHO. Agree with Oliver. -- To view, visit https://gerrit.osmocom.org/12766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd Gerrit-Change-Number: 12766 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 15:52:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 16:16:30 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 16:16:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-bsc_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#5038?= In-Reply-To: <898762842.5.1548925871087.JavaMail.jenkins@jenkins.osmocom.org> References: <898762842.5.1548925871087.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <969141731.12.1548951390677.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 16:38:47 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 31 Jan 2019 16:38:47 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12715 ) Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout ...................................................................... osmo_fsm_inst_state_chg(): set T also for zero timeout Before this patch, if timeout_secs == 0 was passed to osmo_fsm_inst_state_chg(), the previous T value remained set in the osmo_fsm_inst->T. For example: osmo_fsm_inst_state_chg(fi, ST_X, 23, 42); // timer == 23 seconds; fi->T == 42 osmo_fsm_inst_state_chg(fi, ST_Y, 0, 0); // no timer; fi->T == 42! Instead, always set to the T value passed to osmo_fsm_inst_state_chg(). Adjust osmo_fsm_inst_state_chg() API doc; need to rephrase to accurately describe the otherwise unchanged behaviour independently from T. Verify in fsm_test.c. Rationale: it is confusing to have a T number remaining from some past state, especially since the user explicitly passed a T number to osmo_fsm_inst_state_chg(). (Usually we are passing timeout_secs=0, T=0). I first thought this behavior was introduced with osmo_fsm_inst_state_chg_keep_timer(), but in fact osmo_fsm_inst_state_chg() behaved this way from the start. This shows up in the C test for the upcoming tdef API, where the test result printout was showing some past T value sticking around after FSM state transitions. After this patch, there will be no such confusion. Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c --- M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err M tests/fsm/fsm_test.ok 4 files changed, 71 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/fsm.c b/src/fsm.c index 1f6141f..ae7c0f5 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -458,9 +458,10 @@ fi->state = new_state; st = &fsm->states[new_state]; - if (!keep_timer && timeout_secs) { + if (!keep_timer) { fi->T = T; - osmo_timer_schedule(&fi->timer, timeout_secs, 0); + if (timeout_secs) + osmo_timer_schedule(&fi->timer, timeout_secs, 0); } /* Call 'onenter' last, user might terminate FSM from there */ @@ -480,11 +481,17 @@ * function. It verifies that the existing state actually permits a * transition to new_state. * - * timeout_secs and T are optional parameters, and only have any effect - * if timeout_secs is not 0. If the timeout function is used, then the - * new_state is entered, and the FSM instances timer is set to expire - * in timeout_secs functions. At that time, the FSM's timer_cb - * function will be called for handling of the timeout by the user. + * If timeout_secs is 0, stay in the new state indefinitely, without a timeout + * (stop the FSM instance's timer if it was runnning). + * + * If timeout_secs > 0, start or reset the FSM instance's timer with this + * timeout. On expiry, invoke the FSM instance's timer_cb -- if no timer_cb is + * set, an expired timer immediately terminates the FSM instance with + * OSMO_FSM_TERM_TIMEOUT. + * + * The value of T is stored in fi->T and is then available for query in + * timer_cb. If passing timeout_secs == 0, it is recommended to also pass T == + * 0, so that fi->T is reset to 0 when no timeout is invoked. * * \param[in] fi FSM instance whose state is to change * \param[in] new_state The new state into which we should change diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 34a8399..7aac8d3 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -349,6 +349,43 @@ fprintf(stderr, "--- %s() done\n", __func__); } +static void test_state_chg_T() +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = NULL; + + /* Test setting to timeout_secs = 0, T = 0 */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 42); + osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 0); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 0); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + /* Test setting to timeout_secs = 0, T != 0 */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 42); + osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 11); + printf("T = %d\n", fi->T); + OSMO_ASSERT(fi->T == 11); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + static const struct log_info_cat default_categories[] = { [DMAIN] = { .name = "DMAIN", @@ -390,6 +427,7 @@ test_id_api(); test_state_chg_keep_timer(); + test_state_chg_T(); osmo_fsm_unregister(&fsm); exit(0); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 85606e2..bf474ab 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -101,3 +101,18 @@ Test_FSM{TWO}: Freeing instance Test_FSM{TWO}: Deallocated --- test_state_chg_keep_timer() done + +--- test_state_chg_T() +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_T() done diff --git a/tests/fsm/fsm_test.ok b/tests/fsm/fsm_test.ok index e69de29..c3536fb 100644 --- a/tests/fsm/fsm_test.ok +++ b/tests/fsm/fsm_test.ok @@ -0,0 +1,4 @@ +T = 42 +T = 0 +T = 42 +T = 11 -- To view, visit https://gerrit.osmocom.org/12715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c Gerrit-Change-Number: 12715 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 16:40:36 2019 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 31 Jan 2019 16:40:36 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12716 to look at the new patch set (#4). Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years During testing of the upcoming tdef API, it became apparent that passing very large timeout values to osmo_fsm_inst_state_chg() wraps back in the number range, and might actually result in effectively very short timeouts instead. Since time_t's range is not well defined across platforms, use a reasonable maximum value of signed 32 bit integer. Hence this will be safe at least on systems with an int32_t for struct timeval.tv_sec and larger. Clamp the osmo_fsm_inst_state_chg() timeout_secs argument to a maximum of 0x7fffffff, which amounts to just above 68 years: float(0x7fffffff) / (60. * 60 * 24 * 365.25) = 68.04965038532715 (In upcoming patch Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5, this can be verified to work by invoking tdef_test manually with a cmdline argument passed to enable the range check.) Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a --- M src/fsm.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/12716/4 -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 16:42:50 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 Jan 2019 16:42:50 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12736 ) Change subject: Update osmocom recipes to latest tag releases ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb File recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb: https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb at 6 PS1, Line 6: PV = "0.0.1+gitr${SRCPV}" > I don't see any tags in the repository actually. [?] Correct, no tag, but we need to set some PV which we can later easily increase when we set a TAG, and 0.0.1 is a good candidate since it's the smallest one ;) -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 16:42:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 16:47:46 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 Jan 2019 16:47:46 +0000 Subject: Change in meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12757 ) Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Patch Set 1: Code-Review-1 Since the feature afaiu is still not implemented and osmo-sysmon version used in 201705 still doesn't require libosmo-netif, let's either: - Keep this patch here unmerged and then update it once the feature is added. New version of the patch should have too the commit hash in osmo-sysmon_git.bb updated. - Submit this patch as it is against laforge/nightly, but better wait a bit because we are upgrading 201705 and we'll need to rebase that brach soon. -- To view, visit https://gerrit.osmocom.org/12757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I11dd06baf75f9bbb77642640280f6c624ce6d23d Gerrit-Change-Number: 12757 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 16:47:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 16:50:43 2019 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 Jan 2019 16:50:43 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12742 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: > Is this affected by https://gerrit.osmocom.org/c/meta-telephony/+/12743 > ? Not exactly, it's affected by the fact that we upgrade osmo-msc to a new version which links against libosmo-gsup-client lib (before that, iirc it had its own code embedded in osmo-msc.git). -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 16:50:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 17:03:56 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 31 Jan 2019 17:03:56 +0000 Subject: Change in osmo-asf4-dfu[master]: remove OCTSIM in USB ID In-Reply-To: References: Message-ID: K?vin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/12609 ) Change subject: remove OCTSIM in USB ID ...................................................................... remove OCTSIM in USB ID this bootloader is initiated and meant for the sysmo-OCTSIM, but it can be applied for other SAM E5x/D5x boards. Thus we remove the OCTSIM name an just use the more generic bootloader name. Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 --- M config/usbd_config.h M usb/class/dfu/device/dfudf_desc.h 2 files changed, 31 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/config/usbd_config.h b/config/usbd_config.h index 96b3320..c20dfb2 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -23,7 +23,7 @@ #endif // Language IDs // Language IDs in c format, split by comma (E.g., 0x0409 ...) -// usb_dufd_langid +// usb_dfud_langid #ifndef CONF_USB_DFUD_LANGID #define CONF_USB_DFUD_LANGID "0x0409" #endif @@ -69,33 +69,33 @@ // <0x0010=> 16 bytes // <0x0020=> 32 bytes // <0x0040=> 64 bytes -// usb_dufd_bmaxpksz0 +// usb_dfud_bmaxpksz0 #ifndef CONF_USB_DFUD_BMAXPKSZ0 #define CONF_USB_DFUD_BMAXPKSZ0 0x40 #endif // idVendor <0x0000-0xFFFF> // <0x1d50=> OpenMoko -// usb_octsim_idvendor -#ifndef CONF_USB_OCTSIM_IDVENDOR -#define CONF_USB_OCTSIM_IDVENDOR 0x1d50 +// usb_dfud_idvendor +#ifndef CONF_USB_OPENMOKO_IDVENDOR +#define CONF_USB_OPENMOKO_IDVENDOR 0x1d50 #endif // idProduct <0x0000-0xFFFF> -// <0x6140=> sysmoOCTSIM -// usb_dufd_idproduct -#ifndef CONF_USB_OCTSIM_IDPRODUCT -#define CONF_USB_OCTSIM_IDPRODUCT 0x6140 +// <0x6140=> osmo-ASF4-DFU +// usb_dfud_idproduct +#ifndef CONF_USB_OSMOASF4DFU_IDPRODUCT +#define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6140 #endif // bcdDevice <0x0000-0xFFFF> -// usb_dufd_bcddevice +// usb_dfud_bcddevice #ifndef CONF_USB_DFUD_BCDDEVICE #define CONF_USB_DFUD_BCDDEVICE 0x000 #endif // Enable string descriptor of iManufact -// usb_dufd_imanufact_en +// usb_dfud_imanufact_en #ifndef CONF_USB_DFUD_IMANUFACT_EN #define CONF_USB_DFUD_IMANUFACT_EN 1 #endif @@ -105,7 +105,7 @@ #endif // Unicode string of iManufact -// usb_dufd_imanufact_str +// usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR #define CONF_USB_DFUD_IMANUFACT_STR "osmocom" #endif @@ -117,7 +117,7 @@ // // Enable string descriptor of iProduct -// usb_dufd_iproduct_en +// usb_dfud_iproduct_en #ifndef CONF_USB_DFUD_IPRODUCT_EN #define CONF_USB_DFUD_IPRODUCT_EN 1 #endif @@ -128,7 +128,7 @@ #endif // Unicode string of iProduct -// usb_dufd_iproduct_str +// usb_dfud_iproduct_str #ifndef CONF_USB_DFUD_IPRODUCT_STR #define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU" #endif @@ -140,7 +140,7 @@ // // Enable string descriptor of iSerialNum -// usb_dufd_iserialnum_en +// usb_dfud_iserialnum_en #ifndef CONF_USB_DFUD_ISERIALNUM_EN #define CONF_USB_DFUD_ISERIALNUM_EN 0 #endif @@ -152,7 +152,7 @@ #endif // Unicode string of iSerialNum -// usb_dufd_iserialnum_str +// usb_dfud_iserialnum_str #ifndef CONF_USB_DFUD_ISERIALNUM_STR #define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF" #endif @@ -164,7 +164,7 @@ // // bNumConfigurations <0x01-0xFF> -// usb_dufd_bnumconfig +// usb_dfud_bnumconfig #ifndef CONF_USB_DFUD_BNUMCONFIG #define CONF_USB_DFUD_BNUMCONFIG 0x1 #endif @@ -174,25 +174,25 @@ // DFU Configuration Descriptor // wTotalLength <0x01-0xFF> -// usb_dufd_wtotallength +// usb_dfud_wtotallength #ifndef CONF_USB_DFUD_WTOTALLENGTH #define CONF_USB_DFUD_WTOTALLENGTH 27 #endif // bNumInterfaces <0x01-0xFF> -// usb_dufd_bnuminterfaces +// usb_dfud_bnuminterfaces #ifndef CONF_USB_DFUD_BNUMINTERFACES #define CONF_USB_DFUD_BNUMINTERFACES 1 #endif // bConfigurationValue <0x01-0xFF> -// usb_dufd_bconfigval +// usb_dfud_bconfigval #ifndef CONF_USB_DFUD_BCONFIGVAL #define CONF_USB_DFUD_BCONFIGVAL 0x1 #endif // Enable string descriptor of iConfig -// usb_dufd_iconfig_en +// usb_dfud_iconfig_en #ifndef CONF_USB_DFUD_ICONFIG_EN #define CONF_USB_DFUD_ICONFIG_EN 0 #endif @@ -205,7 +205,7 @@ #endif // Unicode string of iConfig -// usb_dufd_iconfig_str +// usb_dfud_iconfig_str #ifndef CONF_USB_DFUD_ICONFIG_STR #define CONF_USB_DFUD_ICONFIG_STR "" #endif @@ -221,13 +221,13 @@ // <0xA0=> Bus power supply, support for remote wakeup // <0xC0=> Self powered, not support for remote wakeup // <0xE0=> Self powered, support for remote wakeup -// usb_dufd_bmattri +// usb_dfud_bmattri #ifndef CONF_USB_DFUD_BMATTRI #define CONF_USB_DFUD_BMATTRI 0x80 #endif // bMaxPower <0x00-0xFF> -// usb_dufd_bmaxpower +// usb_dfud_bmaxpower #ifndef CONF_USB_DFUD_BMAXPOWER #define CONF_USB_DFUD_BMAXPOWER 0x32 #endif @@ -236,25 +236,25 @@ // DFU Interface Descriptor // bInterfaceNumber <0x00-0xFF> -// usb_dufd_bifcnum +// usb_dfud_bifcnum #ifndef CONF_USB_DFUD_BIFCNUM #define CONF_USB_DFUD_BIFCNUM 0x0 #endif // bAlternateSetting <0x00-0xFF> -// usb_dufd_baltset +// usb_dfud_baltset #ifndef CONF_USB_DFUD_BALTSET #define CONF_USB_DFUD_BALTSET 0x0 #endif // bNumEndpoints <0x00-0xFF> -// usb_dufd_bnumep +// usb_dfud_bnumep #ifndef CONF_USB_DFUD_BNUMEP #define CONF_USB_DFUD_BNUMEP 0x0 #endif // Enable string descriptor of iInterface -// usb_dufd_iinterface_en +// usb_dfud_iinterface_en #ifndef CONF_USB_DFUD_IINTERFACE_EN #define CONF_USB_DFUD_IINTERFACE_EN 1 #endif @@ -267,7 +267,7 @@ #endif // Unicode string of iInterface -// usb_dufd_iinterface_str +// usb_dfud_iinterface_str #ifndef CONF_USB_DFUD_IINTERFAGE_STR #define CONF_USB_DFUD_IINTERFACE_STR "SAM D5x/E5x DFU bootloader (DFU mode)" #endif diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h index cd6ba41..50a79e4 100644 --- a/usb/class/dfu/device/dfudf_desc.h +++ b/usb/class/dfu/device/dfudf_desc.h @@ -44,8 +44,8 @@ CONF_USB_DFUD_BDEVICESUBCLASS, \ CONF_USB_DFUD_BDEVICEPROTOCOL, \ CONF_USB_DFUD_BMAXPKSZ0, \ - CONF_USB_OCTSIM_IDVENDOR, \ - CONF_USB_OCTSIM_IDPRODUCT, \ + CONF_USB_OPENMOKO_IDVENDOR, \ + CONF_USB_OSMOASF4DFU_IDPRODUCT, \ CONF_USB_DFUD_BCDDEVICE, \ CONF_USB_DFUD_IMANUFACT, \ CONF_USB_DFUD_IPRODUCT, \ -- To view, visit https://gerrit.osmocom.org/12609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 Gerrit-Change-Number: 12609 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 18:17:56 2019 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 31 Jan 2019 18:17:56 +0000 Subject: Change in osmo-asf4-dfu[master]: avoid mutli-packet USB transfer In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/12595 ) Change subject: avoid mutli-packet USB transfer ...................................................................... Patch Set 2: Code-Review-1 do not review until I found the next packer length issue -- To view, visit https://gerrit.osmocom.org/12595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb4c5f4bc06095f5f962152b8d8247054ef6a520 Gerrit-Change-Number: 12595 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 31 Jan 2019 18:17:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 19:27:56 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 19:27:56 +0000 Subject: Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12767 Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images ...................................................................... osmocom-jenkins-slave: Deploy osmo-ci and build docker images This is periodically performed by https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves but in order to get to the point of updating it, we must at least have done one initial deployment of the repository before. This is done by the takss in the new osmo-ci.yml Closes: OS#3773 Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448 --- M ansible/roles/osmocom-jenkins-slave/tasks/main.yml A ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/67/12767/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 36bc424..6d15ea1 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -25,6 +25,10 @@ include_tasks: generic-slave.yml when: generic_slave +- name: set-up osmo-ci repo + include_tasks: osmo-ci.yml + when: generic_slave + - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= '9' diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml new file mode 100644 index 0000000..d002f95 --- /dev/null +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -0,0 +1,19 @@ +--- + +# this is from the "update-osmo-ci-on-slaves" jenkins job. However, +# we need to initially install osmo-ci and the docker images *before* +# that jenkins job can execute subsequent updates + +- name: deploy osmo-ci to home directory + become: yes + become_user: "{{ jenkins_user }}" + git: + repo: "https://git.osmocom.org/osmo-ci" + dest: "/home/{{ jenkins_user }}/osmo-ci" + +- name: rebuild osmocom docker images for jenkins build tests + become: yes + become_user: "{{ jenkins_user }}" + shell: ./rebuild_osmocom_jenkins_image.sh + args: + chdir: "/home/{{ jenkins_user }}/osmo-ci/docker" -- To view, visit https://gerrit.osmocom.org/12767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448 Gerrit-Change-Number: 12767 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 20:43:05 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 20:43:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8476?= Message-ID: <1846424725.13.1548967385403.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 14.62 KB...] chmod: changing permissions of './.git/refs/tags/0.9.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/1.4.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.14-0_jrsantos.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.5': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.14-0_jrsantos.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.4': Operation not permitted chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.3': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.11': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.11.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.3': Operation not permitted chmod: changing permissions of './.git/refs/tags/1.1.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/sysmocom': Operation not permitted chmod: changing permissions of './.git/refs/tags/sysmocom/iu_orig_history': Operation not permitted chmod: changing permissions of './.git/refs/tags/sysmocom/iu_before_collapse': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.4': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.13': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.11': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.12': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.14': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.92': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.7': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.96': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.95': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.17': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.16': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.5': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.3': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.8': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.6': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.4': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.20': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.9': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.10': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.97': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.18': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.21': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.93': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.1': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.91': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.98.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.19': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.3': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.94': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.15': Operation not permitted chmod: changing permissions of './.git/refs/tags/on-waves/0.3.98': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.4': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.12': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.15.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.12.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.16': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.8': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.13.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.2': Operation not permitted chmod: changing permissions of './.git/refs/tags/1.2.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.14.0': Operation not permitted chmod: changing permissions of './.git/refs/tags/0.9.14-onwaves1': Operation not permitted chmod: changing permissions of './.git/refs/tags/zecke': Operation not permitted chmod: changing permissions of './.git/refs/tags/zecke/release': Operation not permitted chmod: changing permissions of './.git/refs/tags/zecke/release/openbsc-0.15.0+z6': Operation not permitted chmod: changing permissions of './.git/refs/heads': Operation not permitted chmod: changing permissions of './src': Operation not permitted chmod: changing permissions of './src/gprs': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp_pcomp.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_ctrl.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_auth.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp_comp.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_main.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_libgtp.c': Operation not permitted chmod: changing permissions of './src/gprs/gtphub.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_peer.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_ctrl.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_gb_parse.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_llc_vty.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_vty.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_patch.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_llc.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_tlli.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_gmm.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_subscriber.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_cdr.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_utils.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_vty.c': Operation not permitted chmod: changing permissions of './src/gprs/gb_proxy_main.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp_dcomp.c': Operation not permitted chmod: changing permissions of './src/gprs/sgsn_ares.c': Operation not permitted chmod: changing permissions of './src/gprs/gtphub_vty.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp.c': Operation not permitted chmod: changing permissions of './src/gprs/gtphub_main.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp_vty.c': Operation not permitted chmod: changing permissions of './src/gprs/gtphub_sock.c': Operation not permitted chmod: changing permissions of './src/gprs/gtphub_ares.c': Operation not permitted chmod: changing permissions of './src/gprs/slhc.c': Operation not permitted chmod: changing permissions of './src/gprs/crc24.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_llc_parse.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_llc_xid.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_gmm_attach.c': Operation not permitted chmod: changing permissions of './src/gprs/v42bis.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sgsn.c': Operation not permitted chmod: changing permissions of './src/gprs/gprs_sndcp_xid.c': Operation not permitted chmod: changing permissions of './src/gprs/Makefile.am': Operation not permitted chmod: changing permissions of './src/gprs/.gitignore': Operation not permitted chmod: changing permissions of './src/Makefile.am': Operation not permitted chmod: changing permissions of './osmoappdesc.py': Operation not permitted chmod: changing permissions of './contrib': Operation not permitted chmod: changing permissions of './contrib/jenkins.sh': Operation not permitted chmod: changing permissions of './contrib/gprs': Operation not permitted chmod: changing permissions of './contrib/gprs/gprs-verify-nu.lua': Operation not permitted chmod: changing permissions of './contrib/gprs/gb-proxy-unblock-bug.py': Operation not permitted chmod: changing permissions of './contrib/gprs/gprs-split-trace-by-tlli.lua': Operation not permitted chmod: changing permissions of './contrib/gprs/gprs-buffer-count.lua': Operation not permitted chmod: changing permissions of './contrib/gprs/gprs-bssgp-histogram.lua': Operation not permitted chmod: changing permissions of './contrib/systemd': Operation not permitted chmod: changing permissions of './contrib/systemd/osmo-gbproxy.service': Operation not permitted chmod: changing permissions of './contrib/systemd/osmo-gtphub.service': Operation not permitted chmod: changing permissions of './contrib/systemd/Makefile.am': Operation not permitted chmod: changing permissions of './contrib/systemd/osmo-sgsn.service': Operation not permitted chmod: changing permissions of './contrib/Makefile.am': Operation not permitted chmod: changing permissions of './debian': Operation not permitted chmod: changing permissions of './debian/copyright': Operation not permitted chmod: changing permissions of './debian/osmo-gbproxy.init': Operation not permitted chmod: changing permissions of './debian/control': Operation not permitted chmod: changing permissions of './debian/osmo-gtphub.install': Operation not permitted chmod: changing permissions of './debian/rules': Operation not permitted chmod: changing permissions of './debian/compat': Operation not permitted chmod: changing permissions of './debian/changelog': Operation not permitted chmod: changing permissions of './debian/source': Operation not permitted chmod: changing permissions of './debian/source/format': Operation not permitted chmod: changing permissions of './debian/osmo-sgsn.install': Operation not permitted chmod: changing permissions of './debian/osmo-gtphub.default': Operation not permitted chmod: changing permissions of './debian/osmo-gbproxy.install': Operation not permitted chmod: changing permissions of './debian/osmo-gtphub.init': Operation not permitted chmod: changing permissions of './COPYING': Operation not permitted chmod: changing permissions of './tests': Operation not permitted chmod: changing permissions of './tests/gtphub': Operation not permitted chmod: changing permissions of './tests/gtphub/gtphub_test.ok': Operation not permitted chmod: changing permissions of './tests/gtphub/gtphub_test.c': Operation not permitted chmod: changing permissions of './tests/gtphub/Makefile.am': Operation not permitted chmod: changing permissions of './tests/xid': Operation not permitted chmod: changing permissions of './tests/xid/xid_test.c': Operation not permitted chmod: changing permissions of './tests/xid/xid_test.ok': Operation not permitted chmod: changing permissions of './tests/xid/Makefile.am': Operation not permitted chmod: changing permissions of './tests/ctrl_test_runner.py': Operation not permitted chmod: changing permissions of './tests/gprs': Operation not permitted chmod: changing permissions of './tests/gprs/gprs_test.ok': Operation not permitted chmod: changing permissions of './tests/gprs/gprs_test.c': Operation not permitted chmod: changing permissions of './tests/gprs/Makefile.am': Operation not permitted chmod: changing permissions of './tests/sndcp_xid': Operation not permitted chmod: changing permissions of './tests/sndcp_xid/sndcp_xid_test.ok': Operation not permitted chmod: changing permissions of './tests/sndcp_xid/sndcp_xid_test.c': Operation not permitted chmod: changing permissions of './tests/sndcp_xid/Makefile.am': Operation not permitted chmod: changing permissions of './tests/gbproxy': Operation not permitted chmod: changing permissions of './tests/gbproxy/gbproxy_test.c': Operation not permitted chmod: changing permissions of './tests/gbproxy/gbproxy_test.ok': Operation not permitted chmod: changing permissions of './tests/gbproxy/Makefile.am': Operation not permitted chmod: changing permissions of './tests/vty_test_runner.py': Operation not permitted chmod: changing permissions of './tests/atlocal.in': Operation not permitted chmod: changing permissions of './tests/sgsn': Operation not permitted chmod: changing permissions of './tests/sgsn/sgsn_test.ok': Operation not permitted chmod: changing permissions of './tests/sgsn/sgsn_test.c': Operation not permitted chmod: changing permissions of './tests/sgsn/Makefile.am': Operation not permitted chmod: changing permissions of './tests/v42bis': Operation not permitted chmod: changing permissions of './tests/v42bis/v42bis_test.ok': Operation not permitted chmod: changing permissions of './tests/v42bis/v42bis_test.c': Operation not permitted chmod: changing permissions of './tests/v42bis/Makefile.am': Operation not permitted chmod: changing permissions of './tests/slhc': Operation not permitted chmod: changing permissions of './tests/slhc/slhc_test.ok': Operation not permitted chmod: changing permissions of './tests/slhc/slhc_test.c': Operation not permitted chmod: changing permissions of './tests/slhc/Makefile.am': Operation not permitted chmod: changing permissions of './tests/Makefile.am': Operation not permitted chmod: changing permissions of './tests/testsuite.at': Operation not permitted chmod: changing permissions of './doc': Operation not permitted chmod: changing permissions of './doc/examples': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gtphub': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gtphub/osmo-gtphub.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gtphub/gtphub-example.txt': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gbproxy': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-gbproxy/osmo-gbproxy.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-sgsn': Operation not permitted chmod: changing permissions of './doc/examples/osmo-sgsn/osmo-sgsn.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg': Operation not permitted chmod: changing permissions of './doc/examples/Makefile.am': Operation not permitted chmod: changing permissions of './doc/manuals': Operation not permitted chmod: changing permissions of './doc/manuals/osmosgsn-usermanual-docinfo.xml': Operation not permitted chmod: changing permissions of './doc/manuals/osmosgsn-usermanual.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/vty': Operation not permitted chmod: changing permissions of './doc/manuals/vty/sgsn_vty_reference.xml': Operation not permitted chmod: changing permissions of './doc/manuals/vty/sgsn_vty_additions.xml': Operation not permitted chmod: changing permissions of './doc/manuals/chapters': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/control.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/running.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/counters.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/counters_generated.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/configuration.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/overview.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/Makefile.am': Operation not permitted chmod: changing permissions of './doc/manuals/osmosgsn-vty-reference.xml': Operation not permitted chmod: changing permissions of './doc/Makefile.am': Operation not permitted chmod: changing permissions of './git-version-gen': Operation not permitted chmod: changing permissions of './AUTHORS': Operation not permitted chmod: changing permissions of './.gitreview': Operation not permitted chmod: changing permissions of './configure.ac': Operation not permitted chmod: changing permissions of './include': Operation not permitted chmod: changing permissions of './include/osmocom': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_utils.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gtphub.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_llc_xid.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/v42bis.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/slhc.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_gmm_attach.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gb_proxy.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/common.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sndcp_comp.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sndcp_pcomp.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sndcp.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_subscriber.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/crc24.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/sgsn.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sgsn.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/v42bis_private.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/vty.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/debug.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/signal.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sndcp_dcomp.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_gb_parse.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_gmm.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_llc.h': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/Makefile.am': Operation not permitted chmod: changing permissions of './include/osmocom/sgsn/gprs_sndcp_xid.h': Operation not permitted chmod: changing permissions of './include/osmocom/Makefile.am': Operation not permitted chmod: changing permissions of './include/Makefile.am': Operation not permitted chmod: changing permissions of './Makefile.am': Operation not permitted chmod: changing permissions of './.gitignore': Operation not permitted Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:08:29 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:08:29 +0000 Subject: Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12767 ) Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448 Gerrit-Change-Number: 12767 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 31 Jan 2019 21:08:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:08:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:08:30 +0000 Subject: Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12767 ) Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images ...................................................................... osmocom-jenkins-slave: Deploy osmo-ci and build docker images This is periodically performed by https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves but in order to get to the point of updating it, we must at least have done one initial deployment of the repository before. This is done by the takss in the new osmo-ci.yml Closes: OS#3773 Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448 --- M ansible/roles/osmocom-jenkins-slave/tasks/main.yml A ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 36bc424..6d15ea1 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -25,6 +25,10 @@ include_tasks: generic-slave.yml when: generic_slave +- name: set-up osmo-ci repo + include_tasks: osmo-ci.yml + when: generic_slave + - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= '9' diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml new file mode 100644 index 0000000..d002f95 --- /dev/null +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -0,0 +1,19 @@ +--- + +# this is from the "update-osmo-ci-on-slaves" jenkins job. However, +# we need to initially install osmo-ci and the docker images *before* +# that jenkins job can execute subsequent updates + +- name: deploy osmo-ci to home directory + become: yes + become_user: "{{ jenkins_user }}" + git: + repo: "https://git.osmocom.org/osmo-ci" + dest: "/home/{{ jenkins_user }}/osmo-ci" + +- name: rebuild osmocom docker images for jenkins build tests + become: yes + become_user: "{{ jenkins_user }}" + shell: ./rebuild_osmocom_jenkins_image.sh + args: + chdir: "/home/{{ jenkins_user }}/osmo-ci/docker" -- To view, visit https://gerrit.osmocom.org/12767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448 Gerrit-Change-Number: 12767 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:09:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:09:19 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12742 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:09:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:09:45 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12736 ) Change subject: Update osmocom recipes to latest tag releases ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:09:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:09:57 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12737 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 12737 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:12 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:12 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12738 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 12738 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:19 +0000 Subject: Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12736 ) Change subject: Update osmocom recipes to latest tag releases ...................................................................... Update osmocom recipes to latest tag releases Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 --- 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-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 14 files changed, 28 insertions(+), 28 deletions(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 98e5192..3032d28 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 = "026ff4574daedcf91a474f9bc67e90e8537a9d86" +SRCREV = "176a1fbab6ae45eb1c60e3d8b263b0765759e1da" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.5.1+gitr${SRCPV}" +PV = "0.6.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 d71810f..73c6314 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 = "322dbbeaa29cb90c6917fa7e78a66b96b8ce3689" +SRCREV = "c775ffe1cc6cfd842566d30c96d287502d9d6218" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.3.0+gitr${SRCPV}" +PV = "0.4.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 751bf70..6bdea27 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 = "688f2304056029f47073a549d7e41043eab5a0fd" +SRCREV = "81c6a0a97980f9da76ef0e698ca6ab526b98c7c2" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "0.10.0+gitr${SRCPV}" +PV = "1.0.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 6d00c0d..8eca57f 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 = "b8a91625dd974f596214646da345d9d649f4dae3" +SRCREV = "d4c406a04eae0071da4fb7aecd3cb47acd0fdab6" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.12.1+gitr${SRCPV}" -PR = "r0" +PV = "1.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index e3af4bc..7dbb07a 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "cc69659217d19af5635638a0fbd4f0702f79bac4" +SRCREV = "ed8815e723b41e9800f14c67bccd34e51a06beb6" 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 e31dc59..56e7eb4 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 = "08d02dd5100cbff47922427e3beb31a3373bf75c" +SRCREV = "117fa9d92d0da3d94a51cbfc1cbeb0d5bdcd3767" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.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 5219c03..4cc65b0 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a" +SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " -PV = "1.2.2+gitr${SRCPV}" +PV = "1.3.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 d10d893..c072a52 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 = "78f430102516a970b9899f962d4562ebdb718670" +SRCREV = "e0c6fe5921b30b0e8de35c021be5226c1475c2f5" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "0.2.1+gitr${SRCPV}" +PV = "1.0.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 a983c4e..5eb6d50 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 = "ba941e553d60a06a45ad96f0ad4161383d4c0d30" +SRCREV = "92a88ee73f471a4ddb7b864ae9f487493307a175" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.3.0+gitr${SRCPV}" +PV = "0.4.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 c3e7582..3998c5d 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 = "304b3eb32876cf69b202ee5688e00905fdb336f9" +SRCREV = "e81c1176aa1254b0bb148385134186f6a55fd405" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.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 3e5e9d7..87de339 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 = "cb8c75bba030c7ab9f2e49b2f40292a1738f3220" +SRCREV = "41e7cf115d4148a9f34fcb863b68b2d5370e335d" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.1+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 f76ced5..2c1991e 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 = "39c67e2640fc34346dffe3cff9f9f8e905fe5ad9" +SRCREV = "319a52b577843f6eebb00d8039c2e2479adc8da5" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.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 b5a1627..0d74751 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 = "55faf3867540f5d42a69e17cdc02f0e522f42478" +SRCREV = "336add4990191011ec6b8f621593e24b2ad5e324" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.1.1+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index a9cd8d3..e23e807 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3b25774db5b584e926dab2534d93314f910f62b6" +SRCREV = "65d937c45c3362504b8900173b8256a5894adae9" SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/12736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9 Gerrit-Change-Number: 12736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:19 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12737 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Since osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc those have been removed entirely from the repo and are only available trhough openbsc.git. Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 3 insertions(+), 23 deletions(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index b083a9c..19e17ab 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -3,35 +3,22 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" +DEPENDS = "libosmocore libosmo-netif" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -EXTRA_OECONF += "--enable-mgcp-transcoding --with-g729" - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ " libosmo-legacy-mgcp libosmo-legacy-mgcp-dev libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev osmo-bsc-mgcp" +PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" - -FILES_libosmo-legacy-mgcp = "${libdir}/libosmo-legacy-mgcp${SOLIBS}" -FILES_libosmo-legacy-mgcp-dev = " \ - ${includedir}/osmocom/legacy_mgcp \ - ${libdir}/pkgconfig/libosmo-legacy-mgcp.pc \ - ${libdir}/libosmo-legacy-mgcp${SOLIBSDEV} \ - " FILES_libosmo-mgcp = "${libdir}/libosmo-mgcp${SOLIBS}" FILES_libosmo-mgcp-dev = " \ @@ -47,11 +34,4 @@ ${libdir}/libosmo-mgcp-client${SOLIBSDEV} \ " -FILES_osmo-bsc-mgcp = " \ - ${bindir}/osmo-bsc_mgcp \ - ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_unitdir}/system/osmo-bsc-mgcp.service \ - " -CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" - CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-mgw.cfg" -- To view, visit https://gerrit.osmocom.org/12737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 12737 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:31 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:31 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12739 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 12739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:41 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:41 +0000 Subject: Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12740 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 12740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:10:52 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:10:52 +0000 Subject: Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12741 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 12741 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:11:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:11:15 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12743 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 12743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:11:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:13:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:13:40 +0000 Subject: Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12744 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 12744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:13:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:13:48 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:13:48 +0000 Subject: Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12745 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 12745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:13:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:00 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12746 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 12746 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:11 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12747 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 12747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:17 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:17 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12748 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 12748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:19 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:19 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12749 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 12749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:24 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12750 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 12750 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:30 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:30 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12751 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 12751 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:35 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:35 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12752 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 12752 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:40 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:40 +0000 Subject: Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12753 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 12753 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:45 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:45 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12754 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 12754 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:49 +0000 Subject: Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12755 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 12755 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:55 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:55 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12756 ) Change subject: osmo-sgsn: Depend on osmo-hlr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 Gerrit-Change-Number: 12756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:57 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12738 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... openbsc: Install osmo-bsc-sccplite.service from git repo Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service 2 files changed, 2 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 9f23d52..66782fb 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -8,10 +8,9 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc-sccplite.init \ - file://osmo-bsc-sccplite.service \ " -INC_PR = "r1.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -32,7 +31,7 @@ # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service deleted file mode 100644 index 3edd35c..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenBSC BSC (legacy, with SCCPLite) -Wants=osmo-bsc-mgcp.service - -[Service] -Type=simple -Restart=always -ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s -RestartSec=2 - -[Install] -WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/12738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 12738 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:57 +0000 Subject: Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12739 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... openbsc: Install osmo-bsc-nat service from git repo Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 66782fb..f76afb7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -20,7 +20,7 @@ install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -32,6 +32,7 @@ install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom @@ -65,6 +66,7 @@ CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " + ${bindir}/osmo-bsc_nat \ + ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ + ${systemd_system_unitdir}/osmo-bsc-nat.service \ + " -- To view, visit https://gerrit.osmocom.org/12739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 12739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:57 +0000 Subject: Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12740 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... openbsc: Use systemd.bbclass correctly * Describe packages containing systemd services in SYSTEMD_PACKAGES. * Enable services by default, since now osmo-bsc-sccplite doesn't collide with osmo-bsc.git's osmo-bsc. * Add SYSTEMD_SERVICE_* to specify service file for each package. Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f76afb7..ca9a6c6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -39,13 +39,11 @@ } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" - +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" -# Do not start any of the services by default -SYSTEMD_AUTO_ENABLE = "disable" - CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" +SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ @@ -55,16 +53,18 @@ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_unitdir}/system/osmo-nitb.service \ + ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service" FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ -- To view, visit https://gerrit.osmocom.org/12740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 12740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:57 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:57 +0000 Subject: Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12741 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... openbsc: Package osmo-bsc-mgcp Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca9a6c6..ec130db 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -10,7 +10,7 @@ file://osmo-bsc-sccplite.init \ " -INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -21,6 +21,7 @@ install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg + install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -33,13 +34,14 @@ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom } -PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" -SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" +PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" @@ -70,3 +72,11 @@ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ ${systemd_system_unitdir}/osmo-bsc-nat.service \ " + +CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" +SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" +FILES_osmo-bsc-mgcp = " \ + ${bindir}/osmo-bsc_mgcp \ + ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ + ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ + " -- To view, visit https://gerrit.osmocom.org/12741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 12741 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:58 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12742 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... osmo-msc: Depend on osmo-hlr Since a while ago, osmo-msc depends on libosmo-gsup-client which is provided by osmo-hlr. Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 06f5b10..e5364cd 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" +DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/12742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 12742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:58 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:58 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12743 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 6d8b748..946784b 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -24,6 +24,20 @@ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" + +FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" +FILES_libosmo-gsup-client-dev = " \ + ${includedir}/osmocom/gsupclient \ + ${libdir}/pkgconfig/libosmo-gsup-client.pc \ + ${libdir}/libosmo-gsup-client${SOLIBSDEV} \ + " + +FILES_osmo-hlr-utils = " \ + ${bindir}/osmo-hlr-db-tool \ + ${bindir}/osmo-euse-demo \ + " + SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-hlr = "\ ${sysconfdir}/osmocom/osmo-hlr.cfg \ -- To view, visit https://gerrit.osmocom.org/12743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 12743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:59 +0000 Subject: Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12744 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... libosmo-sccp: handle systemd and cfg files through autotools Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 1 file changed, 6 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 60793e3..78dd525 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,12 +3,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools pkgconfig systemd +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + # we require the tests to link to the static libosmo-sigtran library to # access symbols not starting with osmo_* EXTRA_OECONF_remove = "--disable-static" @@ -17,14 +22,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - FILES_osmo-stp = " \ ${bindir}/osmo-stp \ ${sysconfdir}/osmocom/osmo-stp.cfg \ -- To view, visit https://gerrit.osmocom.org/12744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 12744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:59 +0000 Subject: Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12745 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... osmo-iuh: handle systemd and cfg files through autotools Change-Id: If879153a32ae21ad63284382a420da534f30e6eb --- M recipes-osmocom/osmo-iuh/osmo-iuh.inc 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 6dfb344..ab412ad 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hnbgw.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hnbgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" SYSTEMD_PACKAGES = "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/12745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 12745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:59 +0000 Subject: Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12746 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... osmo-hlr: handle systemd and cfg files through autotools Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 946784b..7fa415b 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -15,15 +15,15 @@ } do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ install -d ${D}${localstatedir}/lib/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hlr.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/12746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 12746 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:14:59 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:14:59 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12747 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 2 insertions(+), 178 deletions(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..0000000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -# Mobile Switching Center, Home Location regster and all other -# components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - /sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - # esac - ;; - stop) - #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - #esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - #log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - #case "$?" in - # 0) log_end_msg 0 ;; - # 1) log_end_msg 1 ;; # Old process is still running - # *) log_end_msg 1 ;; # Failed to start - #esac - ;; - *) - # Failed to stop - #log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index 49dd1ee..fe0170f 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,30 +5,24 @@ DEPENDS = "libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools pkgconfig systemd do_install_append() { - install -d ${D}${sysconfdir}/init.d install -d ${D}${systemd_system_unitdir}/ install -d ${D}/${sysconfdir}/osmocom/ - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ } SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" FILES_libgtp = "${libdir}/*${SOLIBS}" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 4cc65b0..a88eb84 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -3,7 +3,6 @@ S = "${WORKDIR}/git" SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ - file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " PV = "1.3.0+gitr${SRCPV}" -- To view, visit https://gerrit.osmocom.org/12747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 12747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:00 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:00 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12748 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... osmo-ggsn: handle systemd and cfg files through autotools Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a --- M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc 1 file changed, 8 insertions(+), 11 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index fe0170f..0aaf418 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,22 +5,19 @@ DEPENDS = "libosmocore" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools pkgconfig systemd - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" -- To view, visit https://gerrit.osmocom.org/12748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 12748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:01 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12749 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... osmo-sgsn: handle systemd and cfg files through autotools At the same time systemd services were installed by autotools, osmo-gtphub service became available too. Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 8 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 4711a2c..45256a5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,29 +5,22 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gtphub/osmo-gtphub.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service ${D}${systemd_system_unitdir}/ -} - PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" +SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -- To view, visit https://gerrit.osmocom.org/12749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 12749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:01 +0000 Subject: Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12750 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... osmo-mgw: handle systemd and cfg files through autotools Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 19e17ab..c00f998 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg - install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -- To view, visit https://gerrit.osmocom.org/12750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 12750 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:02 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12751 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... osmo-msc: handle systemd and cfg files through autotools Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index e5364cd..59280ce 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,23 +5,20 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + smpp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh," PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34," RDEPENDS_${PN} = "libdbd-sqlite3" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_system_unitdir}/ -} - SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg" -- To view, visit https://gerrit.osmocom.org/12751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 12751 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:02 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:02 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12752 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... osmo-bsc: handle systemd and cfg files through autotools Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 --- M recipes-osmocom/osmo-bsc/osmo-bsc.inc 1 file changed, 5 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d066a58..484a779 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,18 +5,14 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" -- To view, visit https://gerrit.osmocom.org/12752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 12752 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:03 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:03 +0000 Subject: Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12753 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... osmo-sip-connector: handle systemd and cfg files through autotools Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 --- M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc index d7f22a3..96d3734 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc @@ -5,17 +5,15 @@ DEPENDS = "sofia-sip libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" - install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service ${D}${systemd_system_unitdir}/ -} SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg" -- To view, visit https://gerrit.osmocom.org/12753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 12753 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:04 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:04 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12754 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... openbsc: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. As update-rc.d was removed, it was noticied that systemd class inherit was missing, so this commit adds it. As a result, it's not required to define systemd service file paths in FILES_*. Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init D recipes-osmocom/openbsc/openbsc/osmo-nitb.init 3 files changed, 1 insertion(+), 118 deletions(-) Approvals: Pau Espin Pedrol: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ec130db..ca3b124 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,15 +6,11 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -SRC_URI = "file://osmo-nitb.init \ - file://osmo-bsc-sccplite.init \ - " - INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" -inherit autotools update-rc.d pkgconfig +inherit autotools systemd pkgconfig do_install_append() { install -d ${D}${sysconfdir}/osmocom @@ -23,12 +19,6 @@ install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - # Install sysv-init files - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d - install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb - install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init ${D}${sysconfdir}/init.d/osmo-bsc-sccplite - # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ @@ -42,27 +32,18 @@ PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" -INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" -INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \ - ${sysconfdir}/init.d/osmo-bsc-sccplite \ - ${systemd_system_unitdir}/osmo-bsc-sccplite.service \ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" -INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" -INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ - ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" @@ -70,7 +51,6 @@ FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - ${systemd_system_unitdir}/osmo-bsc-nat.service \ " CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" @@ -78,5 +58,4 @@ FILES_osmo-bsc-mgcp = " \ ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init deleted file mode 100755 index 3186f6d..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-bsc-sccplite -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Base Station Controller (legacy, with SCCPLite) -### END INIT INFO - -DAEMON=/usr/bin/osmo-bsc-sccplite -NAME=osmo-bsc-sccplite -DESC="Osmocom GSM Base Station Controller" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-sccplite.cfg -r /var/run/openbsc.ctl" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-bsc-sccplite || . /etc/default/osmo-bsc-sccplite -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init deleted file mode 100755 index bd74cc0..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-nitb -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Network in the Box -### END INIT INFO - -DAEMON=/usr/bin/osmo-nitb -NAME=osmo-nitb -DESC="Osmocom GSM Network in the Box" -NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 -- To view, visit https://gerrit.osmocom.org/12754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 12754 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:05 +0000 Subject: Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12755 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... openbsc: handle systemd and cfg files through autotools Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca3b124..71921b7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,30 +6,21 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r4.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools systemd pkgconfig do_install_append() { - install -d ${D}${sysconfdir}/osmocom - install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg - install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - - # Install systemd files and enable on sysinit - install -d ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -d ${D}/var/lib/osmocom - } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -- To view, visit https://gerrit.osmocom.org/12755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 12755 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:05 +0000 Subject: Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12756 ) Change subject: osmo-sgsn: Depend on osmo-hlr ...................................................................... osmo-sgsn: Depend on osmo-hlr Since osmo-sgsn f4b2c4ca42cc530c38c9ac6f275e4d7da9315fa2, it depends on libosmo-gsup-client available in osmo-hlr. Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 45256a5..57ab845 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -3,7 +3,7 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" +DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn osmo-hlr" INC_PR="r1.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/12756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509 Gerrit-Change-Number: 12756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:15:24 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:15:24 +0000 Subject: Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12716 ) Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a Gerrit-Change-Number: 12716 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 31 Jan 2019 21:15:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 21:15:35 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 21:15:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmocom-bb_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1194?= Message-ID: <1563041602.14.1548969336059.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmocom-bb" build number 1194 originally caused by: Started by timer Building remotely on tcc-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmocom-bb > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmocom-bb > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmocom-bb +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmocom-bb # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmocom-bb # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmocom-bb > git fetch --tags --progress git://git.osmocom.org/osmocom-bb +refs/heads/*:refs/remotes/origin/* Checking out Revision 9ec58916d93cc6fcae63c03be4361b8c075ea248 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 9ec58916d93cc6fcae63c03be4361b8c075ea248 Commit message: "mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() rename" > git rev-list --no-walk 9ec58916d93cc6fcae63c03be4361b8c075ea248 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins7268240173500913434.sh + WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + base= + deps= + inst= + export deps inst + osmo-clean-workspace.sh ./contrib/jenkins.sh: 16: ./contrib/jenkins.sh: osmo-clean-workspace.sh: not found Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:17:15 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:17:15 +0000 Subject: Change in libosmo-netif[master]: Add missing include In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12765 ) Change subject: Add missing include ...................................................................... Patch Set 1: Code-Review+2 I agree osmith's suggestion is much better than the current summary. But we also should make sure we find the right compromise regarding investment of all our limited time. This kind of commit is so trivial that it's unlikely going to be something that ever receives much scrutiny or will raise the interest of a future reader of the commitlog.... -- To view, visit https://gerrit.osmocom.org/12765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 Gerrit-Change-Number: 12765 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:17:18 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:17:18 +0000 Subject: Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12766 ) Change subject: Cosmetic: use #pragma once as include guard ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd Gerrit-Change-Number: 12766 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:17:44 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:17:44 +0000 Subject: Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12764 ) Change subject: jenkins.sh: remove obsolete comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12 Gerrit-Change-Number: 12764 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:18:49 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:18:49 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: do not access conn->assignment.req, it may be outdated In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12734 ) Change subject: handover_fsm: do not access conn->assignment.req, it may be outdated ...................................................................... Patch Set 1: Code-Review+1 I very much agree with max regarding the comment. -- To view, visit https://gerrit.osmocom.org/12734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8018fd9d56421f2ab7be91703018f6d6f21c929 Gerrit-Change-Number: 12734 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 21:18:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:19:27 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:19:27 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 31 Jan 2019 21:19:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:19:38 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:19:38 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12679 ) Change subject: bsc_vty: add vty command to display all lchans ...................................................................... bsc_vty: add vty command to display all lchans Currently the VTY only displays the lchans that are currently in use (show lchan summary). In some situations (debugging) it can be useful to list all lchans, regardless of their state. So lets add a command for that. Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Related: OS#3503 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 29 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 791aebe..3830475 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1441,11 +1441,12 @@ static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_lchan *lchan; ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false) continue; dump_cb(vty, lchan); } @@ -1454,33 +1455,36 @@ } static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - dump_lchan_trx_ts(ts, vty, dump_cb); + dump_lchan_trx_ts(ts, vty, dump_cb, all); } return CMD_SUCCESS; } static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); - dump_lchan_trx(trx, vty, dump_cb); + dump_lchan_trx(trx, vty, dump_cb, all); } return CMD_SUCCESS; } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, struct gsm_lchan *), + bool all) { struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_bts *bts = NULL; @@ -1500,7 +1504,7 @@ bts = gsm_bts_num(net, bts_nr); if (argc == 1) - return dump_lchan_bts(bts, vty, dump_cb); + return dump_lchan_bts(bts, vty, dump_cb, all); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1512,7 +1516,7 @@ trx = gsm_bts_trx_num(bts, trx_nr); if (argc == 2) - return dump_lchan_trx(trx, vty, dump_cb); + return dump_lchan_trx(trx, vty, dump_cb, all); } if (argc >= 3) { ts_nr = atoi(argv[2]); @@ -1524,7 +1528,7 @@ ts = &trx->ts[ts_nr]; if (argc == 3) - return dump_lchan_trx_ts(ts, vty, dump_cb); + return dump_lchan_trx_ts(ts, vty, dump_cb, all); } if (argc >= 4) { lchan_nr = atoi(argv[3]); @@ -1541,7 +1545,7 @@ for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { bts = gsm_bts_num(net, bts_nr); - dump_lchan_bts(bts, vty, dump_cb); + dump_lchan_bts(bts, vty, dump_cb, all); } return CMD_SUCCESS; @@ -1554,17 +1558,27 @@ SHOW_STR "Display information about a logical channel\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_full_vty); + return lchan_summary(vty, argc, argv, lchan_dump_full_vty, true); } DEFUN(show_lchan_summary, show_lchan_summary_cmd, "show lchan summary [<0-255>] [<0-255>] [<0-7>] [<0-7>]", SHOW_STR "Display information about a logical channel\n" - "Short summary\n" + "Short summary (used lchans)\n" BTS_TRX_TS_LCHAN_STR) { - return lchan_summary(vty, argc, argv, lchan_dump_short_vty); + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, false); +} + +DEFUN(show_lchan_summary_all, + show_lchan_summary_all_cmd, + "show lchan summary-all [<0-255>] [<0-255>] [<0-7>] [<0-7>]", + SHOW_STR "Display information about a logical channel\n" + "Short summary (all lchans)\n" + BTS_TRX_TS_LCHAN_STR) +{ + return lchan_summary(vty, argc, argv, lchan_dump_short_vty, true); } static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) @@ -5085,6 +5099,7 @@ install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); + install_element_ve(&show_lchan_summary_all_cmd); install_element_ve(&show_subscr_conn_cmd); -- To view, visit https://gerrit.osmocom.org/12679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5 Gerrit-Change-Number: 12679 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 21:20:05 2019 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 Jan 2019 21:20:05 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12624 ) Change subject: bsc_vty: add features to disable specific lchans via vty ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866 Gerrit-Change-Number: 12624 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 31 Jan 2019 21:20:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 21:23:18 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 21:23:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#5041?= Message-ID: <797376739.15.1548969798905.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [pmaier at sysmocom.de] bsc_vty: add vty command to display all lchans ------------------------------------------ [...truncated 31.76 KB...] chmod: changing permissions of './src/osmo-bsc/osmo_bsc_grace.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/gsm_timers.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/bts_ipaccess_nanobts.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/e1_config.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/bsc_ctrl_lookup.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/handover_decision.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/abis_nm.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/abis_nm_vty.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/bts_ericsson_rbs2000.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/gsm_08_08.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/bts_sysmobts.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/osmo_bsc_lcls.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/Makefile.am': Operation not permitted chmod: changing permissions of './src/osmo-bsc/handover_cfg.c': Operation not permitted chmod: changing permissions of './src/osmo-bsc/codec_pref.c': Operation not permitted chmod: changing permissions of './src/ipaccess': Operation not permitted chmod: changing permissions of './src/ipaccess/abisip-find.c': Operation not permitted chmod: changing permissions of './src/ipaccess/ipaccess-proxy.c': Operation not permitted chmod: changing permissions of './src/ipaccess/stubs.c': Operation not permitted chmod: changing permissions of './src/ipaccess/ipaccess-config.c': Operation not permitted chmod: changing permissions of './src/ipaccess/ipaccess-firmware.c': Operation not permitted chmod: changing permissions of './src/ipaccess/network_listen.c': Operation not permitted chmod: changing permissions of './src/ipaccess/Makefile.am': Operation not permitted chmod: changing permissions of './src/utils': Operation not permitted chmod: changing permissions of './src/utils/meas_vis.c': Operation not permitted chmod: changing permissions of './src/utils/meas_db.c': Operation not permitted chmod: changing permissions of './src/utils/meas_udp2db.c': Operation not permitted chmod: changing permissions of './src/utils/meas_json.c': Operation not permitted chmod: changing permissions of './src/utils/meas_pcap2db.c': Operation not permitted chmod: changing permissions of './src/utils/bs11_config.c': Operation not permitted chmod: changing permissions of './src/utils/meas_db.h': Operation not permitted chmod: changing permissions of './src/utils/isdnsync.c': Operation not permitted chmod: changing permissions of './src/utils/Makefile.am': Operation not permitted chmod: changing permissions of './src/libfilter': Operation not permitted chmod: changing permissions of './src/libfilter/bsc_msg_vty.c': Operation not permitted chmod: changing permissions of './src/libfilter/bsc_msg_filter.c': Operation not permitted chmod: changing permissions of './src/libfilter/Makefile.am': Operation not permitted chmod: changing permissions of './src/libfilter/bsc_msg_acc.c': Operation not permitted chmod: changing permissions of './src/Makefile.am': Operation not permitted chmod: changing permissions of './osmoappdesc.py': Operation not permitted chmod: changing permissions of './contrib': Operation not permitted chmod: changing permissions of './contrib/jenkins.sh': Operation not permitted chmod: changing permissions of './contrib/systemd': Operation not permitted chmod: changing permissions of './contrib/systemd/osmo-bsc.service': Operation not permitted chmod: changing permissions of './contrib/systemd/Makefile.am': Operation not permitted chmod: changing permissions of './contrib/a-link': Operation not permitted chmod: changing permissions of './contrib/a-link/sccp-split-by-con.lua': Operation not permitted chmod: changing permissions of './contrib/Makefile.am': Operation not permitted chmod: changing permissions of './debian': Operation not permitted chmod: changing permissions of './debian/copyright': Operation not permitted chmod: changing permissions of './debian/control': Operation not permitted chmod: changing permissions of './debian/osmo-bsc-bs11-utils.install': Operation not permitted chmod: changing permissions of './debian/rules': Operation not permitted chmod: changing permissions of './debian/compat': Operation not permitted chmod: changing permissions of './debian/changelog': Operation not permitted chmod: changing permissions of './debian/source': Operation not permitted chmod: changing permissions of './debian/source/format': Operation not permitted chmod: changing permissions of './debian/abisip-find.install': Operation not permitted chmod: changing permissions of './debian/osmo-bsc-meas-utils.install': Operation not permitted chmod: changing permissions of './debian/osmo-bsc-ipaccess-utils.install': Operation not permitted chmod: changing permissions of './debian/osmo-bsc.install': Operation not permitted chmod: changing permissions of './COPYING': Operation not permitted chmod: changing permissions of './tests': Operation not permitted chmod: changing permissions of './tests/osmo-bsc.vty': Operation not permitted chmod: changing permissions of './tests/ctrl_test_runner.py': Operation not permitted chmod: changing permissions of './tests/bsc': Operation not permitted chmod: changing permissions of './tests/bsc/bsc_test.ok': Operation not permitted chmod: changing permissions of './tests/bsc/bsc_test.c': Operation not permitted chmod: changing permissions of './tests/bsc/Makefile.am': Operation not permitted chmod: changing permissions of './tests/gsm0408': Operation not permitted chmod: changing permissions of './tests/gsm0408/gsm0408_test.ok': Operation not permitted chmod: changing permissions of './tests/gsm0408/gsm0408_test.c': Operation not permitted chmod: changing permissions of './tests/gsm0408/Makefile.am': Operation not permitted chmod: changing permissions of './tests/nanobts_omlattr': Operation not permitted chmod: changing permissions of './tests/nanobts_omlattr/nanobts_omlattr_test.c': Operation not permitted chmod: changing permissions of './tests/nanobts_omlattr/nanobts_omlattr_test.ok': Operation not permitted chmod: changing permissions of './tests/nanobts_omlattr/Makefile.am': Operation not permitted chmod: changing permissions of './tests/vty_test_runner.py': Operation not permitted chmod: changing permissions of './tests/abis': Operation not permitted chmod: changing permissions of './tests/abis/abis_test.c': Operation not permitted chmod: changing permissions of './tests/abis/Makefile.am': Operation not permitted chmod: changing permissions of './tests/abis/abis_test.ok': Operation not permitted chmod: changing permissions of './tests/subscr': Operation not permitted chmod: changing permissions of './tests/subscr/bsc_subscr_test.err': Operation not permitted chmod: changing permissions of './tests/subscr/bsc_subscr_test.c': Operation not permitted chmod: changing permissions of './tests/subscr/Makefile.am': Operation not permitted chmod: changing permissions of './tests/subscr/bsc_subscr_test.ok': Operation not permitted chmod: changing permissions of './tests/handover': Operation not permitted chmod: changing permissions of './tests/handover/handover_test.c': Operation not permitted chmod: changing permissions of './tests/handover/neighbor_ident_test.ok': Operation not permitted chmod: changing permissions of './tests/handover/neighbor_ident_test.err': Operation not permitted chmod: changing permissions of './tests/handover/neighbor_ident_test.c': Operation not permitted chmod: changing permissions of './tests/handover/handover_test.ok': Operation not permitted chmod: changing permissions of './tests/handover/Makefile.am': Operation not permitted chmod: changing permissions of './tests/handover_cfg.vty': Operation not permitted chmod: changing permissions of './tests/atlocal.in': Operation not permitted chmod: changing permissions of './tests/neighbor_ident.vty': Operation not permitted chmod: changing permissions of './tests/codec_pref': Operation not permitted chmod: changing permissions of './tests/codec_pref/codec_pref_test.c': Operation not permitted chmod: changing permissions of './tests/codec_pref/codec_pref_test.ok': Operation not permitted chmod: changing permissions of './tests/codec_pref/Makefile.am': Operation not permitted chmod: changing permissions of './tests/Makefile.am': Operation not permitted chmod: changing permissions of './tests/testsuite.at': Operation not permitted chmod: changing permissions of './doc': Operation not permitted chmod: changing permissions of './doc/handover.txt': Operation not permitted chmod: changing permissions of './doc/ts-and-lchan-fsm-lifecycle.msc': Operation not permitted chmod: changing permissions of './doc/assignment.msc': Operation not permitted chmod: changing permissions of './doc/timeslot-fsm.dot': Operation not permitted chmod: changing permissions of './doc/lchan-rtp-fsm.dot': Operation not permitted chmod: changing permissions of './doc/e1-data-model.txt': Operation not permitted chmod: changing permissions of './doc/lchan-fsm.dot': Operation not permitted chmod: changing permissions of './doc/BS11-OML.txt': Operation not permitted chmod: changing permissions of './doc/handover-intra-bsc-fsm.dot': Operation not permitted chmod: changing permissions of './doc/lchan.msc': Operation not permitted chmod: changing permissions of './doc/timeslot.msc': Operation not permitted chmod: changing permissions of './doc/examples': Operation not permitted chmod: changing permissions of './doc/examples/osmo-bsc': Operation not permitted chmod: changing permissions of './doc/examples/osmo-bsc/osmo-bsc-minimal.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg': Operation not permitted chmod: changing permissions of './doc/examples/osmo-bsc/osmo-bsc.cfg': Operation not permitted chmod: changing permissions of './doc/examples/Makefile.am': Operation not permitted chmod: changing permissions of './doc/handover-inter-bsc-out.msc': Operation not permitted chmod: changing permissions of './doc/legend_for_ladder_diagrams.msc': Operation not permitted chmod: changing permissions of './doc/assignment-fsm.dot': Operation not permitted chmod: changing permissions of './doc/legend_for_fsm_diagrams.dot': Operation not permitted chmod: changing permissions of './doc/handover-inter-bsc-in-fsm.dot': Operation not permitted chmod: changing permissions of './doc/manuals': Operation not permitted chmod: changing permissions of './doc/manuals/aoip-mgw-options-docinfo.xml': Operation not permitted chmod: changing permissions of './doc/manuals/osmux-reference.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/message-sequences': Operation not permitted chmod: changing permissions of './doc/manuals/message-sequences/mo_call-abis_a.msc': Operation not permitted chmod: changing permissions of './doc/manuals/osmobsc-vty-reference.xml': Operation not permitted chmod: changing permissions of './doc/manuals/osmux-reference-docinfo.xml': Operation not permitted chmod: changing permissions of './doc/manuals/vty': Operation not permitted chmod: changing permissions of './doc/manuals/vty/bsc_vty_additions.xml': Operation not permitted chmod: changing permissions of './doc/manuals/vty/bsc_vty_reference.xml': Operation not permitted chmod: changing permissions of './doc/manuals/vty/libbsc_vty_additions.xml': Operation not permitted chmod: changing permissions of './doc/manuals/osmobsc-usermanual.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-is.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-tx.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/README': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-trx.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-tf.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-trxc.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-bts.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-ts.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-cf.msc': Operation not permitted chmod: changing permissions of './doc/manuals/om2000/om2k-mo-rx.msc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/control.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/running.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/handover.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/handover_intra_bsc.dot': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/counters.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/counters_generated.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/bts-examples.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/overview.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/chapters/handover_inter_bsc.dot': Operation not permitted chmod: changing permissions of './doc/manuals/osmobsc-usermanual-docinfo.xml': Operation not permitted chmod: changing permissions of './doc/manuals/aoip-mgw-options.adoc': Operation not permitted chmod: changing permissions of './doc/manuals/Makefile.am': Operation not permitted chmod: changing permissions of './doc/manuals/mgw': Operation not permitted chmod: changing permissions of './doc/manuals/mgw/osmo-bsc-old-sccplite.msc': Operation not permitted chmod: changing permissions of './doc/manuals/mgw/classic-bsc.msc': Operation not permitted chmod: changing permissions of './doc/manuals/mgw/osmo-bsc-new-mgw-e1.msc': Operation not permitted chmod: changing permissions of './doc/manuals/mgw/osmo-bsc-new-mgw.msc': Operation not permitted chmod: changing permissions of './doc/mgw-endpoint-fsm.dot': Operation not permitted chmod: changing permissions of './doc/handover-inter-bsc-in.msc': Operation not permitted chmod: changing permissions of './doc/handover.msc': Operation not permitted chmod: changing permissions of './doc/Makefile.am': Operation not permitted chmod: changing permissions of './doc/mgw-endpoint.msc': Operation not permitted chmod: changing permissions of './doc/handover-inter-bsc-out-fsm.dot': Operation not permitted chmod: changing permissions of './git-version-gen': Operation not permitted chmod: changing permissions of './AUTHORS': Operation not permitted chmod: changing permissions of './.gitreview': Operation not permitted chmod: changing permissions of './configure.ac': Operation not permitted chmod: changing permissions of './include': Operation not permitted chmod: changing permissions of './include/compat_af_isdn.h': Operation not permitted chmod: changing permissions of './include/osmocom': Operation not permitted chmod: changing permissions of './include/osmocom/bsc': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover_cfg.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc_sigtran.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bsc_rll.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/gsm_timers.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/abis_rsl.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bsc_subscriber.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/acc_ramp.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/neighbor_ident.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/mgw_endpoint_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/abis_om2000.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/assignment_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/gsm_data.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bsc_msc_data.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/meas_rep.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/pcu_if.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover_vty.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/openbscdefines.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/pcuif_proto.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc_rf.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/timeslot_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bsc_msg_filter.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/penalty_timers.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover_decision.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/ussd.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/a_reset.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/misdn.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/vty.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/debug.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/e1_config.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmux.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/codec_pref.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc_lcls.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc_reset.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/gsm_04_08_rr.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/gsm_08_08.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/osmo_bsc_grace.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/arfcn_range_encode.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/gsm_04_80.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/signal.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/handover_decision_2.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/abis_nm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/lchan_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/paging.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/ctrl.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/lchan_rtp_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/lchan_select.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/rs232.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/rest_octets.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bsc_subscr_conn_fsm.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/system_information.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/meas_feed.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/ipaccess.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/bss.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/Makefile.am': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/network_listen.h': Operation not permitted chmod: changing permissions of './include/osmocom/bsc/chan_alloc.h': Operation not permitted chmod: changing permissions of './include/osmocom/Makefile.am': Operation not permitted chmod: changing permissions of './include/mISDNif.h': Operation not permitted chmod: changing permissions of './include/Makefile.am': Operation not permitted chmod: changing permissions of './Makefile.am': Operation not permitted chmod: changing permissions of './.gitignore': Operation not permitted Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Jan 31 22:26:21 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 22:26:21 +0000 Subject: Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12764 ) Change subject: jenkins.sh: remove obsolete comments ...................................................................... jenkins.sh: remove obsolete comments Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dc2f734..b1529c4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# jenkins build helper: this is how we build on jenkins.osmocom.org if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -37,8 +37,7 @@ autoreconf --install --force ./configure --enable-sanitize --enable-external-tests --enable-werror $MAKE $PARALLEL_MAKE -#LD_LIBRARY_PATH="$inst/lib" $MAKE check \ -# || cat-testlogs.sh + LD_LIBRARY_PATH="$inst/lib" \ DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \ $MAKE distcheck \ -- To view, visit https://gerrit.osmocom.org/12764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12 Gerrit-Change-Number: 12764 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 22:26:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 22:26:38 +0000 Subject: Change in libosmo-netif[master]: Add missing include In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12765 ) Change subject: Add missing include ...................................................................... Add missing include stream.h uses msgb from libosmocore without corresponding #include It's odd that we haven't hit this issue earlier. Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 --- M include/osmocom/netif/stream.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Objections: osmith: I would prefer this is not merged as is diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 166ede2..529d4d7 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -4,6 +4,8 @@ #include #include +#include + /*! \addtogroup stream * @{ */ -- To view, visit https://gerrit.osmocom.org/12765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57 Gerrit-Change-Number: 12765 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 22:26:38 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 22:26:38 +0000 Subject: Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12766 ) Change subject: Cosmetic: use #pragma once as include guard ...................................................................... Cosmetic: use #pragma once as include guard Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd --- M include/osmocom/netif/stream.h 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Objections: osmith: I would prefer this is not merged as is diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 529d4d7..969d42f 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -1,5 +1,4 @@ -#ifndef _OSMO_STREAM_H_ -#define _OSMO_STREAM_H_ +#pragma once #include #include @@ -77,5 +76,3 @@ int osmo_stream_cli_recv(struct osmo_stream_cli *conn, struct msgb *msg); /*! @} */ - -#endif -- To view, visit https://gerrit.osmocom.org/12766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd Gerrit-Change-Number: 12766 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 31 22:30:06 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 22:30:06 +0000 Subject: Change in osmo-sysmon[master]: Add generic host config and related helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12761 ) Change subject: Add generic host config and related helpers ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb Gerrit-Change-Number: 12761 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 22:30:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 22:35:56 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 22:35:56 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#8477?= In-Reply-To: <1846424725.13.1548967385403.JavaMail.jenkins@jenkins.osmocom.org> References: <1846424725.13.1548967385403.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2091059447.17.1548974156551.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Jan 31 22:40:52 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 22:40:52 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-bsc_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#5042?= In-Reply-To: <797376739.15.1548969798905.JavaMail.jenkins@jenkins.osmocom.org> References: <797376739.15.1548969798905.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <735633899.18.1548974452079.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 31 23:25:55 2019 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 31 Jan 2019 23:25:55 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN probe In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12763 ) Change subject: Add OpenVPN probe ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4493e19b9a09dcebd289457eacd1719f7f8cc31c Gerrit-Change-Number: 12763 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 31 Jan 2019 23:25:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 31 23:59:36 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 Jan 2019 23:59:36 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmocom-bb_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1195?= In-Reply-To: <1563041602.14.1548969336059.JavaMail.jenkins@jenkins.osmocom.org> References: <1563041602.14.1548969336059.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1202684769.19.1548979176361.JavaMail.jenkins@jenkins.osmocom.org> See